crypto: shash - allow essiv and hmac to use OPTIONAL_KEY algorithms
PATCH 1/1 crypto: shash - allow essiv and hmac to use OPTIONAL_KEY algorithms
From: Eric Biggers <[email protected]>
The essiv and hmac templates refuse to use any hash algorithm that has a ->setkey() function, which includes not just algorithms that always need a key, but also algorithms that optionally take a key.
Previously the only optionally-keyed hash algorithms in the crypto API were non-cryptographic algorithms like crc32, so this didn't really matter. But that's changed with BLAKE2 support being added. BLAKE2 should work with essiv and hmac, just like any other cryptographic hash.
Fix this by allowing the use of both algorithms without a ->setkey() function and algorithms that have the OPTIONAL_KEY flag set.
--- crypto/essiv.c | 2 +- crypto/hmac.c | 4 ++-- crypto/shash.c | 3 +-- include/crypto/internal/hash.h | 6 ++++++ 4 files changed, 10 insertions(+), 5 deletions(-)
crypto/essiv.c +1 -1
@@ -442,7 +442,7 @@ static bool essiv_supported_algorithms(const char *essiv_cipher_name,if (ivsize != alg->cra_blocksize) goto out; -if (crypto_shash_alg_has_setkey (hash_alg)) +if (crypto_shash_alg_needs_key (hash_alg)) goto out; ret = true;
crypto/hmac.c +2 -2
@@ -185,9 +185,9 @@ static int hmac_create(struct crypto_template *tmpl, struct rtattr **tb)return PTR_ERR (salg); alg = &salg->base; -/* The underlying hash algorithm must be unkeyed */ +/* The underlying hash algorithm must not require a key */ err = -EINVAL ; -if (crypto_shash_alg_has_setkey (salg)) +if (crypto_shash_alg_needs_key (salg)) goto out_put_alg; ds = salg->digestsize;
crypto/shash.c +1 -2
@@ -50,8 +50,7 @@ static int shash_setkey_unaligned(struct crypto_shash *tfm, const u8 *key,static void shash_set_needkey (struct crypto_shash *tfm,struct shash_alg *alg) { -if (crypto_shash_alg_has_setkey (alg) && - !(alg->base.cra_flags &CRYPTO_ALG_OPTIONAL_KEY )) +if (crypto_shash_alg_needs_key (alg))crypto_shash_set_flags (tfm,CRYPTO_TFM_NEED_KEY ); }
include/crypto/internal/hash.h +6 -0
@@ -85,6 +85,12 @@ static inline bool crypto_shash_alg_has_setkey(struct shash_alg *alg)return alg->setkey != shash_no_setkey; } +static inline bool crypto_shash_alg_needs_key (struct shash_alg *alg) +{ +return crypto_shash_alg_has_setkey (alg) && + !(alg->base.cra_flags &CRYPTO_ALG_OPTIONAL_KEY ); +} +bool crypto_hash_alg_has_setkey (struct hash_alg_common *halg); int crypto_init_ahash_spawn(struct crypto_ahash_spawn *spawn,
Signature · 1 line
2.24.0
Quoted 12 lines · Eric Biggers
From: Eric Biggers <[email protected]>
The essiv and hmac templates refuse to use any hash algorithm that has a ->setkey() function, which includes not just algorithms that always need a key, but also algorithms that optionally take a key.
Previously the only optionally-keyed hash algorithms in the crypto API were non-cryptographic algorithms like crc32, so this didn't really matter. But that's changed with BLAKE2 support being added. BLAKE2 should work with essiv and hmac, just like any other cryptographic hash.
Quoted 4 lines
Fix this by allowing the use of both algorithms without a ->setkey() function and algorithms that have the
OPTIONAL_KEYflag set.Signed-off-by Eric Biggers <[email protected]>
Hey Eric,
Even though I am not convinced that using hmac() with blake2 makes a lot of sense, I agree that the mere presence or absence of the setkey() hook should decide whether this is permitted.
So,
Quoted 70 lines
--- crypto/essiv.c | 2 +- crypto/hmac.c | 4 ++-- crypto/shash.c | 3 +-- include/crypto/internal/hash.h | 6 ++++++ 4 files changed, 10 insertions(+), 5 deletions(-)crypto/essiv.c +1
-1@@ -442,7 +442,7 @@ static bool essiv_supported_algorithms(const char *essiv_cipher_name,if (ivsize != alg->cra_blocksize) goto out; -if (crypto_shash_alg_has_setkey (hash_alg)) +if (crypto_shash_alg_needs_key (hash_alg)) goto out; ret = true;crypto/hmac.c +2
-2@@ -185,9 +185,9 @@ static int hmac_create(struct crypto_template *tmpl, struct rtattr **tb)return PTR_ERR (salg); alg = &salg->base; -/* The underlying hash algorithm must be unkeyed */ +/* The underlying hash algorithm must not require a key */ err = -EINVAL ; -if (crypto_shash_alg_has_setkey (salg)) +if (crypto_shash_alg_needs_key (salg)) goto out_put_alg; ds = salg->digestsize;crypto/shash.c +1
-2@@ -50,8 +50,7 @@ static int shash_setkey_unaligned(struct crypto_shash *tfm, const u8 *key,static void shash_set_needkey (struct crypto_shash *tfm,struct shash_alg *alg) { -if (crypto_shash_alg_has_setkey (alg) && - !(alg->base.cra_flags &CRYPTO_ALG_OPTIONAL_KEY )) +if (crypto_shash_alg_needs_key (alg))crypto_shash_set_flags (tfm,CRYPTO_TFM_NEED_KEY ); }include/crypto/internal/hash.h +6
-1@@ -85,6 +85,12 @@ static inline bool crypto_shash_alg_has_setkey(struct shash_alg *alg)return alg->setkey != shash_no_setkey; } +static inline bool crypto_shash_alg_needs_key (struct shash_alg *alg) +{ +return crypto_shash_alg_has_setkey (alg) && + !(alg->base.cra_flags &CRYPTO_ALG_OPTIONAL_KEY ); +} +bool crypto_hash_alg_has_setkey (struct hash_alg_common *halg); int crypto_init_ahash_spawn(struct crypto_ahash_spawn *spawn, --2.24.0
Herbert Xu
maintainerQuoted 14 lines · Eric Biggers
From: Eric Biggers <[email protected]>
The essiv and hmac templates refuse to use any hash algorithm that has a ->setkey() function, which includes not just algorithms that always need a key, but also algorithms that optionally take a key.
Previously the only optionally-keyed hash algorithms in the crypto API were non-cryptographic algorithms like crc32, so this didn't really matter. But that's changed with BLAKE2 support being added. BLAKE2 should work with essiv and hmac, just like any other cryptographic hash.
Fix this by allowing the use of both algorithms without a ->setkey() function and algorithms that have the
OPTIONAL_KEYflag set.
Quoted 7 lines
Signed-off-by Eric Biggers <[email protected]>---
crypto/essiv.c | 2 +- crypto/hmac.c | 4 ++-- crypto/shash.c | 3 +-- include/crypto/internal/hash.h | 6 ++++++ 4 files changed, 10 insertions(+), 5 deletions(-)
Patch applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt