generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

aesv8-armx.pl: rigid input verification in key setup.

Browse Source
This commit is contained in:
Andy Polyakov 2014-06-25 22:10:45 +02:00
parent 7eb0488280
commit 7b8c8c4d79
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crypto/aes/asm/aesv8-armx.pl
View File

@ -70,6 +70,19 @@ $code.=<<___ if ($flavour =~ /64/);
add x29,sp,#0 add x29,sp,#0
___ ___
$code.=<<___; $code.=<<___;
mov $ptr,#-1
cmp $inp,#0
b.eq .Lenc_key_abort
cmp $out,#0
b.eq .Lenc_key_abort
mov $ptr,#-2
cmp $bits,#128
b.lt .Lenc_key_abort
cmp $bits,#256
b.gt .Lenc_key_abort
tst $bits,#0x3f
b.ne .Lenc_key_abort
adr $ptr,rcon adr $ptr,rcon
cmp $bits,#192 cmp $bits,#192
@ -209,8 +222,10 @@ $code.=<<___;
.Ldone: .Ldone:
str $rounds,[$out] str $rounds,[$out]
mov $ptr,#0
eor x0,x0,x0 // return value .Lenc_key_abort:
mov x0,$ptr // return value
`"ldr x29,[sp],#16" if ($flavour =~ /64/)` `"ldr x29,[sp],#16" if ($flavour =~ /64/)`
ret ret
.size ${prefix}_set_encrypt_key,.-${prefix}_set_encrypt_key .size ${prefix}_set_encrypt_key,.-${prefix}_set_encrypt_key
@ -230,6 +245,9 @@ ___
$code.=<<___; $code.=<<___;
bl .Lenc_key bl .Lenc_key
cmp x0,#0
b.ne .Ldec_key_abort
sub $out,$out,#240 // restore original $out sub $out,$out,#240 // restore original $out
mov x4,#-16 mov x4,#-16
add $inp,$out,x12,lsl#4 // end of key schedule add $inp,$out,x12,lsl#4 // end of key schedule
@ -254,6 +272,7 @@ $code.=<<___;
vst1.32 {v0.16b},[$inp] vst1.32 {v0.16b},[$inp]
eor x0,x0,x0 // return value eor x0,x0,x0 // return value
.Ldec_key_abort:
___ ___
$code.=<<___ if ($flavour !~ /64/); $code.=<<___ if ($flavour !~ /64/);
ldmia sp!,{r4,pc} ldmia sp!,{r4,pc}