Index: third_party/boringssl/linux-arm/crypto/aes/aes-armv4.S |
diff --git a/third_party/boringssl/linux-arm/crypto/aes/aes-armv4.S b/third_party/boringssl/linux-arm/crypto/aes/aes-armv4.S |
index c29187845b5abed15b013847fa1a53ff86c369ad..0b7d1938d1d30082422341b2e15ffa32cbbecdb7 100644 |
--- a/third_party/boringssl/linux-arm/crypto/aes/aes-armv4.S |
+++ b/third_party/boringssl/linux-arm/crypto/aes/aes-armv4.S |
@@ -156,21 +156,22 @@ AES_Te: |
.word 0x1B000000, 0x36000000, 0, 0, 0, 0, 0, 0 |
.size AES_Te,.-AES_Te |
-@ void AES_encrypt(const unsigned char *in, unsigned char *out, |
-@ const AES_KEY *key) { |
-.global AES_encrypt |
-.type AES_encrypt,%function |
+@ void asm_AES_encrypt(const unsigned char *in, unsigned char *out, |
+@ const AES_KEY *key) { |
+.global asm_AES_encrypt |
+.hidden asm_AES_encrypt |
+.type asm_AES_encrypt,%function |
.align 5 |
-AES_encrypt: |
+asm_AES_encrypt: |
#if __ARM_ARCH__<7 |
- sub r3,pc,#8 @ AES_encrypt |
+ sub r3,pc,#8 @ asm_AES_encrypt |
#else |
- adr r3,AES_encrypt |
+ adr r3,asm_AES_encrypt |
#endif |
stmdb sp!,{r1,r4-r12,lr} |
mov r12,r0 @ inp |
mov r11,r2 |
- sub r10,r3,#AES_encrypt-AES_Te @ Te |
+ sub r10,r3,#asm_AES_encrypt-AES_Te @ Te |
#if __ARM_ARCH__<7 |
ldrb r0,[r12,#3] @ load input data in endian-neutral |
ldrb r4,[r12,#2] @ manner... |
@@ -264,7 +265,7 @@ AES_encrypt: |
moveq pc,lr @ be binary compatible with V4, yet |
.word 0xe12fff1e @ interoperable with Thumb ISA:-) |
#endif |
-.size AES_encrypt,.-AES_encrypt |
+.size asm_AES_encrypt,.-asm_AES_encrypt |
.type _armv4_AES_encrypt,%function |
.align 2 |
@@ -403,15 +404,16 @@ _armv4_AES_encrypt: |
ldr pc,[sp],#4 @ pop and return |
.size _armv4_AES_encrypt,.-_armv4_AES_encrypt |
-.global AES_set_encrypt_key |
-.type AES_set_encrypt_key,%function |
+.global asm_AES_set_encrypt_key |
+.hidden asm_AES_set_encrypt_key |
+.type asm_AES_set_encrypt_key,%function |
.align 5 |
-AES_set_encrypt_key: |
+asm_AES_set_encrypt_key: |
_armv4_AES_set_encrypt_key: |
#if __ARM_ARCH__<7 |
- sub r3,pc,#8 @ AES_set_encrypt_key |
+ sub r3,pc,#8 @ asm_AES_set_encrypt_key |
#else |
- adr r3,AES_set_encrypt_key |
+ adr r3,asm_AES_set_encrypt_key |
#endif |
teq r0,#0 |
#if __ARM_ARCH__>=7 |
@@ -703,25 +705,27 @@ _armv4_AES_set_encrypt_key: |
moveq pc,lr @ be binary compatible with V4, yet |
.word 0xe12fff1e @ interoperable with Thumb ISA:-) |
#endif |
-.size AES_set_encrypt_key,.-AES_set_encrypt_key |
+.size asm_AES_set_encrypt_key,.-asm_AES_set_encrypt_key |
-.global AES_set_decrypt_key |
-.type AES_set_decrypt_key,%function |
+.global asm_AES_set_decrypt_key |
+.hidden asm_AES_set_decrypt_key |
+.type asm_AES_set_decrypt_key,%function |
.align 5 |
-AES_set_decrypt_key: |
+asm_AES_set_decrypt_key: |
str lr,[sp,#-4]! @ push lr |
bl _armv4_AES_set_encrypt_key |
teq r0,#0 |
ldr lr,[sp],#4 @ pop lr |
bne .Labrt |
- mov r0,r2 @ AES_set_encrypt_key preserves r2, |
+ mov r0,r2 @ asm_AES_set_encrypt_key preserves r2, |
mov r1,r2 @ which is AES_KEY *key |
b _armv4_AES_set_enc2dec_key |
-.size AES_set_decrypt_key,.-AES_set_decrypt_key |
+.size asm_AES_set_decrypt_key,.-asm_AES_set_decrypt_key |
@ void AES_set_enc2dec_key(const AES_KEY *inp,AES_KEY *out) |
.global AES_set_enc2dec_key |
+.hidden AES_set_enc2dec_key |
.type AES_set_enc2dec_key,%function |
.align 5 |
AES_set_enc2dec_key: |
@@ -919,21 +923,22 @@ AES_Td: |
.byte 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d |
.size AES_Td,.-AES_Td |
-@ void AES_decrypt(const unsigned char *in, unsigned char *out, |
-@ const AES_KEY *key) { |
-.global AES_decrypt |
-.type AES_decrypt,%function |
+@ void asm_AES_decrypt(const unsigned char *in, unsigned char *out, |
+@ const AES_KEY *key) { |
+.global asm_AES_decrypt |
+.hidden asm_AES_decrypt |
+.type asm_AES_decrypt,%function |
.align 5 |
-AES_decrypt: |
+asm_AES_decrypt: |
#if __ARM_ARCH__<7 |
- sub r3,pc,#8 @ AES_decrypt |
+ sub r3,pc,#8 @ asm_AES_decrypt |
#else |
- adr r3,AES_decrypt |
+ adr r3,asm_AES_decrypt |
#endif |
stmdb sp!,{r1,r4-r12,lr} |
mov r12,r0 @ inp |
mov r11,r2 |
- sub r10,r3,#AES_decrypt-AES_Td @ Td |
+ sub r10,r3,#asm_AES_decrypt-AES_Td @ Td |
#if __ARM_ARCH__<7 |
ldrb r0,[r12,#3] @ load input data in endian-neutral |
ldrb r4,[r12,#2] @ manner... |
@@ -1027,7 +1032,7 @@ AES_decrypt: |
moveq pc,lr @ be binary compatible with V4, yet |
.word 0xe12fff1e @ interoperable with Thumb ISA:-) |
#endif |
-.size AES_decrypt,.-AES_decrypt |
+.size asm_AES_decrypt,.-asm_AES_decrypt |
.type _armv4_AES_decrypt,%function |
.align 2 |