diff options
| author | Andy Polyakov <appro@openssl.org> | 2012-04-05 08:30:22 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2012-04-05 08:30:22 +0000 |
| commit | 45cd45bbbcb974e2ed5d9014bbd188640479909f (patch) | |
| tree | 1a420a98b0dc2e896c66f8d3f6b3c4033bb9526c | |
| parent | bc9583efa22ea0b1ceb482bc8cdeebe11acbaf11 (diff) | |
aes-armv4.pl: make it more foolproof [inspired by aes-s390x.pl in 1.0.1].
| -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 55b6e04b67..717cc1ed7f 100644 --- a/crypto/aes/asm/aes-armv4.pl +++ b/crypto/aes/asm/aes-armv4.pl @@ -408,6 +408,7 @@ _armv4_AES_encrypt: .type AES_set_encrypt_key,%function .align 5 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 @@ AES_set_encrypt_key: bne .Labrt .Lok: stmdb sp!,{r4-r12,lr} - sub $tbl,r3,#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 @@ AES_set_encrypt_key: .align 5 AES_set_decrypt_key: str lr,[sp,#-4]! @ push lr - bl AES_set_encrypt_key + bl _armv4_AES_set_encrypt_key teq r0,#0 ldrne lr,[sp],#4 @ pop lr bne .Labrt |