Index: linux-arm/crypto/aes/bsaes-armv7.S |
diff --git a/linux-arm/crypto/aes/bsaes-armv7.S b/linux-arm/crypto/aes/bsaes-armv7.S |
index abb414d54974ce89a6bbe27b5f57cb82d0ba1ffc..1db7bbe10bcd787edb749437e5323c0db013c1b5 100644 |
--- a/linux-arm/crypto/aes/bsaes-armv7.S |
+++ b/linux-arm/crypto/aes/bsaes-armv7.S |
@@ -1843,8 +1843,6 @@ bsaes_xts_encrypt: |
b .Lxts_enc_done |
.align 4 |
.Lxts_enc_6: |
- vst1.64 {q14}, [r0,:128] @ next round tweak |
- |
veor q4, q4, q12 |
#ifndef BSAES_ASM_EXTENDED_KEY |
add r4, sp, #0x90 @ pass key schedule |
@@ -1880,8 +1878,6 @@ bsaes_xts_encrypt: |
.align 5 |
.Lxts_enc_5: |
- vst1.64 {q13}, [r0,:128] @ next round tweak |
- |
veor q3, q3, q11 |
#ifndef BSAES_ASM_EXTENDED_KEY |
add r4, sp, #0x90 @ pass key schedule |
@@ -1910,8 +1906,6 @@ bsaes_xts_encrypt: |
b .Lxts_enc_done |
.align 4 |
.Lxts_enc_4: |
- vst1.64 {q12}, [r0,:128] @ next round tweak |
- |
veor q2, q2, q10 |
#ifndef BSAES_ASM_EXTENDED_KEY |
add r4, sp, #0x90 @ pass key schedule |
@@ -1937,8 +1931,6 @@ bsaes_xts_encrypt: |
b .Lxts_enc_done |
.align 4 |
.Lxts_enc_3: |
- vst1.64 {q11}, [r0,:128] @ next round tweak |
- |
veor q1, q1, q9 |
#ifndef BSAES_ASM_EXTENDED_KEY |
add r4, sp, #0x90 @ pass key schedule |
@@ -1963,8 +1955,6 @@ bsaes_xts_encrypt: |
b .Lxts_enc_done |
.align 4 |
.Lxts_enc_2: |
- vst1.64 {q10}, [r0,:128] @ next round tweak |
- |
veor q0, q0, q8 |
#ifndef BSAES_ASM_EXTENDED_KEY |
add r4, sp, #0x90 @ pass key schedule |
@@ -1987,7 +1977,7 @@ bsaes_xts_encrypt: |
.align 4 |
.Lxts_enc_1: |
mov r0, sp |
- veor q0, q8 |
+ veor q0, q0, q8 |
mov r1, sp |
vst1.8 {q0}, [sp,:128] |
mov r2, r10 |
@@ -2376,8 +2366,6 @@ bsaes_xts_decrypt: |
b .Lxts_dec_done |
.align 4 |
.Lxts_dec_5: |
- vst1.64 {q13}, [r0,:128] @ next round tweak |
- |
veor q3, q3, q11 |
#ifndef BSAES_ASM_EXTENDED_KEY |
add r4, sp, #0x90 @ pass key schedule |
@@ -2406,8 +2394,6 @@ bsaes_xts_decrypt: |
b .Lxts_dec_done |
.align 4 |
.Lxts_dec_4: |
- vst1.64 {q12}, [r0,:128] @ next round tweak |
- |
veor q2, q2, q10 |
#ifndef BSAES_ASM_EXTENDED_KEY |
add r4, sp, #0x90 @ pass key schedule |
@@ -2433,8 +2419,6 @@ bsaes_xts_decrypt: |
b .Lxts_dec_done |
.align 4 |
.Lxts_dec_3: |
- vst1.64 {q11}, [r0,:128] @ next round tweak |
- |
veor q1, q1, q9 |
#ifndef BSAES_ASM_EXTENDED_KEY |
add r4, sp, #0x90 @ pass key schedule |
@@ -2459,8 +2443,6 @@ bsaes_xts_decrypt: |
b .Lxts_dec_done |
.align 4 |
.Lxts_dec_2: |
- vst1.64 {q10}, [r0,:128] @ next round tweak |
- |
veor q0, q0, q8 |
#ifndef BSAES_ASM_EXTENDED_KEY |
add r4, sp, #0x90 @ pass key schedule |
@@ -2483,12 +2465,12 @@ bsaes_xts_decrypt: |
.align 4 |
.Lxts_dec_1: |
mov r0, sp |
- veor q0, q8 |
+ veor q0, q0, q8 |
mov r1, sp |
vst1.8 {q0}, [sp,:128] |
+ mov r5, r2 @ preserve magic |
mov r2, r10 |
mov r4, r3 @ preserve fp |
- mov r5, r2 @ preserve magic |
bl AES_decrypt |