summaryrefslogtreecommitdiffstats
path: root/recipes-connectivity/openssl/openssl-qoriq/0001-aes-asm-aes-armv4-bsaes-armv7-.pl-make-it-work-with-.patch
diff options
context:
space:
mode:
authorChunrong Guo <chunrong.guo@nxp.com>2018-09-29 16:59:47 +0800
committerOtavio Salvador <otavio@ossystems.com.br>2018-10-01 13:51:02 -0300
commit948d257eee170bf1d6dc40a01d9bf17a3c3549b9 (patch)
tree2602d7d34fe85807f1b45c97821c9bb5ae4e9db0 /recipes-connectivity/openssl/openssl-qoriq/0001-aes-asm-aes-armv4-bsaes-armv7-.pl-make-it-work-with-.patch
parent6c2aabd5a2f5e81c1f1b18df20523cd12d6a344e (diff)
downloadmeta-freescale-948d257eee170bf1d6dc40a01d9bf17a3c3549b9.tar.gz
openssl-qoriq: update to 1.1.0
*update to lsdk 1809 tag include the following changes: c2300d1 - eng_cryptodev: add support for TLS algorithms offload b2758a2 - Prepare for 1.1.0g release 6190960 - Update CHANGES and NEWS for new release 4443cf7 - bn/asm/x86_64-mont5.pl: fix carry bug in bn_sqrx8x_internal. b701fa8 - Fix small but important regression ab91952 - Address a timing side channel whereby it is possible to determine some 7184480 - Address a timing side channel whereby it is possible to determine some bb0c588 - Travis: Add a docs checking job df45d1a - docs: assign section 7 where appropriate 847685c - doc/crypto/OPENSSL_secure_malloc: add missing names 4401e28 - docs: fixup OpenSSL version style 41d74a5 - Adapt util/find-doc-nits back to 1.1.0 7fb4278 - Fix EVP_PKEY_ASN1_METHOD manual 0d9fece - afalg: Fix kernel version check a0c2626 - afalg: Use eventfd2 syscall instead of eventfd 605fa68 - EVP_PKEY_asn1_add0(): Check that this method isn't already registered 6088fb7 - Document EVP_PKEY_ASN1_METHOD and associated functions 5a3d24a - Only reset the ctx when a cipher is given 257a03c - Add missing paren. *update to 1.1.1 Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-connectivity/openssl/openssl-qoriq/0001-aes-asm-aes-armv4-bsaes-armv7-.pl-make-it-work-with-.patch')
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/0001-aes-asm-aes-armv4-bsaes-armv7-.pl-make-it-work-with-.patch88
1 files changed, 88 insertions, 0 deletions
diff --git a/recipes-connectivity/openssl/openssl-qoriq/0001-aes-asm-aes-armv4-bsaes-armv7-.pl-make-it-work-with-.patch b/recipes-connectivity/openssl/openssl-qoriq/0001-aes-asm-aes-armv4-bsaes-armv7-.pl-make-it-work-with-.patch
new file mode 100644
index 00000000..bb0a1689
--- /dev/null
+++ b/recipes-connectivity/openssl/openssl-qoriq/0001-aes-asm-aes-armv4-bsaes-armv7-.pl-make-it-work-with-.patch
@@ -0,0 +1,88 @@
1From bcc096a50811bf0f0c4fd34b2993fed7a7015972 Mon Sep 17 00:00:00 2001
2From: Andy Polyakov <appro@openssl.org>
3Date: Fri, 3 Nov 2017 23:30:01 +0100
4Subject: [PATCH] aes/asm/{aes-armv4|bsaes-armv7}.pl: make it work with
5 binutils-2.29.
6
7It's not clear if it's a feature or bug, but binutils-2.29[.1]
8interprets 'adr' instruction with Thumb2 code reference differently,
9in a way that affects calculation of addresses of constants' tables.
10
11Upstream-Status: Backport
12
13Reviewed-by: Tim Hudson <tjh@openssl.org>
14Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
15Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
16(Merged from https://github.com/openssl/openssl/pull/4669)
17
18(cherry picked from commit b82acc3c1a7f304c9df31841753a0fa76b5b3cda)
19---
20 crypto/aes/asm/aes-armv4.pl | 6 +++---
21 crypto/aes/asm/bsaes-armv7.pl | 6 +++---
22 2 files changed, 6 insertions(+), 6 deletions(-)
23
24diff --git a/crypto/aes/asm/aes-armv4.pl b/crypto/aes/asm/aes-armv4.pl
25index 16d79aae53..c6474b8aad 100644
26--- a/crypto/aes/asm/aes-armv4.pl
27+++ b/crypto/aes/asm/aes-armv4.pl
28@@ -200,7 +200,7 @@ AES_encrypt:
29 #ifndef __thumb2__
30 sub r3,pc,#8 @ AES_encrypt
31 #else
32- adr r3,AES_encrypt
33+ adr r3,.
34 #endif
35 stmdb sp!,{r1,r4-r12,lr}
36 #ifdef __APPLE__
37@@ -450,7 +450,7 @@ _armv4_AES_set_encrypt_key:
38 #ifndef __thumb2__
39 sub r3,pc,#8 @ AES_set_encrypt_key
40 #else
41- adr r3,AES_set_encrypt_key
42+ adr r3,.
43 #endif
44 teq r0,#0
45 #ifdef __thumb2__
46@@ -976,7 +976,7 @@ AES_decrypt:
47 #ifndef __thumb2__
48 sub r3,pc,#8 @ AES_decrypt
49 #else
50- adr r3,AES_decrypt
51+ adr r3,.
52 #endif
53 stmdb sp!,{r1,r4-r12,lr}
54 #ifdef __APPLE__
55diff --git a/crypto/aes/asm/bsaes-armv7.pl b/crypto/aes/asm/bsaes-armv7.pl
56index 9f288660ef..a27bb4a179 100644
57--- a/crypto/aes/asm/bsaes-armv7.pl
58+++ b/crypto/aes/asm/bsaes-armv7.pl
59@@ -744,7 +744,7 @@ $code.=<<___;
60 .type _bsaes_decrypt8,%function
61 .align 4
62 _bsaes_decrypt8:
63- adr $const,_bsaes_decrypt8
64+ adr $const,.
65 vldmia $key!, {@XMM[9]} @ round 0 key
66 #ifdef __APPLE__
67 adr $const,.LM0ISR
68@@ -843,7 +843,7 @@ _bsaes_const:
69 .type _bsaes_encrypt8,%function
70 .align 4
71 _bsaes_encrypt8:
72- adr $const,_bsaes_encrypt8
73+ adr $const,.
74 vldmia $key!, {@XMM[9]} @ round 0 key
75 #ifdef __APPLE__
76 adr $const,.LM0SR
77@@ -951,7 +951,7 @@ $code.=<<___;
78 .type _bsaes_key_convert,%function
79 .align 4
80 _bsaes_key_convert:
81- adr $const,_bsaes_key_convert
82+ adr $const,.
83 vld1.8 {@XMM[7]}, [$inp]! @ load round 0 key
84 #ifdef __APPLE__
85 adr $const,.LM0
86--
872.15.0
88