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.

Eric Biggers committed 7 years ago

Commit 84ede581 parent 3e56e163 files · +2 −5Browse files

Unified · Split

3 files

Documentation/crypto/architecture.rst +1 −3
crypto/cryptd.c +1 −1
include/linux/crypto.h +0 −1

Documentation/crypto/architecture.rst+1−3

@@ -208,9 +208,7 @@ the aforementioned cipher types: · 207 unmodified lines
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

crypto/cryptd.c+1−1

@@ -925,7 +925,7 @@ static int cryptd_create(struct crypto_template tmpl, struct rtattr *tb) · 924 unmodified lines
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);

include/linux/crypto.h+0−1

@@ -54,7 +54,6 @@ · 53 unmodified lines
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