[PATCH] crypto: aes_ti - fix comment for MixColumns step

[PATCH] crypto: aes_ti - fix comment for MixColumns step

[Eric Biggers]

From: Eric Biggers <ebiggers@google.com>

mix_columns() contains a comment which shows the matrix used by the
MixColumns step of AES, but the last entry in this matrix was incorrect
--- and did not match the code, which is correct.  Fix the comment.

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 crypto/aes_ti.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/aes_ti.c b/crypto/aes_ti.c
index 92644fd1ac19..03023b2290e8 100644
--- a/crypto/aes_ti.c
+++ b/crypto/aes_ti.c
@@ -114,7 +114,7 @@ static u32 mix_columns(u32 x)
 	 * | 0x2 0x3 0x1 0x1 |   | x[0] |
 	 * | 0x1 0x2 0x3 0x1 |   | x[1] |
 	 * | 0x1 0x1 0x2 0x3 | x | x[2] |
-	 * | 0x3 0x1 0x1 0x3 |   | x[3] |
+	 * | 0x3 0x1 0x1 0x2 |   | x[3] |
 	 */
 	u32 y = mul_by_x(x) ^ ror32(x, 16);
 
-- 
2.13.0.rc2.291.g57267f2277-goog

Re: [PATCH] crypto: aes_ti - fix comment for MixColumns step

[Ard Biesheuvel]

On 10 May 2017 at 01:20, Eric Biggers <ebiggers3@gmail.com> wrote:
> From: Eric Biggers <ebiggers@google.com>
>
> mix_columns() contains a comment which shows the matrix used by the
> MixColumns step of AES, but the last entry in this matrix was incorrect
> --- and did not match the code, which is correct.  Fix the comment.
>
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
>  crypto/aes_ti.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/crypto/aes_ti.c b/crypto/aes_ti.c
> index 92644fd1ac19..03023b2290e8 100644
> --- a/crypto/aes_ti.c
> +++ b/crypto/aes_ti.c
> @@ -114,7 +114,7 @@ static u32 mix_columns(u32 x)
>          * | 0x2 0x3 0x1 0x1 |   | x[0] |
>          * | 0x1 0x2 0x3 0x1 |   | x[1] |
>          * | 0x1 0x1 0x2 0x3 | x | x[2] |
> -        * | 0x3 0x1 0x1 0x3 |   | x[3] |
> +        * | 0x3 0x1 0x1 0x2 |   | x[3] |
>          */
>         u32 y = mul_by_x(x) ^ ror32(x, 16);
>

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

Re: [PATCH] crypto: aes_ti - fix comment for MixColumns step

[Herbert Xu]

On Tue, May 09, 2017 at 05:20:27PM -0700, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> mix_columns() contains a comment which shows the matrix used by the
> MixColumns step of AES, but the last entry in this matrix was incorrect
> --- and did not match the code, which is correct.  Fix the comment.
> 
> Signed-off-by: Eric Biggers <ebiggers@google.com>

Patch applied.  Thanks.
-- 
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