[Pkg-openssl-changes] r696 - in openssl/branches/1.0.1/debian: . patches

[Kurt Roeckx]

Author: kroeckx
Date: 2014-10-15 17:43:05 +0000 (Wed, 15 Oct 2014)
New Revision: 696

Modified:
   openssl/branches/1.0.1/debian/changelog
   openssl/branches/1.0.1/debian/patches/openssl_fix_for_x32.patch
Log:
Fix openssl_fix_for_x32.patch to apply to new upstream version


Modified: openssl/branches/1.0.1/debian/changelog
===================================================================
--- openssl/branches/1.0.1/debian/changelog	2014-10-15 17:40:50 UTC (rev 695)
+++ openssl/branches/1.0.1/debian/changelog	2014-10-15 17:43:05 UTC (rev 696)
@@ -4,10 +4,11 @@
     - Fixes CVE-2014-3513
     - Fixes CVE-2014-3567
     - Add Fallback SCSV support to mitigate CVE-2014-3566
-    - Disables SSLv3 because of CVE-2014-3566
     - Fixes CVE-2014-3568
-  - Update dgst_hmac.patch to apply to new upstream version
-  - Drop rehash_pod.patch, applied upstream.
+  * Disables SSLv3 because of CVE-2014-3566
+  * Update dgst_hmac.patch to apply to new upstream version
+  * Drop rehash_pod.patch, applied upstream
+  * Fix openssl_fix_for_x32.patch to apply to new upstream version
 
  -- Kurt Roeckx <kurt at roeckx.be>  Wed, 15 Oct 2014 19:06:38 +0200
 

Modified: openssl/branches/1.0.1/debian/patches/openssl_fix_for_x32.patch
===================================================================
--- openssl/branches/1.0.1/debian/patches/openssl_fix_for_x32.patch	2014-10-15 17:40:50 UTC (rev 695)
+++ openssl/branches/1.0.1/debian/patches/openssl_fix_for_x32.patch	2014-10-15 17:43:05 UTC (rev 696)
@@ -1,7 +1,7 @@
-Index: openssl-1.0.1c/crypto/bn/asm/x86_64-gcc.c
+Index: openssl-1.0.1j/crypto/bn/asm/x86_64-gcc.c
 ===================================================================
---- openssl-1.0.1c.orig/crypto/bn/asm/x86_64-gcc.c	2010-02-28 05:38:16.000000000 -0800
-+++ openssl-1.0.1c/crypto/bn/asm/x86_64-gcc.c	2013-01-17 20:16:12.000000000 -0800
+--- openssl-1.0.1j.orig/crypto/bn/asm/x86_64-gcc.c
++++ openssl-1.0.1j/crypto/bn/asm/x86_64-gcc.c
 @@ -55,7 +55,7 @@
   *    machine.
   */
@@ -11,8 +11,8 @@
  #define BN_ULONG unsigned long long
  #else
  #define BN_ULONG unsigned long
-@@ -192,9 +192,9 @@
- 	asm (
+@@ -192,9 +192,9 @@ BN_ULONG bn_add_words (BN_ULONG *rp, con
+ 	asm volatile (
  	"	subq	%2,%2		\n"
  	".p2align 4			\n"
 -	"1:	movq	(%4,%2,8),%0	\n"
@@ -24,8 +24,8 @@
  	"	leaq	1(%2),%2	\n"
  	"	loop	1b		\n"
  	"	sbbq	%0,%0		\n"
-@@ -215,9 +215,9 @@
- 	asm (
+@@ -215,9 +215,9 @@ BN_ULONG bn_sub_words (BN_ULONG *rp, con
+ 	asm volatile (
  	"	subq	%2,%2		\n"
  	".p2align 4			\n"
 -	"1:	movq	(%4,%2,8),%0	\n"