diff mbox

crypto: arm/aesbs - fix brokenness after skcipher conversion

Message ID 1480440216-341-1-git-send-email-ard.biesheuvel@linaro.org
State Accepted
Commit 81126d1a8bc23c72a13c05c4308dc6951afc3b45
Headers show

Commit Message

Ard Biesheuvel Nov. 29, 2016, 5:23 p.m. UTC
The CBC encryption routine should use the encryption round keys, not
the decryption round keys.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---

Another fix for the queued changes, this time for 32-bit ARM.

I must say, I'm not impressed with the level of testing that has been
carried out after applying these changes. If you had cc'd me on these
patches, I would have been happy to test/review.

 arch/arm/crypto/aesbs-glue.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Herbert Xu Nov. 30, 2016, 1:19 p.m. UTC | #1
On Tue, Nov 29, 2016 at 05:23:36PM +0000, Ard Biesheuvel wrote:
> The CBC encryption routine should use the encryption round keys, not

> the decryption round keys.

> 

> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


Patch applied.  Thanks.
 
> Another fix for the queued changes, this time for 32-bit ARM.

> 

> I must say, I'm not impressed with the level of testing that has been

> carried out after applying these changes. If you had cc'd me on these

> patches, I would have been happy to test/review.


Sorry.  I'll make sure you're CCed for ARM patches in future.
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ard Biesheuvel Nov. 30, 2016, 1:36 p.m. UTC | #2
> On 30 Nov 2016, at 13:19, Herbert Xu <herbert@gondor.apana.org.au> wrote:

> 

>> On Tue, Nov 29, 2016 at 05:23:36PM +0000, Ard Biesheuvel wrote:

>> The CBC encryption routine should use the encryption round keys, not

>> the decryption round keys.

>> 

>> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> 

> Patch applied.  Thanks.

> 

>> Another fix for the queued changes, this time for 32-bit ARM.

>> 

>> I must say, I'm not impressed with the level of testing that has been

>> carried out after applying these changes. If you had cc'd me on these

>> patches, I would have been happy to test/review.

> 

> Sorry.  I'll make sure you're CCed for ARM patches in future.


Cheers,
Ard.

--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/crypto/aesbs-glue.c b/arch/arm/crypto/aesbs-glue.c
index f5eafce10557..d8e06de72ef3 100644
--- a/arch/arm/crypto/aesbs-glue.c
+++ b/arch/arm/crypto/aesbs-glue.c
@@ -113,7 +113,7 @@  static inline void aesbs_encrypt_one(struct crypto_skcipher *tfm,
 {
 	struct aesbs_cbc_ctx *ctx = crypto_skcipher_ctx(tfm);
 
-	AES_encrypt(src, dst, &ctx->dec.rk);
+	AES_encrypt(src, dst, &ctx->enc);
 }
 
 static int aesbs_cbc_encrypt(struct skcipher_request *req)