diff options
Diffstat (limited to 'src/lib/libcrypto/md32_common.h')
-rw-r--r-- | src/lib/libcrypto/md32_common.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/lib/libcrypto/md32_common.h b/src/lib/libcrypto/md32_common.h index 573850b122..733da6acaf 100644 --- a/src/lib/libcrypto/md32_common.h +++ b/src/lib/libcrypto/md32_common.h | |||
@@ -128,6 +128,10 @@ | |||
128 | * <appro@fy.chalmers.se> | 128 | * <appro@fy.chalmers.se> |
129 | */ | 129 | */ |
130 | 130 | ||
131 | #include <openssl/crypto.h> | ||
132 | #include <openssl/fips.h> | ||
133 | #include <openssl/err.h> | ||
134 | |||
131 | #if !defined(DATA_ORDER_IS_BIG_ENDIAN) && !defined(DATA_ORDER_IS_LITTLE_ENDIAN) | 135 | #if !defined(DATA_ORDER_IS_BIG_ENDIAN) && !defined(DATA_ORDER_IS_LITTLE_ENDIAN) |
132 | #error "DATA_ORDER must be defined!" | 136 | #error "DATA_ORDER must be defined!" |
133 | #endif | 137 | #endif |
@@ -207,7 +211,7 @@ | |||
207 | : "cc"); \ | 211 | : "cc"); \ |
208 | ret; \ | 212 | ret; \ |
209 | }) | 213 | }) |
210 | # elif defined(__powerpc) || defined(__ppc) | 214 | # elif defined(__powerpc) || defined(__ppc__) || defined(__powerpc64__) |
211 | # define ROTATE(a,n) ({ register unsigned int ret; \ | 215 | # define ROTATE(a,n) ({ register unsigned int ret; \ |
212 | asm ( \ | 216 | asm ( \ |
213 | "rlwinm %0,%1,%2,0,31" \ | 217 | "rlwinm %0,%1,%2,0,31" \ |
@@ -555,6 +559,14 @@ int HASH_FINAL (unsigned char *md, HASH_CTX *c) | |||
555 | static const unsigned char end[4]={0x80,0x00,0x00,0x00}; | 559 | static const unsigned char end[4]={0x80,0x00,0x00,0x00}; |
556 | const unsigned char *cp=end; | 560 | const unsigned char *cp=end; |
557 | 561 | ||
562 | #if 0 | ||
563 | if(FIPS_mode() && !FIPS_md5_allowed()) | ||
564 | { | ||
565 | FIPSerr(FIPS_F_HASH_FINAL,FIPS_R_NON_FIPS_METHOD); | ||
566 | return 0; | ||
567 | } | ||
568 | #endif | ||
569 | |||
558 | /* c->num should definitly have room for at least one more byte. */ | 570 | /* c->num should definitly have room for at least one more byte. */ |
559 | p=c->data; | 571 | p=c->data; |
560 | i=c->num>>2; | 572 | i=c->num>>2; |