diff options
| -rw-r--r-- | arch/arm/crypto/aes-ce-core.S | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/crypto/aes-ce-core.S b/arch/arm/crypto/aes-ce-core.S index 8cfa468ee570..987aa632c9f0 100644 --- a/arch/arm/crypto/aes-ce-core.S +++ b/arch/arm/crypto/aes-ce-core.S | |||
| @@ -101,15 +101,14 @@ | |||
| 101 | \dround q10, q11 | 101 | \dround q10, q11 |
| 102 | blo 0f @ AES-128: 10 rounds | 102 | blo 0f @ AES-128: 10 rounds |
| 103 | vld1.8 {q10-q11}, [ip]! | 103 | vld1.8 {q10-q11}, [ip]! |
| 104 | beq 1f @ AES-192: 12 rounds | ||
| 105 | \dround q12, q13 | 104 | \dround q12, q13 |
| 105 | beq 1f @ AES-192: 12 rounds | ||
| 106 | vld1.8 {q12-q13}, [ip] | 106 | vld1.8 {q12-q13}, [ip] |
| 107 | \dround q10, q11 | 107 | \dround q10, q11 |
| 108 | 0: \fround q12, q13, q14 | 108 | 0: \fround q12, q13, q14 |
| 109 | bx lr | 109 | bx lr |
| 110 | 110 | ||
| 111 | 1: \dround q12, q13 | 111 | 1: \fround q10, q11, q14 |
| 112 | \fround q10, q11, q14 | ||
| 113 | bx lr | 112 | bx lr |
| 114 | .endm | 113 | .endm |
| 115 | 114 | ||
| @@ -122,8 +121,8 @@ | |||
| 122 | * q2 : third in/output block (_3x version only) | 121 | * q2 : third in/output block (_3x version only) |
| 123 | * q8 : first round key | 122 | * q8 : first round key |
| 124 | * q9 : secound round key | 123 | * q9 : secound round key |
| 125 | * ip : address of 3rd round key | ||
| 126 | * q14 : final round key | 124 | * q14 : final round key |
| 125 | * r2 : address of round key array | ||
| 127 | * r3 : number of rounds | 126 | * r3 : number of rounds |
| 128 | */ | 127 | */ |
| 129 | .align 6 | 128 | .align 6 |