Revert random changes from commit#22606.

diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c
index 56563191ba161b2e875038fa94fc0da05422acc5..649fcadd98a2a807ab006fc051fa51b732b00c84 100644 (file)
--- a/crypto/evp/e_rc4_hmac_md5.c
+++ b/crypto/evp/e_rc4_hmac_md5.c
@@ -103,8 +103,7 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx,
 #if    !defined(OPENSSL_NO_ASM) &&     ( \
        defined(__x86_64)       || defined(__x86_64__)  || \
        defined(_M_AMD64)       || defined(_M_X64)      || \
 #if    !defined(OPENSSL_NO_ASM) &&     ( \
        defined(__x86_64)       || defined(__x86_64__)  || \
        defined(_M_AMD64)       || defined(_M_X64)      || \

-       defined(__INTEL__)              ) && \
-       !(defined(__APPLE__) && defined(__MACH__))
+       defined(__INTEL__)              )

 #define        STITCHED_CALL
 #endif
 
 #define        STITCHED_CALL
 #endif
 

diff --git a/crypto/modes/gcm128.c b/crypto/modes/gcm128.c
index f52d22fa151d93169fdcdcc8a301bac81155b943..025c7f889750914ff97385368a00fba5740c4c5d 100644 (file)
--- a/crypto/modes/gcm128.c
+++ b/crypto/modes/gcm128.c
@@ -1752,7 +1752,7 @@ int main()
 
        GHASH((&ctx),buf.c,sizeof(buf));
        start = OPENSSL_rdtsc();
 
        GHASH((&ctx),buf.c,sizeof(buf));
        start = OPENSSL_rdtsc();

-       for (i=0;i<100;++i) GHASH(&ctx,buf.c,sizeof(buf));
+       for (i=0;i<100;++i) GHASH((&ctx),buf.c,sizeof(buf));

        gcm_t = OPENSSL_rdtsc() - start;
        printf("%.2f\n",gcm_t/(double)sizeof(buf)/(double)i);
        }
        gcm_t = OPENSSL_rdtsc() - start;
        printf("%.2f\n",gcm_t/(double)sizeof(buf)/(double)i);
        }

diff --git a/crypto/x86cpuid.pl b/crypto/x86cpuid.pl
index 9b097fc31fba11727920df8ed80388952c01f952..808049a17db82ee8161bfe2230a8dee387f522fa 100644 (file)
--- a/crypto/x86cpuid.pl
+++ b/crypto/x86cpuid.pl
@@ -196,7 +196,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
 
 &function_begin_B("OPENSSL_far_spin");
        &pushf  ();
 
 &function_begin_B("OPENSSL_far_spin");
        &pushf  ();

-       &pop    ("eax")
+       &pop    ("eax");

        &bt     ("eax",9);
        &jnc    (&label("nospin"));     # interrupts are disabled
 
        &bt     ("eax",9);
        &jnc    (&label("nospin"));     # interrupts are disabled