[PATCH] crypto: hash - remove CRYPTO_ALG_TYPE_DIGEST

[PATCH] crypto: hash - remove CRYPTO_ALG_TYPE_DIGEST

[Eric Biggers]

From: Eric Biggers <ebiggers@google.com>

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

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 Documentation/crypto/architecture.rst | 4 +---
 crypto/cryptd.c                       | 2 +-
 include/linux/crypto.h                | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Documentation/crypto/architecture.rst b/Documentation/crypto/architecture.rst
index ee8ff0762d7fa..3eae1ae7f7981 100644
--- a/Documentation/crypto/architecture.rst
+++ b/Documentation/crypto/architecture.rst
@@ -208,9 +208,7 @@ the aforementioned cipher types:
 -  CRYPTO_ALG_TYPE_KPP Key-agreement Protocol Primitive (KPP) such as
    an ECDH or DH implementation
 
--  CRYPTO_ALG_TYPE_DIGEST Raw message digest
-
--  CRYPTO_ALG_TYPE_HASH Alias for CRYPTO_ALG_TYPE_DIGEST
+-  CRYPTO_ALG_TYPE_HASH Raw message digest
 
 -  CRYPTO_ALG_TYPE_SHASH Synchronous multi-block hash
 
diff --git a/crypto/cryptd.c b/crypto/cryptd.c
index 1bf777b765127..c34d10309b1b3 100644
--- a/crypto/cryptd.c
+++ b/crypto/cryptd.c
@@ -925,7 +925,7 @@ static int cryptd_create(struct crypto_template *tmpl, struct rtattr **tb)
 	switch (algt->type & algt->mask & CRYPTO_ALG_TYPE_MASK) {
 	case CRYPTO_ALG_TYPE_BLKCIPHER:
 		return cryptd_create_skcipher(tmpl, tb, &queue);
-	case CRYPTO_ALG_TYPE_DIGEST:
+	case CRYPTO_ALG_TYPE_HASH:
 		return cryptd_create_hash(tmpl, tb, &queue);
 	case CRYPTO_ALG_TYPE_AEAD:
 		return cryptd_create_aead(tmpl, tb, &queue);
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index f2565a1031584..311237b1dab02 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -54,7 +54,6 @@
 #define CRYPTO_ALG_TYPE_SCOMPRESS	0x0000000b
 #define CRYPTO_ALG_TYPE_RNG		0x0000000c
 #define CRYPTO_ALG_TYPE_AKCIPHER	0x0000000d
-#define CRYPTO_ALG_TYPE_DIGEST		0x0000000e
 #define CRYPTO_ALG_TYPE_HASH		0x0000000e
 #define CRYPTO_ALG_TYPE_SHASH		0x0000000e
 #define CRYPTO_ALG_TYPE_AHASH		0x0000000f
-- 
2.21.0.1020.gf2820cf01a-goog

Re: [PATCH] crypto: hash - remove CRYPTO_ALG_TYPE_DIGEST

[Herbert Xu]

On Mon, May 20, 2019 at 09:54:46AM -0700, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> Remove the unnecessary constant CRYPTO_ALG_TYPE_DIGEST, which has the
> same value as CRYPTO_ALG_TYPE_HASH.
> 
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
>  Documentation/crypto/architecture.rst | 4 +---
>  crypto/cryptd.c                       | 2 +-
>  include/linux/crypto.h                | 1 -
>  3 files changed, 2 insertions(+), 5 deletions(-)

Patch applied.  Thanks.
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt