diff options
author | Eric Biggers <ebiggers@google.com> | 2019-05-20 12:54:46 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2019-05-30 03:28:41 -0400 |
commit | 84ede58dfcd1db6f04f71dd3ccd5328271b346da (patch) | |
tree | 68b92a67caa5513a870eeaf6d685acb581d99308 | |
parent | 3e56e168638b3e7147902c3b7257a57ea573a30e (diff) |
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: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r-- | Documentation/crypto/architecture.rst | 4 | ||||
-rw-r--r-- | crypto/cryptd.c | 2 | ||||
-rw-r--r-- | 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 ee8ff0762d7f..3eae1ae7f798 100644 --- a/Documentation/crypto/architecture.rst +++ b/Documentation/crypto/architecture.rst | |||
@@ -208,9 +208,7 @@ the aforementioned cipher types: | |||
208 | - CRYPTO_ALG_TYPE_KPP Key-agreement Protocol Primitive (KPP) such as | 208 | - CRYPTO_ALG_TYPE_KPP Key-agreement Protocol Primitive (KPP) such as |
209 | an ECDH or DH implementation | 209 | an ECDH or DH implementation |
210 | 210 | ||
211 | - CRYPTO_ALG_TYPE_DIGEST Raw message digest | 211 | - CRYPTO_ALG_TYPE_HASH Raw message digest |
212 | |||
213 | - CRYPTO_ALG_TYPE_HASH Alias for CRYPTO_ALG_TYPE_DIGEST | ||
214 | 212 | ||
215 | - CRYPTO_ALG_TYPE_SHASH Synchronous multi-block hash | 213 | - CRYPTO_ALG_TYPE_SHASH Synchronous multi-block hash |
216 | 214 | ||
diff --git a/crypto/cryptd.c b/crypto/cryptd.c index 1bf777b76512..c34d10309b1b 100644 --- a/crypto/cryptd.c +++ b/crypto/cryptd.c | |||
@@ -925,7 +925,7 @@ static int cryptd_create(struct crypto_template *tmpl, struct rtattr **tb) | |||
925 | switch (algt->type & algt->mask & CRYPTO_ALG_TYPE_MASK) { | 925 | switch (algt->type & algt->mask & CRYPTO_ALG_TYPE_MASK) { |
926 | case CRYPTO_ALG_TYPE_BLKCIPHER: | 926 | case CRYPTO_ALG_TYPE_BLKCIPHER: |
927 | return cryptd_create_skcipher(tmpl, tb, &queue); | 927 | return cryptd_create_skcipher(tmpl, tb, &queue); |
928 | case CRYPTO_ALG_TYPE_DIGEST: | 928 | case CRYPTO_ALG_TYPE_HASH: |
929 | return cryptd_create_hash(tmpl, tb, &queue); | 929 | return cryptd_create_hash(tmpl, tb, &queue); |
930 | case CRYPTO_ALG_TYPE_AEAD: | 930 | case CRYPTO_ALG_TYPE_AEAD: |
931 | return cryptd_create_aead(tmpl, tb, &queue); | 931 | return cryptd_create_aead(tmpl, tb, &queue); |
diff --git a/include/linux/crypto.h b/include/linux/crypto.h index f2565a103158..311237b1dab0 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h | |||
@@ -54,7 +54,6 @@ | |||
54 | #define CRYPTO_ALG_TYPE_SCOMPRESS 0x0000000b | 54 | #define CRYPTO_ALG_TYPE_SCOMPRESS 0x0000000b |
55 | #define CRYPTO_ALG_TYPE_RNG 0x0000000c | 55 | #define CRYPTO_ALG_TYPE_RNG 0x0000000c |
56 | #define CRYPTO_ALG_TYPE_AKCIPHER 0x0000000d | 56 | #define CRYPTO_ALG_TYPE_AKCIPHER 0x0000000d |
57 | #define CRYPTO_ALG_TYPE_DIGEST 0x0000000e | ||
58 | #define CRYPTO_ALG_TYPE_HASH 0x0000000e | 57 | #define CRYPTO_ALG_TYPE_HASH 0x0000000e |
59 | #define CRYPTO_ALG_TYPE_SHASH 0x0000000e | 58 | #define CRYPTO_ALG_TYPE_SHASH 0x0000000e |
60 | #define CRYPTO_ALG_TYPE_AHASH 0x0000000f | 59 | #define CRYPTO_ALG_TYPE_AHASH 0x0000000f |