Module Name: src
Committed By: martin
Date: Sat Sep 29 19:45:18 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes-armv4.S
aesv8-armx.S arm64cpuid.S armv4-gf2m.S armv4-mont.S armv4cpuid.S
armv8-mont.S bsaes-armv7.S chacha-armv4.S chacha-armv8.S
ecp_nistz256-armv4.S ecp_nistz256-armv8.S ghash-armv4.S
ghashv8-armx.S keccak1600-armv4.S keccak1600-armv8.S
poly1305-armv4.S poly1305-armv8.S sha1-armv4-large.S sha1-armv8.S
sha256-armv4.S sha512-armv4.S sha512-armv8.S vpaes-armv8.S
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4cpuid.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghashv8-armx.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha256-armv4.S
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aesv8-armx.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-mont.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bsaes-armv7.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv4-large.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv4.S
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm64cpuid.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv4.S
\
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv8.S
\
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv8.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/vpaes-armv8.S
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv8-mont.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv8.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv8.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv8.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv8.S
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S:1.4 Sun Sep 23 13:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
@ Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved.
@
@ Licensed under the OpenSSL license (the "License"). You may not use
@@ -708,7 +709,7 @@ _armv4_AES_set_encrypt_key:
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr}
.Labrt:
#if __ARM_ARCH__>=5
- bx lr @ .word 0xe12fff1e
+ RET @ .word 0xe12fff1e
#else
tst lr,#1
moveq pc,lr @ be binary compatible with V4, yet
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4cpuid.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4cpuid.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4cpuid.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4cpuid.S:1.4 Sun Sep 23 13:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4cpuid.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
#include "arm_arch.h"
.text
@@ -20,7 +21,7 @@ OPENSSL_atomic_add:
cmp r2,#0
bne .Ladd
mov r0,r3
- bx lr
+ RET
#else
stmdb sp!,{r4,r5,r6,lr}
ldr r2,.Lspinlock
@@ -42,7 +43,7 @@ OPENSSL_atomic_add:
ldmia sp!,{r4,r5,r6,lr}
tst lr,#1
moveq pc,lr
-.word 0xe12fff1e @ bx lr
+.word 0xe12fff1e @ RET
#endif
.size OPENSSL_atomic_add,.-OPENSSL_atomic_add
@@ -77,11 +78,11 @@ OPENSSL_cleanse:
bne .Little
.Lcleanse_done:
#if __ARM_ARCH__>=5
- bx lr
+ RET
#else
tst lr,#1
moveq pc,lr
-.word 0xe12fff1e @ bx lr
+.word 0xe12fff1e @ RET
#endif
.size OPENSSL_cleanse,.-OPENSSL_cleanse
@@ -107,11 +108,11 @@ CRYPTO_memcmp:
rsb r0,ip,#0
mov r0,r0,lsr#31
#if __ARM_ARCH__>=5
- bx lr
+ RET
#else
tst lr,#1
moveq pc,lr
-.word 0xe12fff1e @ bx lr
+.word 0xe12fff1e @ RET
#endif
.size CRYPTO_memcmp,.-CRYPTO_memcmp
@@ -124,7 +125,7 @@ CRYPTO_memcmp:
.type _armv7_neon_probe,%function
_armv7_neon_probe:
vorr q0,q0,q0
- bx lr
+ RET
.size _armv7_neon_probe,.-_armv7_neon_probe
.globl _armv7_tick
@@ -135,7 +136,7 @@ _armv7_tick:
#else
mrrc p15,1,r0,r1,c14 @ CNTVCT
#endif
- bx lr
+ RET
.size _armv7_tick,.-_armv7_tick
.globl _armv8_aes_probe
@@ -146,7 +147,7 @@ _armv8_aes_probe:
#else
.byte 0x00,0x03,0xb0,0xf3 @ aese.8 q0,q0
#endif
- bx lr
+ RET
.size _armv8_aes_probe,.-_armv8_aes_probe
.globl _armv8_sha1_probe
@@ -157,7 +158,7 @@ _armv8_sha1_probe:
#else
.byte 0x40,0x0c,0x00,0xf2 @ sha1c.32 q0,q0,q0
#endif
- bx lr
+ RET
.size _armv8_sha1_probe,.-_armv8_sha1_probe
.globl _armv8_sha256_probe
@@ -168,7 +169,7 @@ _armv8_sha256_probe:
#else
.byte 0x40,0x0c,0x00,0xf3 @ sha256h.32 q0,q0,q0
#endif
- bx lr
+ RET
.size _armv8_sha256_probe,.-_armv8_sha256_probe
.globl _armv8_pmull_probe
.type _armv8_pmull_probe,%function
@@ -178,7 +179,7 @@ _armv8_pmull_probe:
#else
.byte 0x00,0x0e,0xa0,0xf2 @ vmull.p64 q0,d0,d0
#endif
- bx lr
+ RET
.size _armv8_pmull_probe,.-_armv8_pmull_probe
#endif
@@ -215,11 +216,11 @@ OPENSSL_wipe_cpu:
#endif
mov r0,sp
#if __ARM_ARCH__>=5
- bx lr
+ RET
#else
tst lr,#1
moveq pc,lr
-.word 0xe12fff1e @ bx lr
+.word 0xe12fff1e @ RET
#endif
.size OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu
@@ -228,11 +229,11 @@ OPENSSL_wipe_cpu:
OPENSSL_instrument_bus:
eor r0,r0,r0
#if __ARM_ARCH__>=5
- bx lr
+ RET
#else
tst lr,#1
moveq pc,lr
-.word 0xe12fff1e @ bx lr
+.word 0xe12fff1e @ RET
#endif
.size OPENSSL_instrument_bus,.-OPENSSL_instrument_bus
@@ -241,11 +242,11 @@ OPENSSL_instrument_bus:
OPENSSL_instrument_bus2:
eor r0,r0,r0
#if __ARM_ARCH__>=5
- bx lr
+ RET
#else
tst lr,#1
moveq pc,lr
-.word 0xe12fff1e @ bx lr
+.word 0xe12fff1e @ RET
#endif
.size OPENSSL_instrument_bus2,.-OPENSSL_instrument_bus2
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghashv8-armx.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghashv8-armx.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghashv8-armx.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghashv8-armx.S:1.4 Sun Sep 23 13:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghashv8-armx.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
#include "arm_arch.h"
#if __ARM_MAX_ARCH__>=7
@@ -52,7 +53,7 @@ gcm_init_v8:
veor q9,q9,q14
vext.8 q13,q8,q9,#8 @ pack Karatsuba pre-processed
vst1.64 {q13,q14},[r0]! @ store Htable[1..2]
- bx lr
+ RET
.size gcm_init_v8,.-gcm_init_v8
.globl gcm_gmult_v8
.type gcm_gmult_v8,%function
@@ -93,7 +94,7 @@ gcm_gmult_v8:
vext.8 q0,q0,q0,#8
vst1.64 {q0},[r0] @ write out Xi
- bx lr
+ RET
.size gcm_gmult_v8,.-gcm_gmult_v8
.globl gcm_ghash_v8
.type gcm_ghash_v8,%function
@@ -225,7 +226,7 @@ gcm_ghash_v8:
vst1.64 {q0},[r0] @ write out Xi
vldmia sp!,{d8,d9,d10,d11,d12,d13,d14,d15} @ 32-bit ABI says so
- bx lr
+ RET
.size gcm_ghash_v8,.-gcm_ghash_v8
.byte 71,72,65,83,72,32,102,111,114,32,65,82,77,118,56,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
.align 2
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha256-armv4.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha256-armv4.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha256-armv4.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha256-armv4.S:1.4 Sun Sep 23 13:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha256-armv4.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
@ Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved.
@
@ Licensed under the OpenSSL license (the "License"). You may not use
@@ -2802,7 +2803,7 @@ sha256_block_data_order_armv8:
vst1.32 {q0,q1},[r0]
- bx lr @ bx lr
+ RET @ bx lr
.size sha256_block_data_order_armv8,.-sha256_block_data_order_armv8
#endif
.byte 83,72,65,50,53,54,32,98,108,111,99,107,32,116,114,97,110,115,102,111,114,109,32,102,111,114,32,65,82,77,118,52,47,78,69,79,78,47,65,82,77,118,56,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aesv8-armx.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aesv8-armx.S:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aesv8-armx.S:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aesv8-armx.S:1.3 Sat Mar 3 00:20:57 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aesv8-armx.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
#include "arm_arch.h"
#if __ARM_MAX_ARCH__>=7
@@ -179,7 +180,7 @@ aes_v8_set_encrypt_key:
.Lenc_key_abort:
mov r0,r3 @ return value
- bx lr
+ RET
.size aes_v8_set_encrypt_key,.-aes_v8_set_encrypt_key
.globl aes_v8_set_decrypt_key
@@ -246,7 +247,7 @@ aes_v8_encrypt:
veor q2,q2,q0
vst1.8 {q2},[r1]
- bx lr
+ RET
.size aes_v8_encrypt,.-aes_v8_encrypt
.globl aes_v8_decrypt
.type aes_v8_decrypt,%function
@@ -275,7 +276,7 @@ aes_v8_decrypt:
veor q2,q2,q0
vst1.8 {q2},[r1]
- bx lr
+ RET
.size aes_v8_decrypt,.-aes_v8_decrypt
.globl aes_v8_cbc_encrypt
.type aes_v8_cbc_encrypt,%function
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S:1.3 Sat Mar 3 00:20:57 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
#include "arm_arch.h"
.text
@@ -211,7 +212,7 @@ bn_GF2m_mul_2x2:
veor q0, q0, q3
vst1.32 {q0}, [r0]
- bx lr @ bx lr
+ RET @ bx lr
#endif
.size bn_GF2m_mul_2x2,.-bn_GF2m_mul_2x2
#if __ARM_MAX_ARCH__>=7
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-mont.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-mont.S:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-mont.S:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-mont.S:1.3 Sun Sep 23 13:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-mont.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
#include "arm_arch.h"
.text
@@ -183,7 +184,7 @@ bn_mul_mont:
mov r0,#1
.Labrt:
#if __ARM_ARCH__>=5
- bx lr @ bx lr
+ RET @ bx lr
#else
tst lr,#1
moveq pc,lr @ be binary compatible with V4, yet
@@ -942,7 +943,7 @@ bn_mul8x_mont_neon:
mov sp,ip
vldmia sp!,{d8,d9,d10,d11,d12,d13,d14,d15}
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11}
- bx lr @ bx lr
+ RET @ bx lr
.size bn_mul8x_mont_neon,.-bn_mul8x_mont_neon
#endif
.byte 77,111,110,116,103,111,109,101,114,121,32,109,117,108,116,105,112,108,105,99,97,116,105,111,110,32,102,111,114,32,65,82,77,118,52,47,78,69,79,78,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bsaes-armv7.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bsaes-armv7.S:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bsaes-armv7.S:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bsaes-armv7.S:1.3 Sun Sep 23 13:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bsaes-armv7.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
@ Copyright 2012-2018 The OpenSSL Project Authors. All Rights Reserved.
@
@ Licensed under the OpenSSL license (the "License"). You may not use
@@ -546,7 +547,7 @@ _bsaes_decrypt8:
veor q5, q5, q8
veor q0, q0, q8
veor q1, q1, q8
- bx lr
+ RET
.size _bsaes_decrypt8,.-_bsaes_decrypt8
.type _bsaes_const,%object
@@ -1006,7 +1007,7 @@ _bsaes_encrypt8_bitslice:
veor q5, q5, q8
veor q0, q0, q8
veor q1, q1, q8
- bx lr
+ RET
.size _bsaes_encrypt8,.-_bsaes_encrypt8
.type _bsaes_key_convert,%function
.align 4
@@ -1065,7 +1066,7 @@ _bsaes_key_convert:
vmov.i8 q7,#0x63 @ compose .L63
@ don't save last round key
- bx lr
+ RET
.size _bsaes_key_convert,.-_bsaes_key_convert
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv4-large.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv4-large.S:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv4-large.S:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv4-large.S:1.3 Sat Mar 3 00:20:57 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv4-large.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
#include "arm_arch.h"
.text
@@ -1483,7 +1484,7 @@ sha1_block_data_order_armv8:
vst1.32 {d2[0]},[r0]
vldmia sp!,{d8,d9,d10,d11,d12,d13,d14,d15}
- bx lr @ bx lr
+ RET @ bx lr
.size sha1_block_data_order_armv8,.-sha1_block_data_order_armv8
#endif
#if __ARM_MAX_ARCH__>=7
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv4.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv4.S:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv4.S:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv4.S:1.3 Sun Sep 23 13:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv4.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
@ Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved.
@
@ Licensed under the OpenSSL license (the "License"). You may not use
@@ -1858,7 +1859,7 @@ sha512_block_data_order_neon:
bne .Loop_neon
VFP_ABI_POP
- bx lr @ .word 0xe12fff1e
+ RET @ .word 0xe12fff1e
.size sha512_block_data_order_neon,.-sha512_block_data_order_neon
#endif
.byte 83,72,65,53,49,50,32,98,108,111,99,107,32,116,114,97,110,115,102,111,114,109,32,102,111,114,32,65,82,77,118,52,47,78,69,79,78,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm64cpuid.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm64cpuid.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm64cpuid.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm64cpuid.S:1.2 Sun Sep 23 13:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm64cpuid.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
#include "arm_arch.h"
.text
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv4.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv4.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv4.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv4.S:1.2 Sun Sep 23 13:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv4.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
#include "arm_arch.h"
.text
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv4.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv4.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv4.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv4.S:1.2 Sun Sep 23 13:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv4.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
#include "arm_arch.h"
.text
@@ -2416,7 +2417,7 @@ ecp_nistz256_mul_by_2:
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,pc}
#else
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr}
- bx lr @ interoperable with Thumb ISA:-)
+ RET @ interoperable with Thumb ISA:-)
#endif
.size ecp_nistz256_mul_by_2,.-ecp_nistz256_mul_by_2
@@ -2457,7 +2458,7 @@ ecp_nistz256_add:
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,pc}
#else
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr}
- bx lr @ interoperable with Thumb ISA:-)
+ RET @ interoperable with Thumb ISA:-)
#endif
.size ecp_nistz256_add,.-ecp_nistz256_add
@@ -2547,7 +2548,7 @@ ecp_nistz256_mul_by_3:
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,pc}
#else
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr}
- bx lr @ interoperable with Thumb ISA:-)
+ RET @ interoperable with Thumb ISA:-)
#endif
.size ecp_nistz256_mul_by_3,.-ecp_nistz256_mul_by_3
@@ -2632,7 +2633,7 @@ ecp_nistz256_div_by_2:
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,pc}
#else
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr}
- bx lr @ interoperable with Thumb ISA:-)
+ RET @ interoperable with Thumb ISA:-)
#endif
.size ecp_nistz256_div_by_2,.-ecp_nistz256_div_by_2
@@ -2707,7 +2708,7 @@ ecp_nistz256_sub:
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,pc}
#else
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr}
- bx lr @ interoperable with Thumb ISA:-)
+ RET @ interoperable with Thumb ISA:-)
#endif
.size ecp_nistz256_sub,.-ecp_nistz256_sub
@@ -2783,7 +2784,7 @@ ecp_nistz256_neg:
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,pc}
#else
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr}
- bx lr @ interoperable with Thumb ISA:-)
+ RET @ interoperable with Thumb ISA:-)
#endif
.size ecp_nistz256_neg,.-ecp_nistz256_neg
@@ -2833,7 +2834,7 @@ ecp_nistz256_mul_mont:
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,pc}
#else
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr}
- bx lr @ interoperable with Thumb ISA:-)
+ RET @ interoperable with Thumb ISA:-)
#endif
.size ecp_nistz256_mul_mont,.-ecp_nistz256_mul_mont
@@ -3334,7 +3335,7 @@ ecp_nistz256_scatter_w5:
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11}
#if __ARM_ARCH__>=5 || defined(__thumb__)
- bx lr
+ RET
#else
mov pc,lr
#endif
@@ -3415,7 +3416,7 @@ ecp_nistz256_gather_w5:
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11}
#if __ARM_ARCH__>=5 || defined(__thumb__)
- bx lr
+ RET
#else
mov pc,lr
#endif
@@ -3443,7 +3444,7 @@ ecp_nistz256_scatter_w7:
bne .Loop_scatter_w7
#if __ARM_ARCH__>=5 || defined(__thumb__)
- bx lr
+ RET
#else
mov pc,lr
#endif
@@ -3483,7 +3484,7 @@ ecp_nistz256_gather_w7:
ldmia sp!,{r4,r5,r6,r7}
#if __ARM_ARCH__>=5 || defined(__thumb__)
- bx lr
+ RET
#else
mov pc,lr
#endif
@@ -3728,7 +3729,7 @@ ecp_nistz256_point_double:
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,pc}
#else
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr}
- bx lr @ interoperable with Thumb ISA:-)
+ RET @ interoperable with Thumb ISA:-)
#endif
.size ecp_nistz256_point_double,.-ecp_nistz256_point_double
.globl ecp_nistz256_point_add
@@ -4118,7 +4119,7 @@ ecp_nistz256_point_add:
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,pc}
#else
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr}
- bx lr @ interoperable with Thumb ISA:-)
+ RET @ interoperable with Thumb ISA:-)
#endif
.size ecp_nistz256_point_add,.-ecp_nistz256_point_add
.globl ecp_nistz256_point_add_affine
@@ -4435,6 +4436,6 @@ ecp_nistz256_point_add_affine:
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,pc}
#else
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr}
- bx lr @ interoperable with Thumb ISA:-)
+ RET @ interoperable with Thumb ISA:-)
#endif
.size ecp_nistz256_point_add_affine,.-ecp_nistz256_point_add_affine
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv8.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv8.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv8.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv8.S:1.2 Sun Sep 23 13:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv8.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
#include "arm_arch.h"
.text
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv4.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv4.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv4.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv4.S:1.2 Sun Sep 23 13:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv4.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
#include "arm_arch.h"
.text
@@ -122,7 +123,7 @@ poly1305_init:
.Lno_key:
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11}
#if __ARM_ARCH__>=5
- bx lr @ bx lr
+ RET @ bx lr
#else
tst lr,#1
moveq pc,lr @ be binary compatible with V4, yet
@@ -373,7 +374,7 @@ poly1305_emit:
#endif
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11}
#if __ARM_ARCH__>=5
- bx lr @ bx lr
+ RET @ bx lr
#else
tst lr,#1
moveq pc,lr @ be binary compatible with V4, yet
@@ -594,7 +595,7 @@ poly1305_init_neon:
vst1.32 {d8[0]},[r6]
vst1.32 {d8[1]},[r7]
- bx lr @ bx lr
+ RET @ bx lr
.size poly1305_init_neon,.-poly1305_init_neon
.type poly1305_blocks_neon,%function
@@ -1080,7 +1081,7 @@ poly1305_blocks_neon:
vldmia sp!,{d8,d9,d10,d11,d12,d13,d14,d15} @ epilogue
ldmia sp!,{r4,r5,r6,r7}
.Lno_data_neon:
- bx lr @ bx lr
+ RET @ bx lr
.size poly1305_blocks_neon,.-poly1305_blocks_neon
.type poly1305_emit_neon,%function
@@ -1151,7 +1152,7 @@ poly1305_emit_neon:
str r6,[r1,#12]
ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11}
- bx lr @ bx lr
+ RET @ bx lr
.size poly1305_emit_neon,.-poly1305_emit_neon
.align 5
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv8.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv8.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv8.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv8.S:1.2 Sun Sep 23 13:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv8.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
// Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved.
//
// Licensed under the OpenSSL license (the "License"). You may not use
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/vpaes-armv8.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/vpaes-armv8.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/vpaes-armv8.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/vpaes-armv8.S:1.2 Sun Sep 23 13:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/vpaes-armv8.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
.text
.type _vpaes_consts,%object
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv8-mont.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv8-mont.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv8-mont.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv8-mont.S:1.1 Sat Mar 3 00:20:57 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv8-mont.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
.text
.globl bn_mul_mont
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv8.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv8.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv8.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv8.S:1.1 Sat Mar 3 00:20:57 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv8.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
#include "arm_arch.h"
.text
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv4.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv4.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv4.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv4.S:1.1 Sun Sep 23 13:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv4.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
#include "arm_arch.h"
.text
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv8.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv8.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv8.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv8.S:1.1 Sun Sep 23 13:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv8.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
.text
.align 8 // strategic alignment and padding that allows to use
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv8.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv8.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv8.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv8.S:1.1 Sat Mar 3 00:20:57 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv8.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
#include "arm_arch.h"
.text
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv8.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv8.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv8.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv8.S:1.1 Sat Mar 3 00:20:57 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv8.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
#include "arm_arch.h"
.text
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S:1.5 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S:1.6
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S:1.5 Sun Sep 23 13:33:04 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S Sat Sep 29 19:45:18 2018
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
#include "arm_arch.h"
.text
@@ -367,7 +368,7 @@ gcm_init_neon:
veor q3,q3,q8 @ twisted H
vstmia r0,{q3}
- bx lr @ bx lr
+ RET @ bx lr
.size gcm_init_neon,.-gcm_init_neon
.globl gcm_gmult_neon
@@ -555,7 +556,7 @@ gcm_ghash_neon:
vst1.64 d1,[r0]! @ write out Xi
vst1.64 d0,[r0]
- bx lr @ bx lr
+ RET @ bx lr
.size gcm_ghash_neon,.-gcm_ghash_neon
#endif
.byte 71,72,65,83,72,32,102,111,114,32,65,82,77,118,52,47,78,69,79,78,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
