[Pkg-openssl-changes] r566 - in openssl/trunk/debian: . patches

[Kurt Roeckx]

Author: kroeckx
Date: 2012-04-19 19:55:25 +0000 (Thu, 19 Apr 2012)
New Revision: 566

Added:
   openssl/trunk/debian/patches/rc4_hmac_md5.patch
Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/patches/series
Log:
Fix rc4_hmac_md5 on non-i386/amd64 arches.


Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2012-04-19 19:37:30 UTC (rev 565)
+++ openssl/trunk/debian/changelog	2012-04-19 19:55:25 UTC (rev 566)
@@ -1,3 +1,9 @@
+openssl (1.0.1a-2) unstable; urgency=low
+
+  * Fix rc4_hmac_md5 on non-i386/amd64 arches.
+
+ -- Kurt Roeckx <kurt at roeckx.be>  Thu, 19 Apr 2012 21:54:42 +0200
+
 openssl (1.0.1a-1) unstable; urgency=high
 
   * New upstream version

Added: openssl/trunk/debian/patches/rc4_hmac_md5.patch
===================================================================
--- openssl/trunk/debian/patches/rc4_hmac_md5.patch	                        (rev 0)
+++ openssl/trunk/debian/patches/rc4_hmac_md5.patch	2012-04-19 19:55:25 UTC (rev 566)
@@ -0,0 +1,19 @@
+Index: openssl-1.0.1a/crypto/evp/e_rc4_hmac_md5.c
+===================================================================
+--- openssl-1.0.1a.orig/crypto/evp/e_rc4_hmac_md5.c	2012-04-18 19:51:33.000000000 +0200
++++ openssl-1.0.1a/crypto/evp/e_rc4_hmac_md5.c	2012-04-19 21:53:36.000000000 +0200
+@@ -289,8 +289,14 @@
+ 
+ const EVP_CIPHER *EVP_rc4_hmac_md5(void)
+ 	{
++#if     defined(__i386)   || defined(__i386__)   || defined(_M_IX86) || \
++        defined(__INTEL__) || \
++        defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
+ 	extern unsigned int OPENSSL_ia32cap_P[];
+ 	/* RC4_CHAR flag ------------vvvvv */
+ 	return(OPENSSL_ia32cap_P[0]&(1<<20) ? NULL : &r4_hmac_md5_cipher);
++#else
++	return(r4_hmac_md5_cipher);
++#endif
+ 	}
+ #endif

Modified: openssl/trunk/debian/patches/series
===================================================================
--- openssl/trunk/debian/patches/series	2012-04-19 19:37:30 UTC (rev 565)
+++ openssl/trunk/debian/patches/series	2012-04-19 19:55:25 UTC (rev 566)
@@ -30,3 +30,4 @@
 block_digicert_malaysia.patch
 c_rehash-multi.patch
 
+rc4_hmac_md5.patch