22 lines
803 B
Diff
22 lines
803 B
Diff
|
diff -up openssl-1.0.1-beta2/crypto/md5/md5_dgst.c.md5-allow openssl-1.0.1-beta2/crypto/md5/md5_dgst.c
|
||
|
|
--- openssl-1.0.1-beta2/crypto/md5/md5_dgst.c.md5-allow 2012-02-06 20:09:56.000000000 +0100
|
||
|
|
+++ openssl-1.0.1-beta2/crypto/md5/md5_dgst.c 2012-02-06 20:14:02.332117603 +0100
|
||
|
|
@@ -71,7 +71,16 @@ const char MD5_version[]="MD5" OPENSSL_V
|
||
|
|
#define INIT_DATA_C (unsigned long)0x98badcfeL
|
||
|
|
#define INIT_DATA_D (unsigned long)0x10325476L
|
||
|
|
|
||
|
|
-nonfips_md_init(MD5)
|
||
|
|
+int MD5_Init(MD5_CTX *c)
|
||
|
|
+#ifdef OPENSSL_FIPS
|
||
|
|
+ {
|
||
|
|
+ if (FIPS_mode() && getenv("OPENSSL_FIPS_NON_APPROVED_MD5_ALLOW") == NULL)
|
||
|
|
+ OpenSSLDie(__FILE__, __LINE__, \
|
||
|
|
+ "Digest MD5 forbidden in FIPS mode!");
|
||
|
|
+ return private_MD5_Init(c);
|
||
|
|
+ }
|
||
|
|
+int private_MD5_Init(MD5_CTX *c)
|
||
|
|
+#endif
|
||
|
|
{
|
||
|
|
memset (c,0,sizeof(*c));
|
||
|
|
c->A=INIT_DATA_A;
|