[tor-commits] [torbrowser/master] OSX: Fix 64bit compile of openssl

[erinn at torproject.org]

commit af6f55bb51860cab72ef489f19996f55af23645c
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Thu Apr 26 00:00:02 2012 +0200

    OSX: Fix 64bit compile of openssl
---
 .../openssl/0002-Fix-openssl-1.0.1a-compile.patch  |   26 ++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/src/current-patches/openssl/0002-Fix-openssl-1.0.1a-compile.patch b/src/current-patches/openssl/0002-Fix-openssl-1.0.1a-compile.patch
new file mode 100644
index 0000000..3fbd39c
--- /dev/null
+++ b/src/current-patches/openssl/0002-Fix-openssl-1.0.1a-compile.patch
@@ -0,0 +1,26 @@
+From 24d73c226f53c01d1d8400cc4fdad23f5a45412b Mon Sep 17 00:00:00 2001
+From: Sebastian Hahn <sebastian at torproject.org>
+Date: Wed, 25 Apr 2012 23:58:47 +0200
+Subject: [PATCH] Fix openssl 1.0.1a compile
+
+---
+ crypto/evp/e_rc4_hmac_md5.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c
+index 3f32b25..e65380d 100644
+--- a/crypto/evp/e_rc4_hmac_md5.c
++++ b/crypto/evp/e_rc4_hmac_md5.c
+@@ -103,7 +103,8 @@ 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(__INTEL__)		) && \
++	!(defined(__APPLE__) && defined(__MACH__))
+ #define	STITCHED_CALL
+ #endif
+ 
+-- 
+1.7.10
+