Move CRYPTO_memcmp to o_init.c when compiling with fips: cryptlib.o

is in the fips module for fips capable builds.

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 0566ec1f976a9c3154fe6d129311390c71fd2b83..dec3286f66d93d499734d4084257a8af7be9412b 100644 (file)
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -543,6 +543,8 @@ void OpenSSLDie(const char *file,int line,const char *assertion)
 
 void *OPENSSL_stderr(void)     { return stderr; }
 
+#ifndef OPENSSL_FIPS
+
 int CRYPTO_memcmp(const void *in_a, const void *in_b, size_t len)
        {
        size_t i;
@@ -555,3 +557,4 @@ int CRYPTO_memcmp(const void *in_a, const void *in_b, size_t len)
 
        return x;
        }
+#endif

diff --git a/crypto/o_init.c b/crypto/o_init.c
index d767a90a5f4391c9a990fb87946e6d8cbd6cbdc3..c89fda5890ad98eebf6cd4f7d9c55cfa56efb218 100644 (file)
--- a/crypto/o_init.c
+++ b/crypto/o_init.c
@@ -93,4 +93,18 @@ void OPENSSL_init(void)
 #endif
        }
                
+#ifdef OPENSSL_FIPS
+
+int CRYPTO_memcmp(const void *in_a, const void *in_b, size_t len)
+       {
+       size_t i;
+       const unsigned char *a = in_a;
+       const unsigned char *b = in_b;
+       unsigned char x = 0;
 
+       for (i = 0; i < len; i++)
+               x |= a[i] ^ b[i];
+
+       return x;
+       }
+#endif