[Pkg-openssl-changes] r928 - in openssl/branches/1.1.0/debian: . patches

[Kurt Roeckx]

Author: kroeckx
Date: 2017-11-04 11:50:02 +0000 (Sat, 04 Nov 2017)
New Revision: 928

Added:
   openssl/branches/1.1.0/debian/patches/0001-aes-asm-aes-armv4-bsaes-armv7-.pl-make-it-work-with-.patch
Modified:
   openssl/branches/1.1.0/debian/changelog
   openssl/branches/1.1.0/debian/patches/series
Log:
Avoid problems with aes assembler on armhf using binutils 2.29


Modified: openssl/branches/1.1.0/debian/changelog
===================================================================
--- openssl/branches/1.1.0/debian/changelog	2017-11-02 18:01:25 UTC (rev 927)
+++ openssl/branches/1.1.0/debian/changelog	2017-11-04 11:50:02 UTC (rev 928)
@@ -1,3 +1,9 @@
+openssl (1.1.0g-2) unstable; urgency=high
+
+  * Avoid problems with aes assembler on armhf using binutils 2.29
+
+ -- Kurt Roeckx <kurt at roeckx.be>  Sat, 04 Nov 2017 12:48:13 +0100
+
 openssl (1.1.0g-1) unstable; urgency=medium
 
   * New upstream version

Added: openssl/branches/1.1.0/debian/patches/0001-aes-asm-aes-armv4-bsaes-armv7-.pl-make-it-work-with-.patch
===================================================================
--- openssl/branches/1.1.0/debian/patches/0001-aes-asm-aes-armv4-bsaes-armv7-.pl-make-it-work-with-.patch	                        (rev 0)
+++ openssl/branches/1.1.0/debian/patches/0001-aes-asm-aes-armv4-bsaes-armv7-.pl-make-it-work-with-.patch	2017-11-04 11:50:02 UTC (rev 928)
@@ -0,0 +1,78 @@
+From 6d8f25b770bfb09f11ab0e5fd670554fc54770ca Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro at openssl.org>
+Date: Fri, 3 Nov 2017 23:30:01 +0100
+Subject: [PATCH] aes/asm/{aes-armv4|bsaes-armv7}.pl: make it work with
+ binutils-2.29.
+
+It's not clear if it's a feature or bug, but binutils-2.29[.1]
+misinterprets 'adr' instruction with Thumb2 code reference.
+---
+ crypto/aes/asm/aes-armv4.pl   | 6 +++---
+ crypto/aes/asm/bsaes-armv7.pl | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/crypto/aes/asm/aes-armv4.pl b/crypto/aes/asm/aes-armv4.pl
+index 16d79aae53..c6474b8aad 100644
+--- a/crypto/aes/asm/aes-armv4.pl
++++ b/crypto/aes/asm/aes-armv4.pl
+@@ -200,7 +200,7 @@ AES_encrypt:
+ #ifndef	__thumb2__
+ 	sub	r3,pc,#8		@ AES_encrypt
+ #else
+-	adr	r3,AES_encrypt
++	adr	r3,.
+ #endif
+ 	stmdb   sp!,{r1,r4-r12,lr}
+ #ifdef	__APPLE__
+@@ -450,7 +450,7 @@ _armv4_AES_set_encrypt_key:
+ #ifndef	__thumb2__
+ 	sub	r3,pc,#8		@ AES_set_encrypt_key
+ #else
+-	adr	r3,AES_set_encrypt_key
++	adr	r3,.
+ #endif
+ 	teq	r0,#0
+ #ifdef	__thumb2__
+@@ -976,7 +976,7 @@ AES_decrypt:
+ #ifndef	__thumb2__
+ 	sub	r3,pc,#8		@ AES_decrypt
+ #else
+-	adr	r3,AES_decrypt
++	adr	r3,.
+ #endif
+ 	stmdb   sp!,{r1,r4-r12,lr}
+ #ifdef	__APPLE__
+diff --git a/crypto/aes/asm/bsaes-armv7.pl b/crypto/aes/asm/bsaes-armv7.pl
+index cc34859a0d..0c5e762ac2 100644
+--- a/crypto/aes/asm/bsaes-armv7.pl
++++ b/crypto/aes/asm/bsaes-armv7.pl
+@@ -740,7 +740,7 @@ $code.=<<___;
+ .type	_bsaes_decrypt8,%function
+ .align	4
+ _bsaes_decrypt8:
+-	adr	$const,_bsaes_decrypt8
++	adr	$const,.
+ 	vldmia	$key!, {@XMM[9]}		@ round 0 key
+ #ifdef	__APPLE__
+ 	adr	$const,.LM0ISR
+@@ -839,7 +839,7 @@ _bsaes_const:
+ .type	_bsaes_encrypt8,%function
+ .align	4
+ _bsaes_encrypt8:
+-	adr	$const,_bsaes_encrypt8
++	adr	$const,.
+ 	vldmia	$key!, {@XMM[9]}		@ round 0 key
+ #ifdef	__APPLE__
+ 	adr	$const,.LM0SR
+@@ -947,7 +947,7 @@ $code.=<<___;
+ .type	_bsaes_key_convert,%function
+ .align	4
+ _bsaes_key_convert:
+-	adr	$const,_bsaes_key_convert
++	adr	$const,.
+ 	vld1.8	{@XMM[7]},  [$inp]!		@ load round 0 key
+ #ifdef	__APPLE__
+ 	adr	$const,.LM0
+-- 
+2.14.2
+

Modified: openssl/branches/1.1.0/debian/patches/series
===================================================================
--- openssl/branches/1.1.0/debian/patches/series	2017-11-02 18:01:25 UTC (rev 927)
+++ openssl/branches/1.1.0/debian/patches/series	2017-11-04 11:50:02 UTC (rev 928)
@@ -6,3 +6,4 @@
 #padlock_conf.patch
 #tls1_2_default.patch
 testsuite_race.patch
+0001-aes-asm-aes-armv4-bsaes-armv7-.pl-make-it-work-with-.patch