Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84ede58d authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: hash - remove CRYPTO_ALG_TYPE_DIGEST 



Remove the unnecessary constant CRYPTO_ALG_TYPE_DIGEST, which has the
same value as CRYPTO_ALG_TYPE_HASH.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 3e56e168

Documentation/crypto/architecture.rst

+1 −3
Original line number Original line Diff line number Diff line
@@ -208,9 +208,7 @@ the aforementioned cipher types: 
-  CRYPTO_ALG_TYPE_KPP Key-agreement Protocol Primitive (KPP) such as

-  CRYPTO_ALG_TYPE_KPP Key-agreement Protocol Primitive (KPP) such as

   an ECDH or DH implementation

   an ECDH or DH implementation





-  CRYPTO_ALG_TYPE_DIGEST Raw message digest

-  CRYPTO_ALG_TYPE_HASH Raw message digest



-  CRYPTO_ALG_TYPE_HASH Alias for CRYPTO_ALG_TYPE_DIGEST





-  CRYPTO_ALG_TYPE_SHASH Synchronous multi-block hash

-  CRYPTO_ALG_TYPE_SHASH Synchronous multi-block hash

crypto/cryptd.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -925,7 +925,7 @@ static int cryptd_create(struct crypto_template *tmpl, struct rtattr **tb) 
	switch (algt->type & algt->mask & CRYPTO_ALG_TYPE_MASK) {

	switch (algt->type & algt->mask & CRYPTO_ALG_TYPE_MASK) {

	case CRYPTO_ALG_TYPE_BLKCIPHER:

	case CRYPTO_ALG_TYPE_BLKCIPHER:

		return cryptd_create_skcipher(tmpl, tb, &queue);

		return cryptd_create_skcipher(tmpl, tb, &queue);

	case CRYPTO_ALG_TYPE_DIGEST:

	case CRYPTO_ALG_TYPE_HASH:

		return cryptd_create_hash(tmpl, tb, &queue);

		return cryptd_create_hash(tmpl, tb, &queue);

	case CRYPTO_ALG_TYPE_AEAD:

	case CRYPTO_ALG_TYPE_AEAD:

		return cryptd_create_aead(tmpl, tb, &queue);

		return cryptd_create_aead(tmpl, tb, &queue);

include/linux/crypto.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -54,7 +54,6 @@ 
#define CRYPTO_ALG_TYPE_SCOMPRESS	0x0000000b

#define CRYPTO_ALG_TYPE_SCOMPRESS	0x0000000b

#define CRYPTO_ALG_TYPE_RNG		0x0000000c

#define CRYPTO_ALG_TYPE_RNG		0x0000000c

#define CRYPTO_ALG_TYPE_AKCIPHER	0x0000000d

#define CRYPTO_ALG_TYPE_AKCIPHER	0x0000000d

#define CRYPTO_ALG_TYPE_DIGEST		0x0000000e

#define CRYPTO_ALG_TYPE_HASH		0x0000000e

#define CRYPTO_ALG_TYPE_HASH		0x0000000e

#define CRYPTO_ALG_TYPE_SHASH		0x0000000e

#define CRYPTO_ALG_TYPE_SHASH		0x0000000e

#define CRYPTO_ALG_TYPE_AHASH		0x0000000f

#define CRYPTO_ALG_TYPE_AHASH		0x0000000f