X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=fips%2Ffips.c;h=36ac8d1b0c18650dfd82d75f64523bc5537c65ef;hp=4f0f64cb838f3ba395e6fbca2bce9524f3c877de;hb=69569dd1684ec67ccf8f0a7007872ebbb7a724d5;hpb=3b5930442d35b9f9fe574b65e8cfc0f6e54377c4

diff --git a/fips/fips.c b/fips/fips.c
index 4f0f64cb83..36ac8d1b0c 100644
--- a/fips/fips.c
+++ b/fips/fips.c
@@ -160,9 +160,6 @@ unsigned int FIPS_incore_fingerprint(unsigned char *sig,unsigned int len)
     const unsigned char *p4 = FIPS_rodata_end;
     HMAC_CTX c;
 
-#if defined(_MSC_VER)
-#endif
-
     HMAC_CTX_init(&c);
     HMAC_Init(&c,FIPS_hmac_key,strlen(FIPS_hmac_key),EVP_sha1());
 
@@ -316,7 +313,7 @@ int FIPS_module_mode_set(int onoff, const char *auth)
 
 #ifdef OPENSSL_IA32_SSE2
 	{
-	unsigned int OPENSSL_ia32cap_P[];
+	extern unsigned int OPENSSL_ia32cap_P[2];
 	if ((OPENSSL_ia32cap_P[0] & (1<<25|1<<26)) != (1<<25|1<<26))
 	    {
 	    FIPSerr(FIPS_F_FIPS_MODULE_MODE_SET,FIPS_R_UNSUPPORTED_PLATFORM);
@@ -325,7 +322,7 @@ int FIPS_module_mode_set(int onoff, const char *auth)
 	    goto end;
 	    }
 	OPENSSL_ia32cap_P[0] |= (1<<28);	/* set "shared cache"	*/
-	OPENSSL_ia32cap_P[1] &= ~(1<<60);	/* clear AVX		*/
+	OPENSSL_ia32cap_P[1] &= ~(1<<(60-32));	/* clear AVX		*/
 	}
 #endif