diff options
| author | Sergiu Giurgiu <sgiurgiu11@gmail.com> | 2020-06-03 21:03:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-03 21:03:18 -0400 |
| commit | 818f1ca944ad6c5d6d7aaebbaf83411991471891 (patch) | |
| tree | 8ea50908b705dbf9c316577f34b91afb02da75f2 /aes_armv4.S | |
| parent | b30600683178f613de9f72071d5d61bbb7ba0e0e (diff) | |
| download | cryptopp-git-818f1ca944ad6c5d6d7aaebbaf83411991471891.tar.gz | |
Fix conflicting Cryptogams API names on ARM with OpenSSL (GH #952)
Diffstat (limited to 'aes_armv4.S')
| -rw-r--r-- | aes_armv4.S | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/aes_armv4.S b/aes_armv4.S index a1fd1d2d..ae4830fd 100644 --- a/aes_armv4.S +++ b/aes_armv4.S @@ -434,10 +434,10 @@ _armv4_AES_encrypt_block: ldr pc,[sp],#4 @ pop and return .size _armv4_AES_encrypt_block,.-_armv4_AES_encrypt_block -.globl AES_set_encrypt_key -.type AES_set_encrypt_key,%function +.globl AES_set_encrypt_key_ARM +.type AES_set_encrypt_key_ARM,%function .align 5 -AES_set_encrypt_key: +AES_set_encrypt_key_ARM: _armv4_AES_set_encrypt_key: #ifndef __thumb2__ sub r3,pc,#8 @ AES_set_encrypt_key @@ -738,12 +738,12 @@ _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 AES_set_encrypt_key_ARM,.-AES_set_encrypt_key_ARM -.globl AES_set_decrypt_key -.type AES_set_decrypt_key,%function +.globl AES_set_decrypt_key_ARM +.type AES_set_decrypt_key_ARM,%function .align 5 -AES_set_decrypt_key: +AES_set_decrypt_key_ARM: str lr,[sp,#-4]! @ push lr bl _armv4_AES_set_encrypt_key teq r0,#0 @@ -753,13 +753,13 @@ AES_set_decrypt_key: mov r0,r2 @ 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 AES_set_decrypt_key_ARM,.-AES_set_decrypt_key_ARM -@ void AES_set_enc2dec_key(const AES_KEY *inp,AES_KEY *out) -.globl AES_set_enc2dec_key -.type AES_set_enc2dec_key,%function +@ void AES_set_enc2dec_key_ARM(const AES_KEY *inp,AES_KEY *out) +.globl AES_set_enc2dec_key_ARM +.type AES_set_enc2dec_key_ARM,%function .align 5 -AES_set_enc2dec_key: +AES_set_enc2dec_key_ARM: _armv4_AES_set_enc2dec_key: stmdb sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr} @@ -850,7 +850,7 @@ _armv4_AES_set_enc2dec_key: moveq pc,lr @ be binary compatible with V4, yet .word 0xe12fff1e @ interoperable with Thumb ISA:-) #endif -.size AES_set_enc2dec_key,.-AES_set_enc2dec_key +.size AES_set_enc2dec_key_ARM,.-AES_set_enc2dec_key_ARM .type AES_Td,%object .align 5 |