Skip to content

Commit

Permalink
crypto: ahash - check for shash type instead of not ahash type
Browse files Browse the repository at this point in the history
Since the previous patch made crypto_shash_type visible to ahash.c,
change checks for '->cra_type != &crypto_ahash_type' to '->cra_type ==
&crypto_shash_type'.  This makes more sense and avoids having to
forward-declare crypto_ahash_type.  The result is still the same, since
the type is either shash or ahash here.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
Eric Biggers authored and Herbert Xu committed Oct 27, 2023
1 parent ecf889b commit 85b8432
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions crypto/ahash.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@

#define CRYPTO_ALG_TYPE_AHASH_MASK 0x0000000e

static const struct crypto_type crypto_ahash_type;

static int shash_async_setkey(struct crypto_ahash *tfm, const u8 *key,
unsigned int keylen)
{
Expand Down Expand Up @@ -511,7 +509,7 @@ static int crypto_ahash_init_tfm(struct crypto_tfm *tfm)

crypto_ahash_set_statesize(hash, alg->halg.statesize);

if (tfm->__crt_alg->cra_type != &crypto_ahash_type)
if (tfm->__crt_alg->cra_type == &crypto_shash_type)
return crypto_init_shash_ops_async(tfm);

hash->init = alg->init;
Expand All @@ -535,7 +533,7 @@ static int crypto_ahash_init_tfm(struct crypto_tfm *tfm)

static unsigned int crypto_ahash_extsize(struct crypto_alg *alg)
{
if (alg->cra_type != &crypto_ahash_type)
if (alg->cra_type == &crypto_shash_type)
return sizeof(struct crypto_shash *);

return crypto_alg_extsize(alg);
Expand Down Expand Up @@ -760,7 +758,7 @@ bool crypto_hash_alg_has_setkey(struct hash_alg_common *halg)
{
struct crypto_alg *alg = &halg->base;

if (alg->cra_type != &crypto_ahash_type)
if (alg->cra_type == &crypto_shash_type)
return crypto_shash_alg_has_setkey(__crypto_shash_alg(alg));

return __crypto_ahash_alg(alg)->setkey != NULL;
Expand Down

0 comments on commit 85b8432

Please sign in to comment.