diff options
author | Andy Polyakov <appro@openssl.org> | 2012-04-05 08:31:37 +0000 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2012-04-05 08:31:37 +0000 |
commit | a1d573e28293cba4c1c06505f80069e8b13383c1 (patch) | |
tree | e82ad0a94c53958fd189fefe49f958651491f4d3 /crypto | |
parent | e959e24b4763cbf0c9e4038555d24f4d48af20a2 (diff) |
aes-armv4.pl: make it more foolproof [inspired by aes-s390x.pl in 1.0.1].
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/aes/asm/aes-armv4.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/aes/asm/aes-armv4.pl b/crypto/aes/asm/aes-armv4.pl index 943ce45ff1..86b86c4a0f 100644 --- a/crypto/aes/asm/aes-armv4.pl +++ b/crypto/aes/asm/aes-armv4.pl @@ -408,6 +408,7 @@ _armv4_AES_encrypt: .type private_AES_set_encrypt_key,%function .align 5 private_AES_set_encrypt_key: +_armv4_AES_set_encrypt_key: sub r3,pc,#8 @ AES_set_encrypt_key teq r0,#0 moveq r0,#-1 @@ -425,7 +426,7 @@ private_AES_set_encrypt_key: bne .Labrt .Lok: stmdb sp!,{r4-r12,lr} - sub $tbl,r3,#private_AES_set_encrypt_key-AES_Te-1024 @ Te4 + sub $tbl,r3,#_armv4_AES_set_encrypt_key-AES_Te-1024 @ Te4 mov $rounds,r0 @ inp mov lr,r1 @ bits @@ -685,7 +686,7 @@ private_AES_set_encrypt_key: .align 5 private_AES_set_decrypt_key: str lr,[sp,#-4]! @ push lr - bl private_AES_set_encrypt_key + bl _armv4_AES_set_encrypt_key teq r0,#0 ldrne lr,[sp],#4 @ pop lr bne .Labrt |