openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

crypto: x86/aes-ni - use AES library instead of single-use AES cipher 

The RFC4106 key derivation code instantiates an AES cipher transform
to encrypt only a single block before it is freed again. Switch to
the new AES library which is more suitable for such use cases.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Ard Biesheuvel 2019-09-04 10:56:32 -07:00 committed by Herbert Xu
parent c552ffb5c9
commit f6680cbdb2
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/x86/crypto/aesni-intel_glue.c
View File

@ -628,26 +628,21 @@ static int xts_decrypt(struct skcipher_request *req)
static int static int
rfc4106_set_hash_subkey(u8 *hash_subkey, const u8 *key, unsigned int key_len) rfc4106_set_hash_subkey(u8 *hash_subkey, const u8 *key, unsigned int key_len)
{ {
struct crypto_cipher *tfm; struct crypto_aes_ctx ctx;
int ret; int ret;
tfm = crypto_alloc_cipher("aes", 0, 0); ret = aes_expandkey(&ctx, key, key_len);
if (IS_ERR(tfm))
return PTR_ERR(tfm);
ret = crypto_cipher_setkey(tfm, key, key_len);
if (ret) if (ret)
goto out_free_cipher; return ret;
/* Clear the data in the hash sub key container to zero.*/ /* Clear the data in the hash sub key container to zero.*/
/* We want to cipher all zeros to create the hash sub key. */ /* We want to cipher all zeros to create the hash sub key. */
memset(hash_subkey, 0, RFC4106_HASH_SUBKEY_SIZE); memset(hash_subkey, 0, RFC4106_HASH_SUBKEY_SIZE);
crypto_cipher_encrypt_one(tfm, hash_subkey, hash_subkey); aes_encrypt(&ctx, hash_subkey, hash_subkey);
out_free_cipher: memzero_explicit(&ctx, sizeof(ctx));
crypto_free_cipher(tfm); return 0;
return ret;
} }
static int common_rfc4106_set_key(struct crypto_aead *aead, const u8 *key, static int common_rfc4106_set_key(struct crypto_aead *aead, const u8 *key,