kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Import (unreachable) bsaes-armv7.pl XTS fixes.

Browse Source 
This imports upstream's b62e9bf5cbbe278b7e0017c9234999dae68ee867 and
c3bc7f498815b355533d96b54b9a09e030d4130c. This is a no-op since we don't
use the XTS bits though keep the files in sync so long as we have them.

Comparing to master, we're now up-to-date on that file except for
a285992763f3961f69a8d86bf7dfff020a08cef9. (I've left that alone since
that touches lots of files and we should probably get better test
configuration before importing something scary like #undef __thumb2__.)

Change-Id: Ie0556757c954ef559e03a6d62c940d5901ca704a
Reviewed-on: https://boringssl-review.googlesource.com/8945
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2016-07-26 12:36:50 -04:00 committed by Adam Langley
parent 599922feee
commit 51162639ec
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
crypto/aes/asm/bsaes-armv7.pl
View File

@ -1831,8 +1831,6 @@ $code.=<<___;
b .Lxts_enc_done b .Lxts_enc_done
.align 4 .align 4
.Lxts_enc_6: .Lxts_enc_6:
vst1.64 {@XMM[14]}, [r0,:128] @ next round tweak
veor @XMM[4], @XMM[4], @XMM[12] veor @XMM[4], @XMM[4], @XMM[12]
#ifndef BSAES_ASM_EXTENDED_KEY #ifndef BSAES_ASM_EXTENDED_KEY
add r4, sp, #0x90 @ pass key schedule add r4, sp, #0x90 @ pass key schedule
@ -1868,8 +1866,6 @@ $code.=<<___;
.align 5 .align 5
.Lxts_enc_5: .Lxts_enc_5:
vst1.64 {@XMM[13]}, [r0,:128] @ next round tweak
veor @XMM[3], @XMM[3], @XMM[11] veor @XMM[3], @XMM[3], @XMM[11]
#ifndef BSAES_ASM_EXTENDED_KEY #ifndef BSAES_ASM_EXTENDED_KEY
add r4, sp, #0x90 @ pass key schedule add r4, sp, #0x90 @ pass key schedule
@ -1898,8 +1894,6 @@ $code.=<<___;
b .Lxts_enc_done b .Lxts_enc_done
.align 4 .align 4
.Lxts_enc_4: .Lxts_enc_4:
vst1.64 {@XMM[12]}, [r0,:128] @ next round tweak
veor @XMM[2], @XMM[2], @XMM[10] veor @XMM[2], @XMM[2], @XMM[10]
#ifndef BSAES_ASM_EXTENDED_KEY #ifndef BSAES_ASM_EXTENDED_KEY
add r4, sp, #0x90 @ pass key schedule add r4, sp, #0x90 @ pass key schedule
@ -1925,8 +1919,6 @@ $code.=<<___;
b .Lxts_enc_done b .Lxts_enc_done
.align 4 .align 4
.Lxts_enc_3: .Lxts_enc_3:
vst1.64 {@XMM[11]}, [r0,:128] @ next round tweak
veor @XMM[1], @XMM[1], @XMM[9] veor @XMM[1], @XMM[1], @XMM[9]
#ifndef BSAES_ASM_EXTENDED_KEY #ifndef BSAES_ASM_EXTENDED_KEY
add r4, sp, #0x90 @ pass key schedule add r4, sp, #0x90 @ pass key schedule
@ -1951,8 +1943,6 @@ $code.=<<___;
b .Lxts_enc_done b .Lxts_enc_done
.align 4 .align 4
.Lxts_enc_2: .Lxts_enc_2:
vst1.64 {@XMM[10]}, [r0,:128] @ next round tweak
veor @XMM[0], @XMM[0], @XMM[8] veor @XMM[0], @XMM[0], @XMM[8]
#ifndef BSAES_ASM_EXTENDED_KEY #ifndef BSAES_ASM_EXTENDED_KEY
add r4, sp, #0x90 @ pass key schedule add r4, sp, #0x90 @ pass key schedule
@ -1975,7 +1965,7 @@ $code.=<<___;
.align 4 .align 4
.Lxts_enc_1: .Lxts_enc_1:
mov r0, sp mov r0, sp
veor @XMM[0], @XMM[8] veor @XMM[0], @XMM[0], @XMM[8]
mov r1, sp mov r1, sp
vst1.8 {@XMM[0]}, [sp,:128] vst1.8 {@XMM[0]}, [sp,:128]
mov r2, $key mov r2, $key
@ -2287,8 +2277,6 @@ $code.=<<___;
b .Lxts_dec_done b .Lxts_dec_done
.align 4 .align 4
.Lxts_dec_5: .Lxts_dec_5:
vst1.64 {@XMM[13]}, [r0,:128] @ next round tweak
veor @XMM[3], @XMM[3], @XMM[11] veor @XMM[3], @XMM[3], @XMM[11]
#ifndef BSAES_ASM_EXTENDED_KEY #ifndef BSAES_ASM_EXTENDED_KEY
add r4, sp, #0x90 @ pass key schedule add r4, sp, #0x90 @ pass key schedule
@ -2317,8 +2305,6 @@ $code.=<<___;
b .Lxts_dec_done b .Lxts_dec_done
.align 4 .align 4
.Lxts_dec_4: .Lxts_dec_4:
vst1.64 {@XMM[12]}, [r0,:128] @ next round tweak
veor @XMM[2], @XMM[2], @XMM[10] veor @XMM[2], @XMM[2], @XMM[10]
#ifndef BSAES_ASM_EXTENDED_KEY #ifndef BSAES_ASM_EXTENDED_KEY
add r4, sp, #0x90 @ pass key schedule add r4, sp, #0x90 @ pass key schedule
@ -2344,8 +2330,6 @@ $code.=<<___;
b .Lxts_dec_done b .Lxts_dec_done
.align 4 .align 4
.Lxts_dec_3: .Lxts_dec_3:
vst1.64 {@XMM[11]}, [r0,:128] @ next round tweak
veor @XMM[1], @XMM[1], @XMM[9] veor @XMM[1], @XMM[1], @XMM[9]
#ifndef BSAES_ASM_EXTENDED_KEY #ifndef BSAES_ASM_EXTENDED_KEY
add r4, sp, #0x90 @ pass key schedule add r4, sp, #0x90 @ pass key schedule
@ -2370,8 +2354,6 @@ $code.=<<___;
b .Lxts_dec_done b .Lxts_dec_done
.align 4 .align 4
.Lxts_dec_2: .Lxts_dec_2:
vst1.64 {@XMM[10]}, [r0,:128] @ next round tweak
veor @XMM[0], @XMM[0], @XMM[8] veor @XMM[0], @XMM[0], @XMM[8]
#ifndef BSAES_ASM_EXTENDED_KEY #ifndef BSAES_ASM_EXTENDED_KEY
add r4, sp, #0x90 @ pass key schedule add r4, sp, #0x90 @ pass key schedule
@ -2394,12 +2376,12 @@ $code.=<<___;
.align 4 .align 4
.Lxts_dec_1: .Lxts_dec_1:
mov r0, sp mov r0, sp
veor @XMM[0], @XMM[8] veor @XMM[0], @XMM[0], @XMM[8]
mov r1, sp mov r1, sp
vst1.8 {@XMM[0]}, [sp,:128] vst1.8 {@XMM[0]}, [sp,:128]
mov r5, $magic @ preserve magic
mov r2, $key mov r2, $key
mov r4, $fp @ preserve fp mov r4, $fp @ preserve fp
mov r5, $magic @ preserve magic
bl AES_decrypt bl AES_decrypt