From: Andy Polyakov <appro@openssl.org>
Date: Mon, 4 Jun 2012 22:12:10 +0000 (+0000)
Subject: Revert random changes from commit#22606.
X-Git-Tag: master-pre-reformat~1761
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8d1b199d26c26ad75e767ddd257a952da91ce6f9;p=openssl

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 56563191ba..649fcadd98 100644
--- 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)	|| \
-	defined(__INTEL__)		) && \
-	!(defined(__APPLE__) && defined(__MACH__))
+	defined(__INTEL__)		)
 #define	STITCHED_CALL
 #endif
 
diff --git a/crypto/modes/gcm128.c b/crypto/modes/gcm128.c
index f52d22fa15..025c7f8897 100644
--- 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();
-	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);
 	}
diff --git a/crypto/x86cpuid.pl b/crypto/x86cpuid.pl
index 9b097fc31f..808049a17d 100644
--- 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	();
-	&pop	("eax")
+	&pop	("eax");
 	&bt	("eax",9);
 	&jnc	(&label("nospin"));	# interrupts are disabled