Remove SSE2 option from fips sha512 [for now].

diff --git a/fips/fipshashes.c b/fips/fipshashes.c
index 2eb568b31b825047a7d3904ed4634563efc521a3..07989f5f4a94d65160f68b45cc19189a00ecbc49 100644 (file)
--- a/fips/fipshashes.c
+++ b/fips/fipshashes.c
@@ -32,6 +32,6 @@ const char * const FIPS_source_hashes[] = {
 "HMAC-SHA1(sha1/fips_md32_common.h)= c34d8b7785d3194ff968cf6d3efdd2bfcaec1fad",
 "HMAC-SHA1(sha1/fips_sha.h)= cbe98c211cff1684adfa3fe6e6225e92a0a25f6c",
 "HMAC-SHA1(sha1/fips_sha256.c)= 826e768677e67b7c87dfc9e084245b619804d01c",
-"HMAC-SHA1(sha1/fips_sha512.c)= 2df9a994290d0f3e6eb621c981bfc4af78a15988",
+"HMAC-SHA1(sha1/fips_sha512.c)= 27e16912ff196982425c00fe266fa84ef4f48fcd",
 "HMAC-SHA1(hmac/fips_hmac.c)= a477cec1da76c0092979c4a875b6469339bff7ef",
 };

diff --git a/fips/sha1/fips_sha512.c b/fips/sha1/fips_sha512.c
index ea12e8e754bbed62b0b4a9140d648e2416df5b51..7ac75891c3b3a06199b7ce22f94c0a40cf729c5c 100644 (file)
--- a/fips/sha1/fips_sha512.c
+++ b/fips/sha1/fips_sha512.c
@@ -349,14 +349,6 @@ static const SHA_LONG64 K512[80] = {
 #define Ch(x,y,z)      (((x) & (y)) ^ ((~(x)) & (z)))
 #define Maj(x,y,z)     (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
 
-#if defined(OPENSSL_IA32_SSE2) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY)
-#define        GO_FOR_SSE2(ctx,in,num)         do {            \
-       void    sha512_block_sse2(void *,const void *,size_t);  \
-       if (!(OPENSSL_ia32cap_P & (1<<26))) break;      \
-       sha512_block_sse2(ctx->h,in,num); return;       \
-                                       } while (0)
-#endif
-
 #ifdef OPENSSL_SMALL_FOOTPRINT
 
 static void sha512_block (SHA512_CTX *ctx, const void *in, size_t num)
@@ -366,10 +358,6 @@ static void sha512_block (SHA512_CTX *ctx, const void *in, size_t num)
        SHA_LONG64      X[16];
        int i;
 
-#ifdef GO_FOR_SSE2
-       GO_FOR_SSE2(ctx,in,num);
-#endif
-
                        while (num--) {
 
        a = ctx->h[0];  b = ctx->h[1];  c = ctx->h[2];  d = ctx->h[3];
@@ -427,10 +415,6 @@ static void sha512_block (SHA512_CTX *ctx, const void *in, size_t num)
        SHA_LONG64      X[16];
        int i;
 
-#ifdef GO_FOR_SSE2
-       GO_FOR_SSE2(ctx,in,num);
-#endif
-
                        while (num--) {
 
        a = ctx->h[0];  b = ctx->h[1];  c = ctx->h[2];  d = ctx->h[3];