Commit e50944e2 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu

crypto: shash - remove useless setting of type flags

Many shash algorithms set .cra_flags = CRYPTO_ALG_TYPE_SHASH.  But this
is redundant with the C structure type ('struct shash_alg'), and
crypto_register_shash() already sets the type flag automatically,
clearing any type flag that was already there.  Apparently the useless
assignment has just been copy+pasted around.

So, remove the useless assignment from all the shash algorithms.

This patch shouldn't change any actual behavior.
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 8aeef492
...@@ -152,7 +152,7 @@ static struct shash_alg ghash_alg = { ...@@ -152,7 +152,7 @@ static struct shash_alg ghash_alg = {
.cra_name = "__ghash", .cra_name = "__ghash",
.cra_driver_name = "__driver-ghash-ce", .cra_driver_name = "__driver-ghash-ce",
.cra_priority = 0, .cra_priority = 0,
.cra_flags = CRYPTO_ALG_TYPE_SHASH | CRYPTO_ALG_INTERNAL, .cra_flags = CRYPTO_ALG_INTERNAL,
.cra_blocksize = GHASH_BLOCK_SIZE, .cra_blocksize = GHASH_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct ghash_key), .cra_ctxsize = sizeof(struct ghash_key),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
......
...@@ -75,7 +75,6 @@ static struct shash_alg alg = { ...@@ -75,7 +75,6 @@ static struct shash_alg alg = {
.cra_name = "sha1", .cra_name = "sha1",
.cra_driver_name = "sha1-ce", .cra_driver_name = "sha1-ce",
.cra_priority = 200, .cra_priority = 200,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA1_BLOCK_SIZE, .cra_blocksize = SHA1_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -67,7 +67,6 @@ static struct shash_alg alg = { ...@@ -67,7 +67,6 @@ static struct shash_alg alg = {
.cra_name = "sha1", .cra_name = "sha1",
.cra_driver_name= "sha1-asm", .cra_driver_name= "sha1-asm",
.cra_priority = 150, .cra_priority = 150,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA1_BLOCK_SIZE, .cra_blocksize = SHA1_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -83,7 +83,6 @@ static struct shash_alg alg = { ...@@ -83,7 +83,6 @@ static struct shash_alg alg = {
.cra_name = "sha1", .cra_name = "sha1",
.cra_driver_name = "sha1-neon", .cra_driver_name = "sha1-neon",
.cra_priority = 250, .cra_priority = 250,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA1_BLOCK_SIZE, .cra_blocksize = SHA1_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -78,7 +78,6 @@ static struct shash_alg algs[] = { { ...@@ -78,7 +78,6 @@ static struct shash_alg algs[] = { {
.cra_name = "sha224", .cra_name = "sha224",
.cra_driver_name = "sha224-ce", .cra_driver_name = "sha224-ce",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA256_BLOCK_SIZE, .cra_blocksize = SHA256_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -93,7 +92,6 @@ static struct shash_alg algs[] = { { ...@@ -93,7 +92,6 @@ static struct shash_alg algs[] = { {
.cra_name = "sha256", .cra_name = "sha256",
.cra_driver_name = "sha256-ce", .cra_driver_name = "sha256-ce",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA256_BLOCK_SIZE, .cra_blocksize = SHA256_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -71,7 +71,6 @@ static struct shash_alg algs[] = { { ...@@ -71,7 +71,6 @@ static struct shash_alg algs[] = { {
.cra_name = "sha256", .cra_name = "sha256",
.cra_driver_name = "sha256-asm", .cra_driver_name = "sha256-asm",
.cra_priority = 150, .cra_priority = 150,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA256_BLOCK_SIZE, .cra_blocksize = SHA256_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -86,7 +85,6 @@ static struct shash_alg algs[] = { { ...@@ -86,7 +85,6 @@ static struct shash_alg algs[] = { {
.cra_name = "sha224", .cra_name = "sha224",
.cra_driver_name = "sha224-asm", .cra_driver_name = "sha224-asm",
.cra_priority = 150, .cra_priority = 150,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA224_BLOCK_SIZE, .cra_blocksize = SHA224_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -79,7 +79,6 @@ struct shash_alg sha256_neon_algs[] = { { ...@@ -79,7 +79,6 @@ struct shash_alg sha256_neon_algs[] = { {
.cra_name = "sha256", .cra_name = "sha256",
.cra_driver_name = "sha256-neon", .cra_driver_name = "sha256-neon",
.cra_priority = 250, .cra_priority = 250,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA256_BLOCK_SIZE, .cra_blocksize = SHA256_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -94,7 +93,6 @@ struct shash_alg sha256_neon_algs[] = { { ...@@ -94,7 +93,6 @@ struct shash_alg sha256_neon_algs[] = { {
.cra_name = "sha224", .cra_name = "sha224",
.cra_driver_name = "sha224-neon", .cra_driver_name = "sha224-neon",
.cra_priority = 250, .cra_priority = 250,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA224_BLOCK_SIZE, .cra_blocksize = SHA224_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -63,7 +63,6 @@ static struct shash_alg sha512_arm_algs[] = { { ...@@ -63,7 +63,6 @@ static struct shash_alg sha512_arm_algs[] = { {
.cra_name = "sha384", .cra_name = "sha384",
.cra_driver_name = "sha384-arm", .cra_driver_name = "sha384-arm",
.cra_priority = 250, .cra_priority = 250,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA512_BLOCK_SIZE, .cra_blocksize = SHA512_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -78,7 +77,6 @@ static struct shash_alg sha512_arm_algs[] = { { ...@@ -78,7 +77,6 @@ static struct shash_alg sha512_arm_algs[] = { {
.cra_name = "sha512", .cra_name = "sha512",
.cra_driver_name = "sha512-arm", .cra_driver_name = "sha512-arm",
.cra_priority = 250, .cra_priority = 250,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA512_BLOCK_SIZE, .cra_blocksize = SHA512_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -75,7 +75,6 @@ struct shash_alg sha512_neon_algs[] = { { ...@@ -75,7 +75,6 @@ struct shash_alg sha512_neon_algs[] = { {
.cra_name = "sha384", .cra_name = "sha384",
.cra_driver_name = "sha384-neon", .cra_driver_name = "sha384-neon",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA384_BLOCK_SIZE, .cra_blocksize = SHA384_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
...@@ -91,7 +90,6 @@ struct shash_alg sha512_neon_algs[] = { { ...@@ -91,7 +90,6 @@ struct shash_alg sha512_neon_algs[] = { {
.cra_name = "sha512", .cra_name = "sha512",
.cra_driver_name = "sha512-neon", .cra_driver_name = "sha512-neon",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA512_BLOCK_SIZE, .cra_blocksize = SHA512_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -567,7 +567,6 @@ static struct shash_alg mac_algs[] = { { ...@@ -567,7 +567,6 @@ static struct shash_alg mac_algs[] = { {
.base.cra_name = "cmac(aes)", .base.cra_name = "cmac(aes)",
.base.cra_driver_name = "cmac-aes-" MODE, .base.cra_driver_name = "cmac-aes-" MODE,
.base.cra_priority = PRIO, .base.cra_priority = PRIO,
.base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.base.cra_blocksize = AES_BLOCK_SIZE, .base.cra_blocksize = AES_BLOCK_SIZE,
.base.cra_ctxsize = sizeof(struct mac_tfm_ctx) + .base.cra_ctxsize = sizeof(struct mac_tfm_ctx) +
2 * AES_BLOCK_SIZE, 2 * AES_BLOCK_SIZE,
...@@ -583,7 +582,6 @@ static struct shash_alg mac_algs[] = { { ...@@ -583,7 +582,6 @@ static struct shash_alg mac_algs[] = { {
.base.cra_name = "xcbc(aes)", .base.cra_name = "xcbc(aes)",
.base.cra_driver_name = "xcbc-aes-" MODE, .base.cra_driver_name = "xcbc-aes-" MODE,
.base.cra_priority = PRIO, .base.cra_priority = PRIO,
.base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.base.cra_blocksize = AES_BLOCK_SIZE, .base.cra_blocksize = AES_BLOCK_SIZE,
.base.cra_ctxsize = sizeof(struct mac_tfm_ctx) + .base.cra_ctxsize = sizeof(struct mac_tfm_ctx) +
2 * AES_BLOCK_SIZE, 2 * AES_BLOCK_SIZE,
...@@ -599,7 +597,6 @@ static struct shash_alg mac_algs[] = { { ...@@ -599,7 +597,6 @@ static struct shash_alg mac_algs[] = { {
.base.cra_name = "cbcmac(aes)", .base.cra_name = "cbcmac(aes)",
.base.cra_driver_name = "cbcmac-aes-" MODE, .base.cra_driver_name = "cbcmac-aes-" MODE,
.base.cra_priority = PRIO, .base.cra_priority = PRIO,
.base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.base.cra_blocksize = 1, .base.cra_blocksize = 1,
.base.cra_ctxsize = sizeof(struct mac_tfm_ctx), .base.cra_ctxsize = sizeof(struct mac_tfm_ctx),
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
......
...@@ -204,7 +204,6 @@ static struct shash_alg ghash_alg = { ...@@ -204,7 +204,6 @@ static struct shash_alg ghash_alg = {
.base.cra_name = "ghash", .base.cra_name = "ghash",
.base.cra_driver_name = "ghash-ce", .base.cra_driver_name = "ghash-ce",
.base.cra_priority = 200, .base.cra_priority = 200,
.base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.base.cra_blocksize = GHASH_BLOCK_SIZE, .base.cra_blocksize = GHASH_BLOCK_SIZE,
.base.cra_ctxsize = sizeof(struct ghash_key), .base.cra_ctxsize = sizeof(struct ghash_key),
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
......
...@@ -99,7 +99,6 @@ static struct shash_alg alg = { ...@@ -99,7 +99,6 @@ static struct shash_alg alg = {
.cra_name = "sha1", .cra_name = "sha1",
.cra_driver_name = "sha1-ce", .cra_driver_name = "sha1-ce",
.cra_priority = 200, .cra_priority = 200,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA1_BLOCK_SIZE, .cra_blocksize = SHA1_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -114,7 +114,6 @@ static struct shash_alg algs[] = { { ...@@ -114,7 +114,6 @@ static struct shash_alg algs[] = { {
.cra_name = "sha224", .cra_name = "sha224",
.cra_driver_name = "sha224-ce", .cra_driver_name = "sha224-ce",
.cra_priority = 200, .cra_priority = 200,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA256_BLOCK_SIZE, .cra_blocksize = SHA256_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -129,7 +128,6 @@ static struct shash_alg algs[] = { { ...@@ -129,7 +128,6 @@ static struct shash_alg algs[] = { {
.cra_name = "sha256", .cra_name = "sha256",
.cra_driver_name = "sha256-ce", .cra_driver_name = "sha256-ce",
.cra_priority = 200, .cra_priority = 200,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA256_BLOCK_SIZE, .cra_blocksize = SHA256_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -68,7 +68,6 @@ static struct shash_alg algs[] = { { ...@@ -68,7 +68,6 @@ static struct shash_alg algs[] = { {
.base.cra_name = "sha256", .base.cra_name = "sha256",
.base.cra_driver_name = "sha256-arm64", .base.cra_driver_name = "sha256-arm64",
.base.cra_priority = 100, .base.cra_priority = 100,
.base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.base.cra_blocksize = SHA256_BLOCK_SIZE, .base.cra_blocksize = SHA256_BLOCK_SIZE,
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
}, { }, {
...@@ -81,7 +80,6 @@ static struct shash_alg algs[] = { { ...@@ -81,7 +80,6 @@ static struct shash_alg algs[] = { {
.base.cra_name = "sha224", .base.cra_name = "sha224",
.base.cra_driver_name = "sha224-arm64", .base.cra_driver_name = "sha224-arm64",
.base.cra_priority = 100, .base.cra_priority = 100,
.base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.base.cra_blocksize = SHA224_BLOCK_SIZE, .base.cra_blocksize = SHA224_BLOCK_SIZE,
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
} }; } };
...@@ -153,7 +151,6 @@ static struct shash_alg neon_algs[] = { { ...@@ -153,7 +151,6 @@ static struct shash_alg neon_algs[] = { {
.base.cra_name = "sha256", .base.cra_name = "sha256",
.base.cra_driver_name = "sha256-arm64-neon", .base.cra_driver_name = "sha256-arm64-neon",
.base.cra_priority = 150, .base.cra_priority = 150,
.base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.base.cra_blocksize = SHA256_BLOCK_SIZE, .base.cra_blocksize = SHA256_BLOCK_SIZE,
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
}, { }, {
...@@ -166,7 +163,6 @@ static struct shash_alg neon_algs[] = { { ...@@ -166,7 +163,6 @@ static struct shash_alg neon_algs[] = { {
.base.cra_name = "sha224", .base.cra_name = "sha224",
.base.cra_driver_name = "sha224-arm64-neon", .base.cra_driver_name = "sha224-arm64-neon",
.base.cra_priority = 150, .base.cra_priority = 150,
.base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.base.cra_blocksize = SHA224_BLOCK_SIZE, .base.cra_blocksize = SHA224_BLOCK_SIZE,
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
} }; } };
......
...@@ -105,7 +105,6 @@ static struct shash_alg algs[] = { { ...@@ -105,7 +105,6 @@ static struct shash_alg algs[] = { {
.descsize = sizeof(struct sha3_state), .descsize = sizeof(struct sha3_state),
.base.cra_name = "sha3-224", .base.cra_name = "sha3-224",
.base.cra_driver_name = "sha3-224-ce", .base.cra_driver_name = "sha3-224-ce",
.base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.base.cra_blocksize = SHA3_224_BLOCK_SIZE, .base.cra_blocksize = SHA3_224_BLOCK_SIZE,
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
.base.cra_priority = 200, .base.cra_priority = 200,
...@@ -117,7 +116,6 @@ static struct shash_alg algs[] = { { ...@@ -117,7 +116,6 @@ static struct shash_alg algs[] = { {
.descsize = sizeof(struct sha3_state), .descsize = sizeof(struct sha3_state),
.base.cra_name = "sha3-256", .base.cra_name = "sha3-256",
.base.cra_driver_name = "sha3-256-ce", .base.cra_driver_name = "sha3-256-ce",
.base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.base.cra_blocksize = SHA3_256_BLOCK_SIZE, .base.cra_blocksize = SHA3_256_BLOCK_SIZE,
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
.base.cra_priority = 200, .base.cra_priority = 200,
...@@ -129,7 +127,6 @@ static struct shash_alg algs[] = { { ...@@ -129,7 +127,6 @@ static struct shash_alg algs[] = { {
.descsize = sizeof(struct sha3_state), .descsize = sizeof(struct sha3_state),
.base.cra_name = "sha3-384", .base.cra_name = "sha3-384",
.base.cra_driver_name = "sha3-384-ce", .base.cra_driver_name = "sha3-384-ce",
.base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.base.cra_blocksize = SHA3_384_BLOCK_SIZE, .base.cra_blocksize = SHA3_384_BLOCK_SIZE,
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
.base.cra_priority = 200, .base.cra_priority = 200,
...@@ -141,7 +138,6 @@ static struct shash_alg algs[] = { { ...@@ -141,7 +138,6 @@ static struct shash_alg algs[] = { {
.descsize = sizeof(struct sha3_state), .descsize = sizeof(struct sha3_state),
.base.cra_name = "sha3-512", .base.cra_name = "sha3-512",
.base.cra_driver_name = "sha3-512-ce", .base.cra_driver_name = "sha3-512-ce",
.base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.base.cra_blocksize = SHA3_512_BLOCK_SIZE, .base.cra_blocksize = SHA3_512_BLOCK_SIZE,
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
.base.cra_priority = 200, .base.cra_priority = 200,
......
...@@ -87,7 +87,6 @@ static struct shash_alg algs[] = { { ...@@ -87,7 +87,6 @@ static struct shash_alg algs[] = { {
.base.cra_name = "sha384", .base.cra_name = "sha384",
.base.cra_driver_name = "sha384-ce", .base.cra_driver_name = "sha384-ce",
.base.cra_priority = 200, .base.cra_priority = 200,
.base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.base.cra_blocksize = SHA512_BLOCK_SIZE, .base.cra_blocksize = SHA512_BLOCK_SIZE,
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
}, { }, {
...@@ -100,7 +99,6 @@ static struct shash_alg algs[] = { { ...@@ -100,7 +99,6 @@ static struct shash_alg algs[] = { {
.base.cra_name = "sha512", .base.cra_name = "sha512",
.base.cra_driver_name = "sha512-ce", .base.cra_driver_name = "sha512-ce",
.base.cra_priority = 200, .base.cra_priority = 200,
.base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.base.cra_blocksize = SHA512_BLOCK_SIZE, .base.cra_blocksize = SHA512_BLOCK_SIZE,
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
} }; } };
......
...@@ -63,7 +63,6 @@ static struct shash_alg algs[] = { { ...@@ -63,7 +63,6 @@ static struct shash_alg algs[] = { {
.base.cra_name = "sha512", .base.cra_name = "sha512",
.base.cra_driver_name = "sha512-arm64", .base.cra_driver_name = "sha512-arm64",
.base.cra_priority = 150, .base.cra_priority = 150,
.base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.base.cra_blocksize = SHA512_BLOCK_SIZE, .base.cra_blocksize = SHA512_BLOCK_SIZE,
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
}, { }, {
...@@ -76,7 +75,6 @@ static struct shash_alg algs[] = { { ...@@ -76,7 +75,6 @@ static struct shash_alg algs[] = { {
.base.cra_name = "sha384", .base.cra_name = "sha384",
.base.cra_driver_name = "sha384-arm64", .base.cra_driver_name = "sha384-arm64",
.base.cra_priority = 150, .base.cra_priority = 150,
.base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.base.cra_blocksize = SHA384_BLOCK_SIZE, .base.cra_blocksize = SHA384_BLOCK_SIZE,
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
} }; } };
......
...@@ -72,7 +72,6 @@ static struct shash_alg sm3_alg = { ...@@ -72,7 +72,6 @@ static struct shash_alg sm3_alg = {
.descsize = sizeof(struct sm3_state), .descsize = sizeof(struct sm3_state),
.base.cra_name = "sm3", .base.cra_name = "sm3",
.base.cra_driver_name = "sm3-ce", .base.cra_driver_name = "sm3-ce",
.base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.base.cra_blocksize = SM3_BLOCK_SIZE, .base.cra_blocksize = SM3_BLOCK_SIZE,
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
.base.cra_priority = 200, .base.cra_priority = 200,
......
...@@ -182,7 +182,6 @@ static struct shash_alg alg = { ...@@ -182,7 +182,6 @@ static struct shash_alg alg = {
.cra_name = "md5", .cra_name = "md5",
.cra_driver_name= "octeon-md5", .cra_driver_name= "octeon-md5",
.cra_priority = OCTEON_CR_OPCODE_PRIORITY, .cra_priority = OCTEON_CR_OPCODE_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = MD5_HMAC_BLOCK_SIZE, .cra_blocksize = MD5_HMAC_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -215,7 +215,6 @@ static struct shash_alg octeon_sha1_alg = { ...@@ -215,7 +215,6 @@ static struct shash_alg octeon_sha1_alg = {
.cra_name = "sha1", .cra_name = "sha1",
.cra_driver_name= "octeon-sha1", .cra_driver_name= "octeon-sha1",
.cra_priority = OCTEON_CR_OPCODE_PRIORITY, .cra_priority = OCTEON_CR_OPCODE_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA1_BLOCK_SIZE, .cra_blocksize = SHA1_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -239,7 +239,6 @@ static struct shash_alg octeon_sha256_algs[2] = { { ...@@ -239,7 +239,6 @@ static struct shash_alg octeon_sha256_algs[2] = { {
.cra_name = "sha256", .cra_name = "sha256",
.cra_driver_name= "octeon-sha256", .cra_driver_name= "octeon-sha256",
.cra_priority = OCTEON_CR_OPCODE_PRIORITY, .cra_priority = OCTEON_CR_OPCODE_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA256_BLOCK_SIZE, .cra_blocksize = SHA256_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -252,7 +251,6 @@ static struct shash_alg octeon_sha256_algs[2] = { { ...@@ -252,7 +251,6 @@ static struct shash_alg octeon_sha256_algs[2] = { {
.base = { .base = {
.cra_name = "sha224", .cra_name = "sha224",
.cra_driver_name= "octeon-sha224", .cra_driver_name= "octeon-sha224",
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA224_BLOCK_SIZE, .cra_blocksize = SHA224_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -235,7 +235,6 @@ static struct shash_alg octeon_sha512_algs[2] = { { ...@@ -235,7 +235,6 @@ static struct shash_alg octeon_sha512_algs[2] = { {
.cra_name = "sha512", .cra_name = "sha512",
.cra_driver_name= "octeon-sha512", .cra_driver_name= "octeon-sha512",
.cra_priority = OCTEON_CR_OPCODE_PRIORITY, .cra_priority = OCTEON_CR_OPCODE_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA512_BLOCK_SIZE, .cra_blocksize = SHA512_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -249,7 +248,6 @@ static struct shash_alg octeon_sha512_algs[2] = { { ...@@ -249,7 +248,6 @@ static struct shash_alg octeon_sha512_algs[2] = { {
.cra_name = "sha384", .cra_name = "sha384",
.cra_driver_name= "octeon-sha384", .cra_driver_name= "octeon-sha384",
.cra_priority = OCTEON_CR_OPCODE_PRIORITY, .cra_priority = OCTEON_CR_OPCODE_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA384_BLOCK_SIZE, .cra_blocksize = SHA384_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -139,7 +139,6 @@ static struct shash_alg alg = { ...@@ -139,7 +139,6 @@ static struct shash_alg alg = {
.cra_name = "md5", .cra_name = "md5",
.cra_driver_name= "md5-ppc", .cra_driver_name= "md5-ppc",
.cra_priority = 200, .cra_priority = 200,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = MD5_HMAC_BLOCK_SIZE, .cra_blocksize = MD5_HMAC_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -185,7 +185,6 @@ static struct shash_alg alg = { ...@@ -185,7 +185,6 @@ static struct shash_alg alg = {
.cra_name = "sha1", .cra_name = "sha1",
.cra_driver_name= "sha1-ppc-spe", .cra_driver_name= "sha1-ppc-spe",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA1_BLOCK_SIZE, .cra_blocksize = SHA1_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -132,7 +132,6 @@ static struct shash_alg alg = { ...@@ -132,7 +132,6 @@ static struct shash_alg alg = {
.base = { .base = {
.cra_name = "sha1", .cra_name = "sha1",
.cra_driver_name= "sha1-powerpc", .cra_driver_name= "sha1-powerpc",
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA1_BLOCK_SIZE, .cra_blocksize = SHA1_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -231,7 +231,6 @@ static struct shash_alg algs[2] = { { ...@@ -231,7 +231,6 @@ static struct shash_alg algs[2] = { {
.cra_name = "sha256", .cra_name = "sha256",
.cra_driver_name= "sha256-ppc-spe", .cra_driver_name= "sha256-ppc-spe",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA256_BLOCK_SIZE, .cra_blocksize = SHA256_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -248,7 +247,6 @@ static struct shash_alg algs[2] = { { ...@@ -248,7 +247,6 @@ static struct shash_alg algs[2] = { {
.cra_name = "sha224", .cra_name = "sha224",
.cra_driver_name= "sha224-ppc-spe", .cra_driver_name= "sha224-ppc-spe",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA224_BLOCK_SIZE, .cra_blocksize = SHA224_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -128,7 +128,6 @@ static struct shash_alg ghash_alg = { ...@@ -128,7 +128,6 @@ static struct shash_alg ghash_alg = {
.cra_name = "ghash", .cra_name = "ghash",
.cra_driver_name = "ghash-s390", .cra_driver_name = "ghash-s390",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = GHASH_BLOCK_SIZE, .cra_blocksize = GHASH_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct ghash_ctx), .cra_ctxsize = sizeof(struct ghash_ctx),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
......
...@@ -78,7 +78,6 @@ static struct shash_alg alg = { ...@@ -78,7 +78,6 @@ static struct shash_alg alg = {
.cra_name = "sha1", .cra_name = "sha1",
.cra_driver_name= "sha1-s390", .cra_driver_name= "sha1-s390",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA1_BLOCK_SIZE, .cra_blocksize = SHA1_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -71,7 +71,6 @@ static struct shash_alg sha256_alg = { ...@@ -71,7 +71,6 @@ static struct shash_alg sha256_alg = {
.cra_name = "sha256", .cra_name = "sha256",
.cra_driver_name= "sha256-s390", .cra_driver_name= "sha256-s390",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA256_BLOCK_SIZE, .cra_blocksize = SHA256_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -108,7 +107,6 @@ static struct shash_alg sha224_alg = { ...@@ -108,7 +107,6 @@ static struct shash_alg sha224_alg = {
.cra_name = "sha224", .cra_name = "sha224",
.cra_driver_name= "sha224-s390", .cra_driver_name= "sha224-s390",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA224_BLOCK_SIZE, .cra_blocksize = SHA224_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -76,7 +76,6 @@ static struct shash_alg sha512_alg = { ...@@ -76,7 +76,6 @@ static struct shash_alg sha512_alg = {
.cra_name = "sha512", .cra_name = "sha512",
.cra_driver_name= "sha512-s390", .cra_driver_name= "sha512-s390",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA512_BLOCK_SIZE, .cra_blocksize = SHA512_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -115,7 +114,6 @@ static struct shash_alg sha384_alg = { ...@@ -115,7 +114,6 @@ static struct shash_alg sha384_alg = {
.cra_name = "sha384", .cra_name = "sha384",
.cra_driver_name= "sha384-s390", .cra_driver_name= "sha384-s390",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA384_BLOCK_SIZE, .cra_blocksize = SHA384_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct s390_sha_ctx), .cra_ctxsize = sizeof(struct s390_sha_ctx),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
......
...@@ -144,7 +144,6 @@ static struct shash_alg alg = { ...@@ -144,7 +144,6 @@ static struct shash_alg alg = {
.cra_name = "md5", .cra_name = "md5",
.cra_driver_name= "md5-sparc64", .cra_driver_name= "md5-sparc64",
.cra_priority = SPARC_CR_OPCODE_PRIORITY, .cra_priority = SPARC_CR_OPCODE_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = MD5_HMAC_BLOCK_SIZE, .cra_blocksize = MD5_HMAC_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -139,7 +139,6 @@ static struct shash_alg alg = { ...@@ -139,7 +139,6 @@ static struct shash_alg alg = {
.cra_name = "sha1", .cra_name = "sha1",
.cra_driver_name= "sha1-sparc64", .cra_driver_name= "sha1-sparc64",
.cra_priority = SPARC_CR_OPCODE_PRIORITY, .cra_priority = SPARC_CR_OPCODE_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA1_BLOCK_SIZE, .cra_blocksize = SHA1_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -169,7 +169,6 @@ static struct shash_alg sha256 = { ...@@ -169,7 +169,6 @@ static struct shash_alg sha256 = {
.cra_name = "sha256", .cra_name = "sha256",
.cra_driver_name= "sha256-sparc64", .cra_driver_name= "sha256-sparc64",
.cra_priority = SPARC_CR_OPCODE_PRIORITY, .cra_priority = SPARC_CR_OPCODE_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA256_BLOCK_SIZE, .cra_blocksize = SHA256_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -185,7 +184,6 @@ static struct shash_alg sha224 = { ...@@ -185,7 +184,6 @@ static struct shash_alg sha224 = {
.cra_name = "sha224", .cra_name = "sha224",
.cra_driver_name= "sha224-sparc64", .cra_driver_name= "sha224-sparc64",
.cra_priority = SPARC_CR_OPCODE_PRIORITY, .cra_priority = SPARC_CR_OPCODE_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA224_BLOCK_SIZE, .cra_blocksize = SHA224_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -154,7 +154,6 @@ static struct shash_alg sha512 = { ...@@ -154,7 +154,6 @@ static struct shash_alg sha512 = {
.cra_name = "sha512", .cra_name = "sha512",
.cra_driver_name= "sha512-sparc64", .cra_driver_name= "sha512-sparc64",
.cra_priority = SPARC_CR_OPCODE_PRIORITY, .cra_priority = SPARC_CR_OPCODE_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA512_BLOCK_SIZE, .cra_blocksize = SHA512_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -170,7 +169,6 @@ static struct shash_alg sha384 = { ...@@ -170,7 +169,6 @@ static struct shash_alg sha384 = {
.cra_name = "sha384", .cra_name = "sha384",
.cra_driver_name= "sha384-sparc64", .cra_driver_name= "sha384-sparc64",
.cra_priority = SPARC_CR_OPCODE_PRIORITY, .cra_priority = SPARC_CR_OPCODE_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA384_BLOCK_SIZE, .cra_blocksize = SHA384_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -154,8 +154,7 @@ static struct shash_alg ghash_alg = { ...@@ -154,8 +154,7 @@ static struct shash_alg ghash_alg = {
.cra_name = "__ghash", .cra_name = "__ghash",
.cra_driver_name = "__ghash-pclmulqdqni", .cra_driver_name = "__ghash-pclmulqdqni",
.cra_priority = 0, .cra_priority = 0,
.cra_flags = CRYPTO_ALG_TYPE_SHASH | .cra_flags = CRYPTO_ALG_INTERNAL,
CRYPTO_ALG_INTERNAL,
.cra_blocksize = GHASH_BLOCK_SIZE, .cra_blocksize = GHASH_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct ghash_ctx), .cra_ctxsize = sizeof(struct ghash_ctx),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
......
...@@ -169,7 +169,6 @@ static struct shash_alg alg = { ...@@ -169,7 +169,6 @@ static struct shash_alg alg = {
.cra_name = "poly1305", .cra_name = "poly1305",
.cra_driver_name = "poly1305-simd", .cra_driver_name = "poly1305-simd",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = POLY1305_BLOCK_SIZE, .cra_blocksize = POLY1305_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
}, },
......
...@@ -104,7 +104,6 @@ static struct shash_alg sha1_ssse3_alg = { ...@@ -104,7 +104,6 @@ static struct shash_alg sha1_ssse3_alg = {
.cra_name = "sha1", .cra_name = "sha1",
.cra_driver_name = "sha1-ssse3", .cra_driver_name = "sha1-ssse3",
.cra_priority = 150, .cra_priority = 150,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA1_BLOCK_SIZE, .cra_blocksize = SHA1_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -157,7 +156,6 @@ static struct shash_alg sha1_avx_alg = { ...@@ -157,7 +156,6 @@ static struct shash_alg sha1_avx_alg = {
.cra_name = "sha1", .cra_name = "sha1",
.cra_driver_name = "sha1-avx", .cra_driver_name = "sha1-avx",
.cra_priority = 160, .cra_priority = 160,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA1_BLOCK_SIZE, .cra_blocksize = SHA1_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -249,7 +247,6 @@ static struct shash_alg sha1_avx2_alg = { ...@@ -249,7 +247,6 @@ static struct shash_alg sha1_avx2_alg = {
.cra_name = "sha1", .cra_name = "sha1",
.cra_driver_name = "sha1-avx2", .cra_driver_name = "sha1-avx2",
.cra_priority = 170, .cra_priority = 170,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA1_BLOCK_SIZE, .cra_blocksize = SHA1_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -307,7 +304,6 @@ static struct shash_alg sha1_ni_alg = { ...@@ -307,7 +304,6 @@ static struct shash_alg sha1_ni_alg = {
.cra_name = "sha1", .cra_name = "sha1",
.cra_driver_name = "sha1-ni", .cra_driver_name = "sha1-ni",
.cra_priority = 250, .cra_priority = 250,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA1_BLOCK_SIZE, .cra_blocksize = SHA1_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -109,7 +109,6 @@ static struct shash_alg sha256_ssse3_algs[] = { { ...@@ -109,7 +109,6 @@ static struct shash_alg sha256_ssse3_algs[] = { {
.cra_name = "sha256", .cra_name = "sha256",
.cra_driver_name = "sha256-ssse3", .cra_driver_name = "sha256-ssse3",
.cra_priority = 150, .cra_priority = 150,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA256_BLOCK_SIZE, .cra_blocksize = SHA256_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -124,7 +123,6 @@ static struct shash_alg sha256_ssse3_algs[] = { { ...@@ -124,7 +123,6 @@ static struct shash_alg sha256_ssse3_algs[] = { {
.cra_name = "sha224", .cra_name = "sha224",
.cra_driver_name = "sha224-ssse3", .cra_driver_name = "sha224-ssse3",
.cra_priority = 150, .cra_priority = 150,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA224_BLOCK_SIZE, .cra_blocksize = SHA224_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -177,7 +175,6 @@ static struct shash_alg sha256_avx_algs[] = { { ...@@ -177,7 +175,6 @@ static struct shash_alg sha256_avx_algs[] = { {
.cra_name = "sha256", .cra_name = "sha256",
.cra_driver_name = "sha256-avx", .cra_driver_name = "sha256-avx",
.cra_priority = 160, .cra_priority = 160,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA256_BLOCK_SIZE, .cra_blocksize = SHA256_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -192,7 +189,6 @@ static struct shash_alg sha256_avx_algs[] = { { ...@@ -192,7 +189,6 @@ static struct shash_alg sha256_avx_algs[] = { {
.cra_name = "sha224", .cra_name = "sha224",
.cra_driver_name = "sha224-avx", .cra_driver_name = "sha224-avx",
.cra_priority = 160, .cra_priority = 160,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA224_BLOCK_SIZE, .cra_blocksize = SHA224_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -261,7 +257,6 @@ static struct shash_alg sha256_avx2_algs[] = { { ...@@ -261,7 +257,6 @@ static struct shash_alg sha256_avx2_algs[] = { {
.cra_name = "sha256", .cra_name = "sha256",
.cra_driver_name = "sha256-avx2", .cra_driver_name = "sha256-avx2",
.cra_priority = 170, .cra_priority = 170,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA256_BLOCK_SIZE, .cra_blocksize = SHA256_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -276,7 +271,6 @@ static struct shash_alg sha256_avx2_algs[] = { { ...@@ -276,7 +271,6 @@ static struct shash_alg sha256_avx2_algs[] = { {
.cra_name = "sha224", .cra_name = "sha224",
.cra_driver_name = "sha224-avx2", .cra_driver_name = "sha224-avx2",
.cra_priority = 170, .cra_priority = 170,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA224_BLOCK_SIZE, .cra_blocksize = SHA224_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -343,7 +337,6 @@ static struct shash_alg sha256_ni_algs[] = { { ...@@ -343,7 +337,6 @@ static struct shash_alg sha256_ni_algs[] = { {
.cra_name = "sha256", .cra_name = "sha256",
.cra_driver_name = "sha256-ni", .cra_driver_name = "sha256-ni",
.cra_priority = 250, .cra_priority = 250,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA256_BLOCK_SIZE, .cra_blocksize = SHA256_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -358,7 +351,6 @@ static struct shash_alg sha256_ni_algs[] = { { ...@@ -358,7 +351,6 @@ static struct shash_alg sha256_ni_algs[] = { {
.cra_name = "sha224", .cra_name = "sha224",
.cra_driver_name = "sha224-ni", .cra_driver_name = "sha224-ni",
.cra_priority = 250, .cra_priority = 250,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA224_BLOCK_SIZE, .cra_blocksize = SHA224_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -109,7 +109,6 @@ static struct shash_alg sha512_ssse3_algs[] = { { ...@@ -109,7 +109,6 @@ static struct shash_alg sha512_ssse3_algs[] = { {
.cra_name = "sha512", .cra_name = "sha512",
.cra_driver_name = "sha512-ssse3", .cra_driver_name = "sha512-ssse3",
.cra_priority = 150, .cra_priority = 150,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA512_BLOCK_SIZE, .cra_blocksize = SHA512_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -124,7 +123,6 @@ static struct shash_alg sha512_ssse3_algs[] = { { ...@@ -124,7 +123,6 @@ static struct shash_alg sha512_ssse3_algs[] = { {
.cra_name = "sha384", .cra_name = "sha384",
.cra_driver_name = "sha384-ssse3", .cra_driver_name = "sha384-ssse3",
.cra_priority = 150, .cra_priority = 150,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA384_BLOCK_SIZE, .cra_blocksize = SHA384_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -188,7 +186,6 @@ static struct shash_alg sha512_avx_algs[] = { { ...@@ -188,7 +186,6 @@ static struct shash_alg sha512_avx_algs[] = { {
.cra_name = "sha512", .cra_name = "sha512",
.cra_driver_name = "sha512-avx", .cra_driver_name = "sha512-avx",
.cra_priority = 160, .cra_priority = 160,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA512_BLOCK_SIZE, .cra_blocksize = SHA512_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -203,7 +200,6 @@ static struct shash_alg sha512_avx_algs[] = { { ...@@ -203,7 +200,6 @@ static struct shash_alg sha512_avx_algs[] = { {
.cra_name = "sha384", .cra_name = "sha384",
.cra_driver_name = "sha384-avx", .cra_driver_name = "sha384-avx",
.cra_priority = 160, .cra_priority = 160,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA384_BLOCK_SIZE, .cra_blocksize = SHA384_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -261,7 +257,6 @@ static struct shash_alg sha512_avx2_algs[] = { { ...@@ -261,7 +257,6 @@ static struct shash_alg sha512_avx2_algs[] = { {
.cra_name = "sha512", .cra_name = "sha512",
.cra_driver_name = "sha512-avx2", .cra_driver_name = "sha512-avx2",
.cra_priority = 170, .cra_priority = 170,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA512_BLOCK_SIZE, .cra_blocksize = SHA512_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -276,7 +271,6 @@ static struct shash_alg sha512_avx2_algs[] = { { ...@@ -276,7 +271,6 @@ static struct shash_alg sha512_avx2_algs[] = { {
.cra_name = "sha384", .cra_name = "sha384",
.cra_driver_name = "sha384-avx2", .cra_driver_name = "sha384-avx2",
.cra_priority = 170, .cra_priority = 170,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA384_BLOCK_SIZE, .cra_blocksize = SHA384_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -104,7 +104,6 @@ static struct shash_alg digest_null = { ...@@ -104,7 +104,6 @@ static struct shash_alg digest_null = {
.final = null_final, .final = null_final,
.base = { .base = {
.cra_name = "digest_null", .cra_name = "digest_null",
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = NULL_BLOCK_SIZE, .cra_blocksize = NULL_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -132,7 +132,6 @@ static struct shash_alg ghash_alg = { ...@@ -132,7 +132,6 @@ static struct shash_alg ghash_alg = {
.cra_name = "ghash", .cra_name = "ghash",
.cra_driver_name = "ghash-generic", .cra_driver_name = "ghash-generic",
.cra_priority = 100, .cra_priority = 100,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = GHASH_BLOCK_SIZE, .cra_blocksize = GHASH_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct ghash_ctx), .cra_ctxsize = sizeof(struct ghash_ctx),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
......
...@@ -217,7 +217,6 @@ static struct shash_alg alg = { ...@@ -217,7 +217,6 @@ static struct shash_alg alg = {
.descsize = sizeof(struct md4_ctx), .descsize = sizeof(struct md4_ctx),
.base = { .base = {
.cra_name = "md4", .cra_name = "md4",
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = MD4_HMAC_BLOCK_SIZE, .cra_blocksize = MD4_HMAC_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -229,7 +229,6 @@ static struct shash_alg alg = { ...@@ -229,7 +229,6 @@ static struct shash_alg alg = {
.statesize = sizeof(struct md5_state), .statesize = sizeof(struct md5_state),
.base = { .base = {
.cra_name = "md5", .cra_name = "md5",
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = MD5_HMAC_BLOCK_SIZE, .cra_blocksize = MD5_HMAC_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -279,7 +279,6 @@ static struct shash_alg poly1305_alg = { ...@@ -279,7 +279,6 @@ static struct shash_alg poly1305_alg = {
.cra_name = "poly1305", .cra_name = "poly1305",
.cra_driver_name = "poly1305-generic", .cra_driver_name = "poly1305-generic",
.cra_priority = 100, .cra_priority = 100,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = POLY1305_BLOCK_SIZE, .cra_blocksize = POLY1305_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
}, },
......
...@@ -303,7 +303,6 @@ static struct shash_alg alg = { ...@@ -303,7 +303,6 @@ static struct shash_alg alg = {
.descsize = sizeof(struct rmd128_ctx), .descsize = sizeof(struct rmd128_ctx),
.base = { .base = {
.cra_name = "rmd128", .cra_name = "rmd128",
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = RMD128_BLOCK_SIZE, .cra_blocksize = RMD128_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -347,7 +347,6 @@ static struct shash_alg alg = { ...@@ -347,7 +347,6 @@ static struct shash_alg alg = {
.descsize = sizeof(struct rmd160_ctx), .descsize = sizeof(struct rmd160_ctx),
.base = { .base = {
.cra_name = "rmd160", .cra_name = "rmd160",
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = RMD160_BLOCK_SIZE, .cra_blocksize = RMD160_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -322,7 +322,6 @@ static struct shash_alg alg = { ...@@ -322,7 +322,6 @@ static struct shash_alg alg = {
.descsize = sizeof(struct rmd256_ctx), .descsize = sizeof(struct rmd256_ctx),
.base = { .base = {
.cra_name = "rmd256", .cra_name = "rmd256",
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = RMD256_BLOCK_SIZE, .cra_blocksize = RMD256_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -371,7 +371,6 @@ static struct shash_alg alg = { ...@@ -371,7 +371,6 @@ static struct shash_alg alg = {
.descsize = sizeof(struct rmd320_ctx), .descsize = sizeof(struct rmd320_ctx),
.base = { .base = {
.cra_name = "rmd320", .cra_name = "rmd320",
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = RMD320_BLOCK_SIZE, .cra_blocksize = RMD320_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -77,7 +77,6 @@ static struct shash_alg alg = { ...@@ -77,7 +77,6 @@ static struct shash_alg alg = {
.cra_name = "sha1", .cra_name = "sha1",
.cra_driver_name= "sha1-generic", .cra_driver_name= "sha1-generic",
.cra_priority = 100, .cra_priority = 100,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA1_BLOCK_SIZE, .cra_blocksize = SHA1_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -272,7 +272,6 @@ static struct shash_alg sha256_algs[2] = { { ...@@ -272,7 +272,6 @@ static struct shash_alg sha256_algs[2] = { {
.cra_name = "sha256", .cra_name = "sha256",
.cra_driver_name= "sha256-generic", .cra_driver_name= "sha256-generic",
.cra_priority = 100, .cra_priority = 100,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA256_BLOCK_SIZE, .cra_blocksize = SHA256_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -287,7 +286,6 @@ static struct shash_alg sha256_algs[2] = { { ...@@ -287,7 +286,6 @@ static struct shash_alg sha256_algs[2] = { {
.cra_name = "sha224", .cra_name = "sha224",
.cra_driver_name= "sha224-generic", .cra_driver_name= "sha224-generic",
.cra_priority = 100, .cra_priority = 100,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA224_BLOCK_SIZE, .cra_blocksize = SHA224_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -250,7 +250,6 @@ static struct shash_alg algs[] = { { ...@@ -250,7 +250,6 @@ static struct shash_alg algs[] = { {
.descsize = sizeof(struct sha3_state), .descsize = sizeof(struct sha3_state),
.base.cra_name = "sha3-224", .base.cra_name = "sha3-224",
.base.cra_driver_name = "sha3-224-generic", .base.cra_driver_name = "sha3-224-generic",
.base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.base.cra_blocksize = SHA3_224_BLOCK_SIZE, .base.cra_blocksize = SHA3_224_BLOCK_SIZE,
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
}, { }, {
...@@ -261,7 +260,6 @@ static struct shash_alg algs[] = { { ...@@ -261,7 +260,6 @@ static struct shash_alg algs[] = { {
.descsize = sizeof(struct sha3_state), .descsize = sizeof(struct sha3_state),
.base.cra_name = "sha3-256", .base.cra_name = "sha3-256",
.base.cra_driver_name = "sha3-256-generic", .base.cra_driver_name = "sha3-256-generic",
.base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.base.cra_blocksize = SHA3_256_BLOCK_SIZE, .base.cra_blocksize = SHA3_256_BLOCK_SIZE,
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
}, { }, {
...@@ -272,7 +270,6 @@ static struct shash_alg algs[] = { { ...@@ -272,7 +270,6 @@ static struct shash_alg algs[] = { {
.descsize = sizeof(struct sha3_state), .descsize = sizeof(struct sha3_state),
.base.cra_name = "sha3-384", .base.cra_name = "sha3-384",
.base.cra_driver_name = "sha3-384-generic", .base.cra_driver_name = "sha3-384-generic",
.base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.base.cra_blocksize = SHA3_384_BLOCK_SIZE, .base.cra_blocksize = SHA3_384_BLOCK_SIZE,
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
}, { }, {
...@@ -283,7 +280,6 @@ static struct shash_alg algs[] = { { ...@@ -283,7 +280,6 @@ static struct shash_alg algs[] = { {
.descsize = sizeof(struct sha3_state), .descsize = sizeof(struct sha3_state),
.base.cra_name = "sha3-512", .base.cra_name = "sha3-512",
.base.cra_driver_name = "sha3-512-generic", .base.cra_driver_name = "sha3-512-generic",
.base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.base.cra_blocksize = SHA3_512_BLOCK_SIZE, .base.cra_blocksize = SHA3_512_BLOCK_SIZE,
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
} }; } };
......
...@@ -194,7 +194,6 @@ static struct shash_alg sha512_algs[2] = { { ...@@ -194,7 +194,6 @@ static struct shash_alg sha512_algs[2] = { {
.cra_name = "sha512", .cra_name = "sha512",
.cra_driver_name = "sha512-generic", .cra_driver_name = "sha512-generic",
.cra_priority = 100, .cra_priority = 100,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA512_BLOCK_SIZE, .cra_blocksize = SHA512_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -209,7 +208,6 @@ static struct shash_alg sha512_algs[2] = { { ...@@ -209,7 +208,6 @@ static struct shash_alg sha512_algs[2] = { {
.cra_name = "sha384", .cra_name = "sha384",
.cra_driver_name = "sha384-generic", .cra_driver_name = "sha384-generic",
.cra_priority = 100, .cra_priority = 100,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA384_BLOCK_SIZE, .cra_blocksize = SHA384_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -184,7 +184,6 @@ static struct shash_alg sm3_alg = { ...@@ -184,7 +184,6 @@ static struct shash_alg sm3_alg = {
.base = { .base = {
.cra_name = "sm3", .cra_name = "sm3",
.cra_driver_name = "sm3-generic", .cra_driver_name = "sm3-generic",
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SM3_BLOCK_SIZE, .cra_blocksize = SM3_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -636,7 +636,6 @@ static struct shash_alg tgr_algs[3] = { { ...@@ -636,7 +636,6 @@ static struct shash_alg tgr_algs[3] = { {
.descsize = sizeof(struct tgr192_ctx), .descsize = sizeof(struct tgr192_ctx),
.base = { .base = {
.cra_name = "tgr192", .cra_name = "tgr192",
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = TGR192_BLOCK_SIZE, .cra_blocksize = TGR192_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -648,7 +647,6 @@ static struct shash_alg tgr_algs[3] = { { ...@@ -648,7 +647,6 @@ static struct shash_alg tgr_algs[3] = { {
.descsize = sizeof(struct tgr192_ctx), .descsize = sizeof(struct tgr192_ctx),
.base = { .base = {
.cra_name = "tgr160", .cra_name = "tgr160",
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = TGR192_BLOCK_SIZE, .cra_blocksize = TGR192_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -660,7 +658,6 @@ static struct shash_alg tgr_algs[3] = { { ...@@ -660,7 +658,6 @@ static struct shash_alg tgr_algs[3] = { {
.descsize = sizeof(struct tgr192_ctx), .descsize = sizeof(struct tgr192_ctx),
.base = { .base = {
.cra_name = "tgr128", .cra_name = "tgr128",
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = TGR192_BLOCK_SIZE, .cra_blocksize = TGR192_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -1127,7 +1127,6 @@ static struct shash_alg wp_algs[3] = { { ...@@ -1127,7 +1127,6 @@ static struct shash_alg wp_algs[3] = { {
.descsize = sizeof(struct wp512_ctx), .descsize = sizeof(struct wp512_ctx),
.base = { .base = {
.cra_name = "wp512", .cra_name = "wp512",
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = WP512_BLOCK_SIZE, .cra_blocksize = WP512_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -1139,7 +1138,6 @@ static struct shash_alg wp_algs[3] = { { ...@@ -1139,7 +1138,6 @@ static struct shash_alg wp_algs[3] = { {
.descsize = sizeof(struct wp512_ctx), .descsize = sizeof(struct wp512_ctx),
.base = { .base = {
.cra_name = "wp384", .cra_name = "wp384",
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = WP512_BLOCK_SIZE, .cra_blocksize = WP512_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -1151,7 +1149,6 @@ static struct shash_alg wp_algs[3] = { { ...@@ -1151,7 +1149,6 @@ static struct shash_alg wp_algs[3] = { {
.descsize = sizeof(struct wp512_ctx), .descsize = sizeof(struct wp512_ctx),
.base = { .base = {
.cra_name = "wp256", .cra_name = "wp256",
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = WP512_BLOCK_SIZE, .cra_blocksize = WP512_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -386,7 +386,6 @@ struct shash_alg nx_shash_aes_xcbc_alg = { ...@@ -386,7 +386,6 @@ struct shash_alg nx_shash_aes_xcbc_alg = {
.cra_name = "xcbc(aes)", .cra_name = "xcbc(aes)",
.cra_driver_name = "xcbc-aes-nx", .cra_driver_name = "xcbc-aes-nx",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = AES_BLOCK_SIZE, .cra_blocksize = AES_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
.cra_ctxsize = sizeof(struct nx_crypto_ctx), .cra_ctxsize = sizeof(struct nx_crypto_ctx),
......
...@@ -288,7 +288,6 @@ struct shash_alg nx_shash_sha256_alg = { ...@@ -288,7 +288,6 @@ struct shash_alg nx_shash_sha256_alg = {
.cra_name = "sha256", .cra_name = "sha256",
.cra_driver_name = "sha256-nx", .cra_driver_name = "sha256-nx",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA256_BLOCK_SIZE, .cra_blocksize = SHA256_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
.cra_ctxsize = sizeof(struct nx_crypto_ctx), .cra_ctxsize = sizeof(struct nx_crypto_ctx),
......
...@@ -294,7 +294,6 @@ struct shash_alg nx_shash_sha512_alg = { ...@@ -294,7 +294,6 @@ struct shash_alg nx_shash_sha512_alg = {
.cra_name = "sha512", .cra_name = "sha512",
.cra_driver_name = "sha512-nx", .cra_driver_name = "sha512-nx",
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA512_BLOCK_SIZE, .cra_blocksize = SHA512_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
.cra_ctxsize = sizeof(struct nx_crypto_ctx), .cra_ctxsize = sizeof(struct nx_crypto_ctx),
......
...@@ -247,8 +247,7 @@ static struct shash_alg sha1_alg = { ...@@ -247,8 +247,7 @@ static struct shash_alg sha1_alg = {
.cra_name = "sha1", .cra_name = "sha1",
.cra_driver_name = "sha1-padlock", .cra_driver_name = "sha1-padlock",
.cra_priority = PADLOCK_CRA_PRIORITY, .cra_priority = PADLOCK_CRA_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_SHASH | .cra_flags = CRYPTO_ALG_NEED_FALLBACK,
CRYPTO_ALG_NEED_FALLBACK,
.cra_blocksize = SHA1_BLOCK_SIZE, .cra_blocksize = SHA1_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct padlock_sha_ctx), .cra_ctxsize = sizeof(struct padlock_sha_ctx),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
...@@ -271,8 +270,7 @@ static struct shash_alg sha256_alg = { ...@@ -271,8 +270,7 @@ static struct shash_alg sha256_alg = {
.cra_name = "sha256", .cra_name = "sha256",
.cra_driver_name = "sha256-padlock", .cra_driver_name = "sha256-padlock",
.cra_priority = PADLOCK_CRA_PRIORITY, .cra_priority = PADLOCK_CRA_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_SHASH | .cra_flags = CRYPTO_ALG_NEED_FALLBACK,
CRYPTO_ALG_NEED_FALLBACK,
.cra_blocksize = SHA256_BLOCK_SIZE, .cra_blocksize = SHA256_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct padlock_sha_ctx), .cra_ctxsize = sizeof(struct padlock_sha_ctx),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
...@@ -484,7 +482,6 @@ static struct shash_alg sha1_alg_nano = { ...@@ -484,7 +482,6 @@ static struct shash_alg sha1_alg_nano = {
.cra_name = "sha1", .cra_name = "sha1",
.cra_driver_name = "sha1-padlock-nano", .cra_driver_name = "sha1-padlock-nano",
.cra_priority = PADLOCK_CRA_PRIORITY, .cra_priority = PADLOCK_CRA_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA1_BLOCK_SIZE, .cra_blocksize = SHA1_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -503,7 +500,6 @@ static struct shash_alg sha256_alg_nano = { ...@@ -503,7 +500,6 @@ static struct shash_alg sha256_alg_nano = {
.cra_name = "sha256", .cra_name = "sha256",
.cra_driver_name = "sha256-padlock-nano", .cra_driver_name = "sha256-padlock-nano",
.cra_priority = PADLOCK_CRA_PRIORITY, .cra_priority = PADLOCK_CRA_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SHA256_BLOCK_SIZE, .cra_blocksize = SHA256_BLOCK_SIZE,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
...@@ -215,7 +215,7 @@ struct shash_alg p8_ghash_alg = { ...@@ -215,7 +215,7 @@ struct shash_alg p8_ghash_alg = {
.cra_name = "ghash", .cra_name = "ghash",
.cra_driver_name = "p8_ghash", .cra_driver_name = "p8_ghash",
.cra_priority = 1000, .cra_priority = 1000,
.cra_flags = CRYPTO_ALG_TYPE_SHASH | CRYPTO_ALG_NEED_FALLBACK, .cra_flags = CRYPTO_ALG_NEED_FALLBACK,
.cra_blocksize = GHASH_BLOCK_SIZE, .cra_blocksize = GHASH_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct p8_ghash_ctx), .cra_ctxsize = sizeof(struct p8_ghash_ctx),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
......
...@@ -137,7 +137,6 @@ static struct shash_alg alg256 = { ...@@ -137,7 +137,6 @@ static struct shash_alg alg256 = {
.base = { .base = {
.cra_name = "skein256", .cra_name = "skein256",
.cra_driver_name = "skein", .cra_driver_name = "skein",
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SKEIN_256_BLOCK_BYTES, .cra_blocksize = SKEIN_256_BLOCK_BYTES,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -155,7 +154,6 @@ static struct shash_alg alg512 = { ...@@ -155,7 +154,6 @@ static struct shash_alg alg512 = {
.base = { .base = {
.cra_name = "skein512", .cra_name = "skein512",
.cra_driver_name = "skein", .cra_driver_name = "skein",
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SKEIN_512_BLOCK_BYTES, .cra_blocksize = SKEIN_512_BLOCK_BYTES,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
...@@ -173,7 +171,6 @@ static struct shash_alg alg1024 = { ...@@ -173,7 +171,6 @@ static struct shash_alg alg1024 = {
.base = { .base = {
.cra_name = "skein1024", .cra_name = "skein1024",
.cra_driver_name = "skein", .cra_driver_name = "skein",
.cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = SKEIN_1024_BLOCK_BYTES, .cra_blocksize = SKEIN_1024_BLOCK_BYTES,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment