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

[Kurt Roeckx]

Author: kroeckx
Date: 2012-04-26 22:45:41 +0000 (Thu, 26 Apr 2012)
New Revision: 570

Removed:
   openssl/trunk/debian/patches/rc4_hmac_md5.patch
Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/patches/series
Log:
New usptream version.


Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2012-04-19 22:25:47 UTC (rev 569)
+++ openssl/trunk/debian/changelog	2012-04-26 22:45:41 UTC (rev 570)
@@ -1,3 +1,12 @@
+openssl (1.0.1b-1) unstable; urgency=high
+
+  * New upstream version
+    - Remaps SSL_OP_NO_TLSv1_1, so applications linked to 1.0.0
+      can talk to servers supporting TLS 1.1 but not TLS 1.2
+    - Drop rc4_hmac_md5.patch, applied upstream
+
+ -- Kurt Roeckx <kurt at roeckx.be>  Thu, 26 Apr 2012 23:34:34 +0200
+
 openssl (1.0.1a-3) unstable; urgency=low
 
   * Use patch from upstream for the rc4_hmac_md5 issue.

Deleted: openssl/trunk/debian/patches/rc4_hmac_md5.patch
===================================================================
--- openssl/trunk/debian/patches/rc4_hmac_md5.patch	2012-04-19 22:25:47 UTC (rev 569)
+++ openssl/trunk/debian/patches/rc4_hmac_md5.patch	2012-04-26 22:45:41 UTC (rev 570)
@@ -1,40 +0,0 @@
---- a/crypto/evp/e_rc4_hmac_md5.c	2012/04/18 17:51:33	1.1.2.5
-+++ b/crypto/evp/e_rc4_hmac_md5.c	2012/04/19 20:43:02	1.1.2.6
-@@ -121,6 +121,7 @@
- 		md5_off = MD5_CBLOCK-key->md.num,
- 		blocks;
- 	unsigned int l;
-+	extern unsigned int OPENSSL_ia32cap_P[];
- #endif
- 	size_t	plen = key->payload_length;
- 
-@@ -132,7 +133,8 @@
- 		/* cipher has to "fall behind" */
- 		if (rc4_off>md5_off) md5_off+=MD5_CBLOCK;
- 
--		if (plen>md5_off && (blocks=(plen-md5_off)/MD5_CBLOCK)) {
-+		if (plen>md5_off && (blocks=(plen-md5_off)/MD5_CBLOCK) &&
-+		    (OPENSSL_ia32cap_P[0]&(1<<20))==0) {
- 			MD5_Update(&key->md,in,md5_off);
- 			RC4(&key->ks,rc4_off,in,out);
- 
-@@ -172,7 +174,8 @@
- 		if (md5_off>rc4_off)	rc4_off += 2*MD5_CBLOCK;
- 		else			rc4_off += MD5_CBLOCK;
- 
--		if (len>rc4_off && (blocks=(len-rc4_off)/MD5_CBLOCK)) {
-+		if (len>rc4_off && (blocks=(len-rc4_off)/MD5_CBLOCK) &&
-+		    (OPENSSL_ia32cap_P[0]&(1<<20))==0) {
- 			RC4(&key->ks,rc4_off,in,out);
- 			MD5_Update(&key->md,out,md5_off);
- 
-@@ -289,8 +292,6 @@
- 
- const EVP_CIPHER *EVP_rc4_hmac_md5(void)
- 	{
--	extern unsigned int OPENSSL_ia32cap_P[];
--	/* RC4_CHAR flag ------------vvvvv */
--	return(OPENSSL_ia32cap_P[0]&(1<<20) ? NULL : &r4_hmac_md5_cipher);
-+	return(&r4_hmac_md5_cipher);
- 	}
- #endif

Modified: openssl/trunk/debian/patches/series
===================================================================
--- openssl/trunk/debian/patches/series	2012-04-19 22:25:47 UTC (rev 569)
+++ openssl/trunk/debian/patches/series	2012-04-26 22:45:41 UTC (rev 570)
@@ -29,5 +29,3 @@
 block_diginotar.patch
 block_digicert_malaysia.patch
 c_rehash-multi.patch
-
-rc4_hmac_md5.patch