X-Git-Url: http://git.rot13.org/?p=bcm963xx.git;a=blobdiff_plain;f=userapps%2Fopensource%2Fopenssl%2Fcrypto%2Fmd32_common.h;h=733da6acafe2222d7558b94c5224c77591af2837;hp=573850b12289a8d9a73892c596542fc41f881943;hb=864458111a0e69d94bbae210d5b7349ca072a6b7;hpb=a69849c98808437716b821267cd97529c56f45b0

diff --git a/userapps/opensource/openssl/crypto/md32_common.h b/userapps/opensource/openssl/crypto/md32_common.h
index 573850b1..733da6ac 100755
--- a/userapps/opensource/openssl/crypto/md32_common.h
+++ b/userapps/opensource/openssl/crypto/md32_common.h
@@ -128,6 +128,10 @@
  *					<appro@fy.chalmers.se>
  */
 
+#include <openssl/crypto.h>
+#include <openssl/fips.h>
+#include <openssl/err.h>
+
 #if !defined(DATA_ORDER_IS_BIG_ENDIAN) && !defined(DATA_ORDER_IS_LITTLE_ENDIAN)
 #error "DATA_ORDER must be defined!"
 #endif
@@ -207,7 +211,7 @@
 				: "cc");		\
 			   ret;				\
 			})
-#  elif defined(__powerpc) || defined(__ppc)
+#  elif defined(__powerpc) || defined(__ppc__) || defined(__powerpc64__)
 #   define ROTATE(a,n)	({ register unsigned int ret;	\
 				asm (			\
 				"rlwinm %0,%1,%2,0,31"	\
@@ -555,6 +559,14 @@ int HASH_FINAL (unsigned char *md, HASH_CTX *c)
 	static const unsigned char end[4]={0x80,0x00,0x00,0x00};
 	const unsigned char *cp=end;
 
+#if 0
+	if(FIPS_mode() && !FIPS_md5_allowed())
+	    {
+	    FIPSerr(FIPS_F_HASH_FINAL,FIPS_R_NON_FIPS_METHOD);
+	    return 0;
+	    }
+#endif
+
 	/* c->num should definitly have room for at least one more byte. */
 	p=c->data;
 	i=c->num>>2;