|
0 |
From d1d6c69b6fd25e71dbae67fad17b2c7737f6b2dc Mon Sep 17 00:00:00 2001
|
|
1 |
From: Andy Polyakov <[email protected]>
|
|
2 |
Date: Sun, 5 Nov 2017 17:08:16 +0100
|
|
3 |
Subject: [PATCH] {aes-armv4|bsaes-armv7|sha256-armv4}.pl: make it work with
|
|
4 |
binutils-2.29
|
|
5 |
|
|
6 |
It's not clear if it's a feature or bug, but binutils-2.29[.1]
|
|
7 |
interprets 'adr' instruction with Thumb2 code reference differently,
|
|
8 |
in a way that affects calculation of addresses of constants' tables.
|
|
9 |
|
|
10 |
Reviewed-by: Bernd Edlinger <[email protected]>
|
|
11 |
Reviewed-by: Kurt Roeckx <[email protected]>
|
|
12 |
(Merged from https://github.com/openssl/openssl/pull/4673)
|
|
13 |
---
|
|
14 |
crypto/aes/asm/aes-armv4.pl | 6 +++---
|
|
15 |
crypto/aes/asm/bsaes-armv7.pl | 6 +++---
|
|
16 |
crypto/sha/asm/sha256-armv4.pl | 2 +-
|
|
17 |
3 files changed, 7 insertions(+), 7 deletions(-)
|
|
18 |
|
|
19 |
diff --git a/crypto/aes/asm/aes-armv4.pl b/crypto/aes/asm/aes-armv4.pl
|
|
20 |
index 4f8917089f6..c1b5e352d76 100644
|
|
21 |
--- a/crypto/aes/asm/aes-armv4.pl
|
|
22 |
+++ b/crypto/aes/asm/aes-armv4.pl
|
|
23 |
@@ -184,7 +184,7 @@
|
|
24 |
#if __ARM_ARCH__<7
|
|
25 |
sub r3,pc,#8 @ AES_encrypt
|
|
26 |
#else
|
|
27 |
- adr r3,AES_encrypt
|
|
28 |
+ adr r3,.
|
|
29 |
#endif
|
|
30 |
stmdb sp!,{r1,r4-r12,lr}
|
|
31 |
mov $rounds,r0 @ inp
|
|
32 |
@@ -430,7 +430,7 @@
|
|
33 |
#if __ARM_ARCH__<7
|
|
34 |
sub r3,pc,#8 @ AES_set_encrypt_key
|
|
35 |
#else
|
|
36 |
- adr r3,private_AES_set_encrypt_key
|
|
37 |
+ adr r3,.
|
|
38 |
#endif
|
|
39 |
teq r0,#0
|
|
40 |
#if __ARM_ARCH__>=7
|
|
41 |
@@ -952,7 +952,7 @@
|
|
42 |
#if __ARM_ARCH__<7
|
|
43 |
sub r3,pc,#8 @ AES_decrypt
|
|
44 |
#else
|
|
45 |
- adr r3,AES_decrypt
|
|
46 |
+ adr r3,.
|
|
47 |
#endif
|
|
48 |
stmdb sp!,{r1,r4-r12,lr}
|
|
49 |
mov $rounds,r0 @ inp
|
|
50 |
diff --git a/crypto/aes/asm/bsaes-armv7.pl b/crypto/aes/asm/bsaes-armv7.pl
|
|
51 |
index 70b3f9656f4..ec66b0502a6 100644
|
|
52 |
--- a/crypto/aes/asm/bsaes-armv7.pl
|
|
53 |
+++ b/crypto/aes/asm/bsaes-armv7.pl
|
|
54 |
@@ -724,7 +724,7 @@ sub bitslice {
|
|
55 |
.type _bsaes_decrypt8,%function
|
|
56 |
.align 4
|
|
57 |
_bsaes_decrypt8:
|
|
58 |
- adr $const,_bsaes_decrypt8
|
|
59 |
+ adr $const,.
|
|
60 |
vldmia $key!, {@XMM[9]} @ round 0 key
|
|
61 |
add $const,$const,#.LM0ISR-_bsaes_decrypt8
|
|
62 |
|
|
63 |
@@ -819,7 +819,7 @@ sub bitslice {
|
|
64 |
.type _bsaes_encrypt8,%function
|
|
65 |
.align 4
|
|
66 |
_bsaes_encrypt8:
|
|
67 |
- adr $const,_bsaes_encrypt8
|
|
68 |
+ adr $const,.
|
|
69 |
vldmia $key!, {@XMM[9]} @ round 0 key
|
|
70 |
sub $const,$const,#_bsaes_encrypt8-.LM0SR
|
|
71 |
|
|
72 |
@@ -923,7 +923,7 @@ sub bitslice_key {
|
|
73 |
.type _bsaes_key_convert,%function
|
|
74 |
.align 4
|
|
75 |
_bsaes_key_convert:
|
|
76 |
- adr $const,_bsaes_key_convert
|
|
77 |
+ adr $const,.
|
|
78 |
vld1.8 {@XMM[7]}, [$inp]! @ load round 0 key
|
|
79 |
sub $const,$const,#_bsaes_key_convert-.LM0
|
|
80 |
vld1.8 {@XMM[15]}, [$inp]! @ load round 1 key
|
|
81 |
diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl
|
|
82 |
index 4fee74d832d..750216eb426 100644
|
|
83 |
--- a/crypto/sha/asm/sha256-armv4.pl
|
|
84 |
+++ b/crypto/sha/asm/sha256-armv4.pl
|
|
85 |
@@ -205,7 +205,7 @@ sub BODY_16_XX {
|
|
86 |
#if __ARM_ARCH__<7
|
|
87 |
sub r3,pc,#8 @ sha256_block_data_order
|
|
88 |
#else
|
|
89 |
- adr r3,sha256_block_data_order
|
|
90 |
+ adr r3,.
|
|
91 |
#endif
|
|
92 |
#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
|
|
93 |
ldr r12,.LOPENSSL_armcap
|