make update

[oweals/openssl.git] / crypto / md32_common.h

diff --git a/crypto/md32_common.h b/crypto/md32_common.h
index 6d65c52fcda39bbea4a52682aae767cc99c741d9..8137c57b1c55f85cfc8992fa9278eb655efe50a4 100644 (file)
--- a/crypto/md32_common.h
+++ b/crypto/md32_common.h
@@ -128,6 +128,7 @@
  *                                     <appro@fy.chalmers.se>
  */
 
+#include <openssl/crypto.h>
 #include <openssl/fips.h>
 #include <openssl/err.h>
 
@@ -558,8 +559,8 @@ int HASH_FINAL (unsigned char *md, HASH_CTX *c)
        static const unsigned char end[4]={0x80,0x00,0x00,0x00};
        const unsigned char *cp=end;
 
-#ifdef FIPS
-       if(FIPS_mode)
+#ifdef OPENSSL_FIPS
+       if(FIPS_mode() && !FIPS_md5_allowed())
            {
            FIPSerr(FIPS_F_HASH_FINAL,FIPS_R_NON_FIPS_METHOD);
            return 0;