Commit 24b28060 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

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

is in the fips module for fips capable builds.
parent 99f50933

crypto/cryptlib.c

+3 −0
Original line number Diff line number Diff line
@@ -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

crypto/o_init.c

+14 −0
Original line number Diff line number Diff line
@@ -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