Revert of Roll src/third_party/boringssl/src 68de407:de12d6c

third_party/boringssl/linux-arm/crypto/aes/aes-armv4.S

 
 @ ====================================================================
 @ Written by Andy Polyakov <appro@openssl.org> for the OpenSSL
 @ project. The module is, however, dual licensed under OpenSSL and
 @ CRYPTOGAMS licenses depending on where you obtain it. For further
 @ details see http://www.openssl.org/~appro/cryptogams/.
 @ ====================================================================
 
 @ AES for ARMv4
 
@@ skipping 25 matching lines @@
 # include "arm_arch.h"
 #else
 # define __ARM_ARCH__ __LINUX_ARM_ARCH__
 #endif
 
 .text
 #if __ARM_ARCH__<7
 .code   32
 #else
 .syntax unified
-# if defined(__thumb2__) && !defined(__APPLE__)
+# ifdef __thumb2__
 .thumb
 # else
 .code   32
 # endif
 #endif
 
 .type   AES_Te,%object
 .align  5
 AES_Te:
 .word   0xc66363a5, 0xf87c7c84, 0xee777799, 0xf67b7b8d
@@ skipping 94 matching lines @@
 .byte   0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68
 .byte   0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16
 @ rcon[]
 .word   0x01000000, 0x02000000, 0x04000000, 0x08000000
 .word   0x10000000, 0x20000000, 0x40000000, 0x80000000
 .word   0x1B000000, 0x36000000, 0, 0, 0, 0, 0, 0
 .size   AES_Te,.-AES_Te
 
 @ void asm_AES_encrypt(const unsigned char *in, unsigned char *out,
 @                      const AES_KEY *key) {
-.globl  asm_AES_encrypt
-.hidden asm_AES_encrypt
-.type   asm_AES_encrypt,%function
+.global asm_AES_encrypt
+.hidden asm_AES_encrypt
+.type   asm_AES_encrypt,%function
 .align  5
 asm_AES_encrypt:
 #if __ARM_ARCH__<7
         sub     r3,pc,#8                @ asm_AES_encrypt
 #else
         adr     r3,asm_AES_encrypt
 #endif
-        stmdb   sp!,{r1,r4-r12,lr}
-#ifdef  __APPLE__
-        adr     r10,AES_Te
-#else
-        sub     r10,r3,#asm_AES_encrypt-AES_Te  @ Te
-#endif
+        stmdb   sp!,{r1,r4-r12,lr}
         mov     r12,r0          @ inp
         mov     r11,r2
+        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...
         ldrb    r5,[r12,#1]
         ldrb    r6,[r12,#0]
         orr     r0,r0,r4,lsl#8
         ldrb    r1,[r12,#7]
         orr     r0,r0,r5,lsl#16
         ldrb    r4,[r12,#6]
         orr     r0,r0,r6,lsl#24
@@ skipping 66 matching lines @@
         strb    r6,[r12,#10]
         mov     r5,r3,lsr#16
         strb    r2,[r12,#11]
         mov     r6,r3,lsr#8
         strb    r4,[r12,#12]
         strb    r5,[r12,#13]
         strb    r6,[r12,#14]
         strb    r3,[r12,#15]
 #endif
 #if __ARM_ARCH__>=5
-        ldmia   sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,pc}
+        ldmia   sp!,{r4-r12,pc}
 #else
-        ldmia   sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr}
+        ldmia   sp!,{r4-r12,lr}
         tst     lr,#1
         moveq   pc,lr                   @ be binary compatible with V4, yet
-.word   0xe12fff1e                      @ interoperable with Thumb ISA:-)
+        .word   0xe12fff1e                      @ interoperable with Thumb ISA:-)
 #endif
 .size   asm_AES_encrypt,.-asm_AES_encrypt
 
-.type   _armv4_AES_encrypt,%function
+.type   _armv4_AES_encrypt,%function
 .align  2
 _armv4_AES_encrypt:
         str     lr,[sp,#-4]!            @ push lr
-        ldmia   r11!,{r4,r5,r6,r7}
+        ldmia   r11!,{r4-r7}
         eor     r0,r0,r4
         ldr     r12,[r11,#240-16]
         eor     r1,r1,r5
         eor     r2,r2,r6
         eor     r3,r3,r7
         sub     r12,r12,#1
         mov     lr,#255
 
         and     r7,lr,r0
         and     r8,lr,r0,lsr#8
@@ skipping 112 matching lines @@
 
         eor     r0,r0,r7
         eor     r1,r1,r4
         eor     r2,r2,r5
         eor     r3,r3,r6
 
         sub     r10,r10,#2
         ldr     pc,[sp],#4              @ pop and return
 .size   _armv4_AES_encrypt,.-_armv4_AES_encrypt
 
-.globl  asm_AES_set_encrypt_key
-.hidden asm_AES_set_encrypt_key
-.type   asm_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
 asm_AES_set_encrypt_key:
 _armv4_AES_set_encrypt_key:
 #if __ARM_ARCH__<7
         sub     r3,pc,#8                @ asm_AES_set_encrypt_key
 #else
         adr     r3,asm_AES_set_encrypt_key
 #endif
         teq     r0,#0
 #if __ARM_ARCH__>=7
@@ skipping 12 matching lines @@
         beq     .Lok
         teq     r1,#192
         beq     .Lok
         teq     r1,#256
 #if __ARM_ARCH__>=7
         itt     ne                      @ Thumb2 thing, sanity check in ARM
 #endif
         movne   r0,#-1
         bne     .Labrt
 
-.Lok:   stmdb   sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr}
+.Lok:   stmdb   sp!,{r4-r12,lr}
+        sub     r10,r3,#_armv4_AES_set_encrypt_key-AES_Te-1024  @ Te4
+
         mov     r12,r0          @ inp
         mov     lr,r1                   @ bits
         mov     r11,r2                  @ key
 
-#ifdef  __APPLE__
-        adr     r10,AES_Te+1024                         @ Te4
-#else
-        sub     r10,r3,#_armv4_AES_set_encrypt_key-AES_Te-1024  @ Te4
-#endif
-
 #if __ARM_ARCH__<7
         ldrb    r0,[r12,#3]     @ load input data in endian-neutral
         ldrb    r4,[r12,#2]     @ manner...
         ldrb    r5,[r12,#1]
         ldrb    r6,[r12,#0]
         orr     r0,r0,r4,lsl#8
         ldrb    r1,[r12,#7]
         orr     r0,r0,r5,lsl#16
         ldrb    r4,[r12,#6]
         orr     r0,r0,r6,lsl#24
@@ skipping 230 matching lines @@
         str     r4,[r11,#-16]
         eor     r8,r8,r7                        @ rk[14]=rk[6]^rk[13]
         str     r7,[r11,#-12]
         eor     r9,r9,r8                        @ rk[15]=rk[7]^rk[14]
         str     r8,[r11,#-8]
         str     r9,[r11,#-4]
         b       .L256_loop
 
 .align  2
 .Ldone: mov     r0,#0
-        ldmia   sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr}
+        ldmia   sp!,{r4-r12,lr}
 .Labrt:
-#if __ARM_ARCH__>=5
-        bx      lr                              @ .word 0xe12fff1e
+#if defined(__thumb2__) && __ARM_ARCH__>=7
+        .short  0x4770                  @ .word 0xe12fff1e in Thumb2 encoding
 #else
         tst     lr,#1
         moveq   pc,lr                   @ be binary compatible with V4, yet
-.word   0xe12fff1e                      @ interoperable with Thumb ISA:-)
+        .word   0xe12fff1e                      @ interoperable with Thumb ISA:-)
 #endif
 .size   asm_AES_set_encrypt_key,.-asm_AES_set_encrypt_key
 
-.globl  asm_AES_set_decrypt_key
-.hidden asm_AES_set_decrypt_key
-.type   asm_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
 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                   @ asm_AES_set_encrypt_key preserves r2,
         mov     r1,r2                   @ which is AES_KEY *key
         b       _armv4_AES_set_enc2dec_key
 .size   asm_AES_set_decrypt_key,.-asm_AES_set_decrypt_key
 
 @ void AES_set_enc2dec_key(const AES_KEY *inp,AES_KEY *out)
-.globl  AES_set_enc2dec_key
+.global AES_set_enc2dec_key
 .hidden AES_set_enc2dec_key
 .type   AES_set_enc2dec_key,%function
 .align  5
 AES_set_enc2dec_key:
 _armv4_AES_set_enc2dec_key:
-        stmdb   sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr}
+        stmdb   sp!,{r4-r12,lr}
 
         ldr     r12,[r0,#240]
         mov     r7,r0                   @ input
         add     r8,r0,r12,lsl#4
         mov     r11,r1                  @ ouput
         add     r10,r1,r12,lsl#4
         str     r12,[r1,#240]
 
 .Linv:  ldr     r0,[r7],#16
         ldr     r1,[r7,#-12]
@@ skipping 61 matching lines @@
         eor     r4,r4,r5,ror#16 @ ^= ROTATE(tpd=tp9^tp4,16)
         eor     r4,r4,r5,ror#8  @ ^= ROTATE(tp9,24)
 
         ldr     r0,[r11,#4]             @ prefetch tp1
         str     r4,[r11],#4
         subs    r12,r12,#1
         bne     .Lmix
 
         mov     r0,#0
 #if __ARM_ARCH__>=5
-        ldmia   sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,pc}
+        ldmia   sp!,{r4-r12,pc}
 #else
-        ldmia   sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr}
+        ldmia   sp!,{r4-r12,lr}
         tst     lr,#1
         moveq   pc,lr                   @ be binary compatible with V4, yet
-.word   0xe12fff1e                      @ interoperable with Thumb ISA:-)
+        .word   0xe12fff1e                      @ interoperable with Thumb ISA:-)
 #endif
 .size   AES_set_enc2dec_key,.-AES_set_enc2dec_key
 
 .type   AES_Td,%object
 .align  5
 AES_Td:
 .word   0x51f4a750, 0x7e416553, 0x1a17a4c3, 0x3a275e96
 .word   0x3bab6bcb, 0x1f9d45f1, 0xacfa58ab, 0x4be30393
 .word   0x2030fa55, 0xad766df6, 0x88cc7691, 0xf5024c25
 .word   0x4fe5d7fc, 0xc52acbd7, 0x26354480, 0xb562a38f
@@ skipping 87 matching lines @@
 .byte   0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d
 .byte   0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef
 .byte   0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0
 .byte   0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61
 .byte   0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26
 .byte   0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d
 .size   AES_Td,.-AES_Td
 
 @ void asm_AES_decrypt(const unsigned char *in, unsigned char *out,
 @                      const AES_KEY *key) {
-.globl  asm_AES_decrypt
-.hidden asm_AES_decrypt
-.type   asm_AES_decrypt,%function
+.global asm_AES_decrypt
+.hidden asm_AES_decrypt
+.type   asm_AES_decrypt,%function
 .align  5
 asm_AES_decrypt:
 #if __ARM_ARCH__<7
         sub     r3,pc,#8                @ asm_AES_decrypt
 #else
         adr     r3,asm_AES_decrypt
 #endif
-        stmdb   sp!,{r1,r4-r12,lr}
-#ifdef  __APPLE__
-        adr     r10,AES_Td
-#else
-        sub     r10,r3,#asm_AES_decrypt-AES_Td  @ Td
-#endif
+        stmdb   sp!,{r1,r4-r12,lr}
         mov     r12,r0          @ inp
         mov     r11,r2
+        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...
         ldrb    r5,[r12,#1]
         ldrb    r6,[r12,#0]
         orr     r0,r0,r4,lsl#8
         ldrb    r1,[r12,#7]
         orr     r0,r0,r5,lsl#16
         ldrb    r4,[r12,#6]
         orr     r0,r0,r6,lsl#24
@@ skipping 66 matching lines @@
         strb    r6,[r12,#10]
         mov     r5,r3,lsr#16
         strb    r2,[r12,#11]
         mov     r6,r3,lsr#8
         strb    r4,[r12,#12]
         strb    r5,[r12,#13]
         strb    r6,[r12,#14]
         strb    r3,[r12,#15]
 #endif
 #if __ARM_ARCH__>=5
-        ldmia   sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,pc}
+        ldmia   sp!,{r4-r12,pc}
 #else
-        ldmia   sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr}
+        ldmia   sp!,{r4-r12,lr}
         tst     lr,#1
         moveq   pc,lr                   @ be binary compatible with V4, yet
-.word   0xe12fff1e                      @ interoperable with Thumb ISA:-)
+        .word   0xe12fff1e                      @ interoperable with Thumb ISA:-)
 #endif
 .size   asm_AES_decrypt,.-asm_AES_decrypt
 
-.type   _armv4_AES_decrypt,%function
+.type   _armv4_AES_decrypt,%function
 .align  2
 _armv4_AES_decrypt:
         str     lr,[sp,#-4]!            @ push lr
-        ldmia   r11!,{r4,r5,r6,r7}
+        ldmia   r11!,{r4-r7}
         eor     r0,r0,r4
         ldr     r12,[r11,#240-16]
         eor     r1,r1,r5
         eor     r2,r2,r6
         eor     r3,r3,r7
         sub     r12,r12,#1
         mov     lr,#255
 
         and     r7,lr,r0,lsr#16
         and     r8,lr,r0,lsr#8
@@ skipping 120 matching lines @@
         ldr     r6,[r11,#12]
 
         eor     r0,r0,r7
         eor     r1,r1,r4
         eor     r2,r2,r5
         eor     r3,r3,r6
 
         sub     r10,r10,#1024
         ldr     pc,[sp],#4              @ pop and return
 .size   _armv4_AES_decrypt,.-_armv4_AES_decrypt
-.byte   65,69,83,32,102,111,114,32,65,82,77,118,52,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
+.asciz  "AES for ARMv4, CRYPTOGAMS by <appro@openssl.org>"
 .align  2
 
 #endif