summaryrefslogtreecommitdiffstats
path: root/fips
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-10-21 01:57:37 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-10-21 01:57:37 +0000
commitdfe9a47519b7c6c12025f25a7023b632645a935d (patch)
treee3dbfa6d758d8c0e6e5bcd6283090e1ac772659a /fips
parentaf4bfa151c27d70c94272e3ae53b8a50d648b81d (diff)
fix (?) AVX clearing
Diffstat (limited to 'fips')
-rw-r--r--fips/fips.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fips/fips.c b/fips/fips.c
index 4f0f64cb83..169652b4b3 100644
--- a/fips/fips.c
+++ b/fips/fips.c
@@ -316,7 +316,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 +325,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