leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crypto: x86/aegis256 - Fix wrong key buffer size

Browse Source 
AEGIS-256 key is two blocks, not one.

Fixes: 1d373d4e8e ("crypto: x86 - Add optimized AEGIS implementations")
Reported-by: Eric Biggers <ebiggers3@gmail.com>
Signed-off-by: Ondrej Mosnacek <omosnacek@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Ondrej Mosnacek 2018-05-20 10:57:23 +02:00 committed by Herbert Xu
parent 9f50fd5bb6
commit dd09f58ce0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/crypto/aegis256-aesni-glue.c
View File

@ -57,7 +57,7 @@ struct aegis_state {
}; };
struct aegis_ctx { struct aegis_ctx {
struct aegis_block key; struct aegis_block key[AEGIS256_KEY_SIZE / AEGIS256_BLOCK_SIZE];
}; };
struct aegis_crypt_ops { struct aegis_crypt_ops {
@ -164,7 +164,7 @@ static int crypto_aegis256_aesni_setkey(struct crypto_aead *aead, const u8 *key,
return -EINVAL; return -EINVAL;
} }
memcpy(ctx->key.bytes, key, AEGIS256_KEY_SIZE); memcpy(ctx->key, key, AEGIS256_KEY_SIZE);
return 0; return 0;
} }
@ -190,7 +190,7 @@ static void crypto_aegis256_aesni_crypt(struct aead_request *req,
kernel_fpu_begin(); kernel_fpu_begin();
crypto_aegis256_aesni_init(&state, ctx->key.bytes, req->iv); crypto_aegis256_aesni_init(&state, ctx->key, req->iv);
crypto_aegis256_aesni_process_ad(&state, req->src, req->assoclen); crypto_aegis256_aesni_process_ad(&state, req->src, req->assoclen);
crypto_aegis256_aesni_process_crypt(&state, req, ops); crypto_aegis256_aesni_process_crypt(&state, req, ops);
crypto_aegis256_aesni_final(&state, tag_xor, req->assoclen, cryptlen); crypto_aegis256_aesni_final(&state, tag_xor, req->assoclen, cryptlen);