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: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/arch/arm/crypto/ghash-ce-glue.c b/arch/arm/crypto/ghash-ce-glue.c
index d9bb52cae2ac9246fab3626bc5d8438639e97fbc..f93c0761929d566aede4aa558dbeb2e3785357b7 100644 (file)
--- a/arch/arm/crypto/ghash-ce-glue.c
+++ b/arch/arm/crypto/ghash-ce-glue.c
@@ -152,7 +152,7 @@ static struct shash_alg ghash_alg = {
                .cra_name       = "__ghash",
                .cra_driver_name = "__driver-ghash-ce",
                .cra_priority   = 0,
-               .cra_flags      = CRYPTO_ALG_TYPE_SHASH | CRYPTO_ALG_INTERNAL,
+               .cra_flags      = CRYPTO_ALG_INTERNAL,
                .cra_blocksize  = GHASH_BLOCK_SIZE,
                .cra_ctxsize    = sizeof(struct ghash_key),
                .cra_module     = THIS_MODULE,

diff --git a/arch/arm/crypto/sha1-ce-glue.c b/arch/arm/crypto/sha1-ce-glue.c
index 555f72b5e659bb5d6cff2de9e9215b551f8680d7..b732522e20f8002dc45b570873e574871a2240a3 100644 (file)
--- a/arch/arm/crypto/sha1-ce-glue.c
+++ b/arch/arm/crypto/sha1-ce-glue.c
@@ -75,7 +75,6 @@ static struct shash_alg alg = {
                .cra_name               = "sha1",
                .cra_driver_name        = "sha1-ce",
                .cra_priority           = 200,
-               .cra_flags              = CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          = SHA1_BLOCK_SIZE,
                .cra_module             = THIS_MODULE,
        }

diff --git a/arch/arm/crypto/sha1_glue.c b/arch/arm/crypto/sha1_glue.c
index 6fc73bf8766dbbf49a0ecf10d541efbe8ee31ba6..98ab8239f919d6df6c9847cd68cf6a820c771794 100644 (file)
--- a/arch/arm/crypto/sha1_glue.c
+++ b/arch/arm/crypto/sha1_glue.c
@@ -67,7 +67,6 @@ static struct shash_alg alg = {
                .cra_name       =       "sha1",
                .cra_driver_name=       "sha1-asm",
                .cra_priority   =       150,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA1_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/arch/arm/crypto/sha1_neon_glue.c b/arch/arm/crypto/sha1_neon_glue.c
index 4e22f122f96661e362b2c9e5703d25469e063ce7..d15e0ea2c95e1b1e602bda59092b5ec40c44ebc1 100644 (file)
--- a/arch/arm/crypto/sha1_neon_glue.c
+++ b/arch/arm/crypto/sha1_neon_glue.c
@@ -83,7 +83,6 @@ static struct shash_alg alg = {
                .cra_name               = "sha1",
                .cra_driver_name        = "sha1-neon",
                .cra_priority           = 250,
-               .cra_flags              = CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          = SHA1_BLOCK_SIZE,
                .cra_module             = THIS_MODULE,
        }

diff --git a/arch/arm/crypto/sha2-ce-glue.c b/arch/arm/crypto/sha2-ce-glue.c
index df4dcef054aea4e237a1713f5523f88b3ea0de09..1211a5c129fce00c465dd6b22b370f5f5492d86b 100644 (file)
--- a/arch/arm/crypto/sha2-ce-glue.c
+++ b/arch/arm/crypto/sha2-ce-glue.c
@@ -78,7 +78,6 @@ static struct shash_alg algs[] = { {
                .cra_name               = "sha224",
                .cra_driver_name        = "sha224-ce",
                .cra_priority           = 300,
-               .cra_flags              = CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          = SHA256_BLOCK_SIZE,
                .cra_module             = THIS_MODULE,
        }
@@ -93,7 +92,6 @@ static struct shash_alg algs[] = { {
                .cra_name               = "sha256",
                .cra_driver_name        = "sha256-ce",
                .cra_priority           = 300,
-               .cra_flags              = CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          = SHA256_BLOCK_SIZE,
                .cra_module             = THIS_MODULE,
        }

diff --git a/arch/arm/crypto/sha256_glue.c b/arch/arm/crypto/sha256_glue.c
index a84e869ef900e21a7330d146188efa41a02fa301..bf8ccff2c9d06ef6bcdf5fb23abfeb84660c3ca4 100644 (file)
--- a/arch/arm/crypto/sha256_glue.c
+++ b/arch/arm/crypto/sha256_glue.c
@@ -71,7 +71,6 @@ static struct shash_alg algs[] = { {
                .cra_name       =       "sha256",
                .cra_driver_name =      "sha256-asm",
                .cra_priority   =       150,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA256_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -86,7 +85,6 @@ static struct shash_alg algs[] = { {
                .cra_name       =       "sha224",
                .cra_driver_name =      "sha224-asm",
                .cra_priority   =       150,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA224_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/arch/arm/crypto/sha256_neon_glue.c b/arch/arm/crypto/sha256_neon_glue.c
index 39ccd658817e28009f317d0544d89ea0f043bae8..9bbee56fbdc841e72b250b6a319898e4da1ddc93 100644 (file)
--- a/arch/arm/crypto/sha256_neon_glue.c
+++ b/arch/arm/crypto/sha256_neon_glue.c
@@ -79,7 +79,6 @@ struct shash_alg sha256_neon_algs[] = { {
                .cra_name       =       "sha256",
                .cra_driver_name =      "sha256-neon",
                .cra_priority   =       250,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA256_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -94,7 +93,6 @@ struct shash_alg sha256_neon_algs[] = { {
                .cra_name       =       "sha224",
                .cra_driver_name =      "sha224-neon",
                .cra_priority   =       250,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA224_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/arch/arm/crypto/sha512-glue.c b/arch/arm/crypto/sha512-glue.c
index 269a394e4a5383ce796ba2193c6236fc80967689..86540cd4a6faa69989f424c7168f4d4aa53fd1e2 100644 (file)
--- a/arch/arm/crypto/sha512-glue.c
+++ b/arch/arm/crypto/sha512-glue.c
@@ -63,7 +63,6 @@ static struct shash_alg sha512_arm_algs[] = { {
                .cra_name               = "sha384",
                .cra_driver_name        = "sha384-arm",
                .cra_priority           = 250,
-               .cra_flags              = CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          = SHA512_BLOCK_SIZE,
                .cra_module             = THIS_MODULE,
        }
@@ -78,7 +77,6 @@ static struct shash_alg sha512_arm_algs[] = { {
                .cra_name               = "sha512",
                .cra_driver_name        = "sha512-arm",
                .cra_priority           = 250,
-               .cra_flags              = CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          = SHA512_BLOCK_SIZE,
                .cra_module             = THIS_MODULE,
        }

diff --git a/arch/arm/crypto/sha512-neon-glue.c b/arch/arm/crypto/sha512-neon-glue.c
index 32693684a3ab6878911d9f947e3d7037da3ac714..8a5642b41fd617f535bb5cdaf459a91343f7f931 100644 (file)
--- a/arch/arm/crypto/sha512-neon-glue.c
+++ b/arch/arm/crypto/sha512-neon-glue.c
@@ -75,7 +75,6 @@ struct shash_alg sha512_neon_algs[] = { {
                .cra_name               = "sha384",
                .cra_driver_name        = "sha384-neon",
                .cra_priority           = 300,
-               .cra_flags              = CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          = SHA384_BLOCK_SIZE,
                .cra_module             = THIS_MODULE,
 
@@ -91,7 +90,6 @@ struct shash_alg sha512_neon_algs[] = { {
                .cra_name               = "sha512",
                .cra_driver_name        = "sha512-neon",
                .cra_priority           = 300,
-               .cra_flags              = CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          = SHA512_BLOCK_SIZE,
                .cra_module             = THIS_MODULE,
        }

diff --git a/arch/arm64/crypto/aes-glue.c b/arch/arm64/crypto/aes-glue.c
index 253188fb8cb0cea0e35d0f4ed77b5e2c6332d507..a615a9a991a3e61167f41663c8ba548092691917 100644 (file)
--- a/arch/arm64/crypto/aes-glue.c
+++ b/arch/arm64/crypto/aes-glue.c
@@ -567,7 +567,6 @@ static struct shash_alg mac_algs[] = { {
        .base.cra_name          = "cmac(aes)",
        .base.cra_driver_name   = "cmac-aes-" MODE,
        .base.cra_priority      = PRIO,
-       .base.cra_flags         = CRYPTO_ALG_TYPE_SHASH,
        .base.cra_blocksize     = AES_BLOCK_SIZE,
        .base.cra_ctxsize       = sizeof(struct mac_tfm_ctx) +
                                  2 * AES_BLOCK_SIZE,
@@ -583,7 +582,6 @@ static struct shash_alg mac_algs[] = { {
        .base.cra_name          = "xcbc(aes)",
        .base.cra_driver_name   = "xcbc-aes-" MODE,
        .base.cra_priority      = PRIO,
-       .base.cra_flags         = CRYPTO_ALG_TYPE_SHASH,
        .base.cra_blocksize     = AES_BLOCK_SIZE,
        .base.cra_ctxsize       = sizeof(struct mac_tfm_ctx) +
                                  2 * AES_BLOCK_SIZE,
@@ -599,7 +597,6 @@ static struct shash_alg mac_algs[] = { {
        .base.cra_name          = "cbcmac(aes)",
        .base.cra_driver_name   = "cbcmac-aes-" MODE,
        .base.cra_priority      = PRIO,
-       .base.cra_flags         = CRYPTO_ALG_TYPE_SHASH,
        .base.cra_blocksize     = 1,
        .base.cra_ctxsize       = sizeof(struct mac_tfm_ctx),
        .base.cra_module        = THIS_MODULE,

diff --git a/arch/arm64/crypto/ghash-ce-glue.c b/arch/arm64/crypto/ghash-ce-glue.c
index 7cf0b1aa6ea80bf6f87d45b85a349fb7a9e677e5..757fae1867537d3e557dc9fd663b9306d7de2ef5 100644 (file)
--- a/arch/arm64/crypto/ghash-ce-glue.c
+++ b/arch/arm64/crypto/ghash-ce-glue.c
@@ -204,7 +204,6 @@ static struct shash_alg ghash_alg = {
        .base.cra_name          = "ghash",
        .base.cra_driver_name   = "ghash-ce",
        .base.cra_priority      = 200,
-       .base.cra_flags         = CRYPTO_ALG_TYPE_SHASH,
        .base.cra_blocksize     = GHASH_BLOCK_SIZE,
        .base.cra_ctxsize       = sizeof(struct ghash_key),
        .base.cra_module        = THIS_MODULE,

diff --git a/arch/arm64/crypto/sha1-ce-glue.c b/arch/arm64/crypto/sha1-ce-glue.c
index efbeb3e0dcfb048099095a971512d8a9a1f62595..17fac2889f56ea99dbcca0c87e8c6c6b45934235 100644 (file)
--- a/arch/arm64/crypto/sha1-ce-glue.c
+++ b/arch/arm64/crypto/sha1-ce-glue.c
@@ -99,7 +99,6 @@ static struct shash_alg alg = {
                .cra_name               = "sha1",
                .cra_driver_name        = "sha1-ce",
                .cra_priority           = 200,
-               .cra_flags              = CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          = SHA1_BLOCK_SIZE,
                .cra_module             = THIS_MODULE,
        }

diff --git a/arch/arm64/crypto/sha2-ce-glue.c b/arch/arm64/crypto/sha2-ce-glue.c
index fd1ff2b13dfa35aa356b2511744808a848a56a97..261f5195cab74b2952ee2158daf08ab968939701 100644 (file)
--- a/arch/arm64/crypto/sha2-ce-glue.c
+++ b/arch/arm64/crypto/sha2-ce-glue.c
@@ -114,7 +114,6 @@ static struct shash_alg algs[] = { {
                .cra_name               = "sha224",
                .cra_driver_name        = "sha224-ce",
                .cra_priority           = 200,
-               .cra_flags              = CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          = SHA256_BLOCK_SIZE,
                .cra_module             = THIS_MODULE,
        }
@@ -129,7 +128,6 @@ static struct shash_alg algs[] = { {
                .cra_name               = "sha256",
                .cra_driver_name        = "sha256-ce",
                .cra_priority           = 200,
-               .cra_flags              = CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          = SHA256_BLOCK_SIZE,
                .cra_module             = THIS_MODULE,
        }

diff --git a/arch/arm64/crypto/sha256-glue.c b/arch/arm64/crypto/sha256-glue.c
index e8880ccdc71f6a28f7aca4e500f6a70e6779edf0..f1b4f4420ca11dbdf519356196c0877a2e9e0732 100644 (file)
--- a/arch/arm64/crypto/sha256-glue.c
+++ b/arch/arm64/crypto/sha256-glue.c
@@ -68,7 +68,6 @@ static struct shash_alg algs[] = { {
        .base.cra_name          = "sha256",
        .base.cra_driver_name   = "sha256-arm64",
        .base.cra_priority      = 100,
-       .base.cra_flags         = CRYPTO_ALG_TYPE_SHASH,
        .base.cra_blocksize     = SHA256_BLOCK_SIZE,
        .base.cra_module        = THIS_MODULE,
 }, {
@@ -81,7 +80,6 @@ static struct shash_alg algs[] = { {
        .base.cra_name          = "sha224",
        .base.cra_driver_name   = "sha224-arm64",
        .base.cra_priority      = 100,
-       .base.cra_flags         = CRYPTO_ALG_TYPE_SHASH,
        .base.cra_blocksize     = SHA224_BLOCK_SIZE,
        .base.cra_module        = THIS_MODULE,
 } };
@@ -153,7 +151,6 @@ static struct shash_alg neon_algs[] = { {
        .base.cra_name          = "sha256",
        .base.cra_driver_name   = "sha256-arm64-neon",
        .base.cra_priority      = 150,
-       .base.cra_flags         = CRYPTO_ALG_TYPE_SHASH,
        .base.cra_blocksize     = SHA256_BLOCK_SIZE,
        .base.cra_module        = THIS_MODULE,
 }, {
@@ -166,7 +163,6 @@ static struct shash_alg neon_algs[] = { {
        .base.cra_name          = "sha224",
        .base.cra_driver_name   = "sha224-arm64-neon",
        .base.cra_priority      = 150,
-       .base.cra_flags         = CRYPTO_ALG_TYPE_SHASH,
        .base.cra_blocksize     = SHA224_BLOCK_SIZE,
        .base.cra_module        = THIS_MODULE,
 } };

diff --git a/arch/arm64/crypto/sha3-ce-glue.c b/arch/arm64/crypto/sha3-ce-glue.c
index da8222e528bd8df1040ecccfe894baa545c1e884..a336feac0f59abefc5fd493a6ae85f24e0f32a27 100644 (file)
--- a/arch/arm64/crypto/sha3-ce-glue.c
+++ b/arch/arm64/crypto/sha3-ce-glue.c
@@ -105,7 +105,6 @@ static struct shash_alg algs[] = { {
        .descsize               = sizeof(struct sha3_state),
        .base.cra_name          = "sha3-224",
        .base.cra_driver_name   = "sha3-224-ce",
-       .base.cra_flags         = CRYPTO_ALG_TYPE_SHASH,
        .base.cra_blocksize     = SHA3_224_BLOCK_SIZE,
        .base.cra_module        = THIS_MODULE,
        .base.cra_priority      = 200,
@@ -117,7 +116,6 @@ static struct shash_alg algs[] = { {
        .descsize               = sizeof(struct sha3_state),
        .base.cra_name          = "sha3-256",
        .base.cra_driver_name   = "sha3-256-ce",
-       .base.cra_flags         = CRYPTO_ALG_TYPE_SHASH,
        .base.cra_blocksize     = SHA3_256_BLOCK_SIZE,
        .base.cra_module        = THIS_MODULE,
        .base.cra_priority      = 200,
@@ -129,7 +127,6 @@ static struct shash_alg algs[] = { {
        .descsize               = sizeof(struct sha3_state),
        .base.cra_name          = "sha3-384",
        .base.cra_driver_name   = "sha3-384-ce",
-       .base.cra_flags         = CRYPTO_ALG_TYPE_SHASH,
        .base.cra_blocksize     = SHA3_384_BLOCK_SIZE,
        .base.cra_module        = THIS_MODULE,
        .base.cra_priority      = 200,
@@ -141,7 +138,6 @@ static struct shash_alg algs[] = { {
        .descsize               = sizeof(struct sha3_state),
        .base.cra_name          = "sha3-512",
        .base.cra_driver_name   = "sha3-512-ce",
-       .base.cra_flags         = CRYPTO_ALG_TYPE_SHASH,
        .base.cra_blocksize     = SHA3_512_BLOCK_SIZE,
        .base.cra_module        = THIS_MODULE,
        .base.cra_priority      = 200,

diff --git a/arch/arm64/crypto/sha512-ce-glue.c b/arch/arm64/crypto/sha512-ce-glue.c
index a77c8632a589dce065377a61a624edd7f6337751..f2c5f28c622ac9707806eb634d61a6dc4efde235 100644 (file)
--- a/arch/arm64/crypto/sha512-ce-glue.c
+++ b/arch/arm64/crypto/sha512-ce-glue.c
@@ -87,7 +87,6 @@ static struct shash_alg algs[] = { {
        .base.cra_name          = "sha384",
        .base.cra_driver_name   = "sha384-ce",
        .base.cra_priority      = 200,
-       .base.cra_flags         = CRYPTO_ALG_TYPE_SHASH,
        .base.cra_blocksize     = SHA512_BLOCK_SIZE,
        .base.cra_module        = THIS_MODULE,
 }, {
@@ -100,7 +99,6 @@ static struct shash_alg algs[] = { {
        .base.cra_name          = "sha512",
        .base.cra_driver_name   = "sha512-ce",
        .base.cra_priority      = 200,
-       .base.cra_flags         = CRYPTO_ALG_TYPE_SHASH,
        .base.cra_blocksize     = SHA512_BLOCK_SIZE,
        .base.cra_module        = THIS_MODULE,
 } };

diff --git a/arch/arm64/crypto/sha512-glue.c b/arch/arm64/crypto/sha512-glue.c
index 27db4851e3806da8d339b232c301cc640540664c..325b23b43a9bb7e4401584e411e912cd5a63c057 100644 (file)
--- a/arch/arm64/crypto/sha512-glue.c
+++ b/arch/arm64/crypto/sha512-glue.c
@@ -63,7 +63,6 @@ static struct shash_alg algs[] = { {
        .base.cra_name          = "sha512",
        .base.cra_driver_name   = "sha512-arm64",
        .base.cra_priority      = 150,
-       .base.cra_flags         = CRYPTO_ALG_TYPE_SHASH,
        .base.cra_blocksize     = SHA512_BLOCK_SIZE,
        .base.cra_module        = THIS_MODULE,
 }, {
@@ -76,7 +75,6 @@ static struct shash_alg algs[] = { {
        .base.cra_name          = "sha384",
        .base.cra_driver_name   = "sha384-arm64",
        .base.cra_priority      = 150,
-       .base.cra_flags         = CRYPTO_ALG_TYPE_SHASH,
        .base.cra_blocksize     = SHA384_BLOCK_SIZE,
        .base.cra_module        = THIS_MODULE,
 } };

diff --git a/arch/arm64/crypto/sm3-ce-glue.c b/arch/arm64/crypto/sm3-ce-glue.c
index 3b4948f7e26faf1a6c69dba9f51e76d66313d965..88938a20d9b227a15c85f4aee3c3bd44087fc560 100644 (file)
--- a/arch/arm64/crypto/sm3-ce-glue.c
+++ b/arch/arm64/crypto/sm3-ce-glue.c
@@ -72,7 +72,6 @@ static struct shash_alg sm3_alg = {
        .descsize               = sizeof(struct sm3_state),
        .base.cra_name          = "sm3",
        .base.cra_driver_name   = "sm3-ce",
-       .base.cra_flags         = CRYPTO_ALG_TYPE_SHASH,
        .base.cra_blocksize     = SM3_BLOCK_SIZE,
        .base.cra_module        = THIS_MODULE,
        .base.cra_priority      = 200,

diff --git a/arch/mips/cavium-octeon/crypto/octeon-md5.c b/arch/mips/cavium-octeon/crypto/octeon-md5.c
index af4c712f7afc435c3f2ff7b2092ebc0a6977b955..d1ed066e1a17790970a641fb542b26c831e02667 100644 (file)
--- a/arch/mips/cavium-octeon/crypto/octeon-md5.c
+++ b/arch/mips/cavium-octeon/crypto/octeon-md5.c
@@ -182,7 +182,6 @@ static struct shash_alg alg = {
                .cra_name       =       "md5",
                .cra_driver_name=       "octeon-md5",
                .cra_priority   =       OCTEON_CR_OPCODE_PRIORITY,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       MD5_HMAC_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/arch/mips/cavium-octeon/crypto/octeon-sha1.c b/arch/mips/cavium-octeon/crypto/octeon-sha1.c
index 2b74b5b67caeb1647dd929b66c0354c74b9e6f8e..80d71e7759364fabeea5e2ac6a8a935c9cab3500 100644 (file)
--- a/arch/mips/cavium-octeon/crypto/octeon-sha1.c
+++ b/arch/mips/cavium-octeon/crypto/octeon-sha1.c
@@ -215,7 +215,6 @@ static struct shash_alg octeon_sha1_alg = {
                .cra_name       =       "sha1",
                .cra_driver_name=       "octeon-sha1",
                .cra_priority   =       OCTEON_CR_OPCODE_PRIORITY,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA1_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/arch/mips/cavium-octeon/crypto/octeon-sha256.c b/arch/mips/cavium-octeon/crypto/octeon-sha256.c
index 97e96fead08a2b1a2af2aaa2754fbc0e4d9cd94c..8b931e640926e97299529cd7f57c1d9c23e0237d 100644 (file)
--- a/arch/mips/cavium-octeon/crypto/octeon-sha256.c
+++ b/arch/mips/cavium-octeon/crypto/octeon-sha256.c
@@ -239,7 +239,6 @@ static struct shash_alg octeon_sha256_algs[2] = { {
                .cra_name       =       "sha256",
                .cra_driver_name=       "octeon-sha256",
                .cra_priority   =       OCTEON_CR_OPCODE_PRIORITY,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA256_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -252,7 +251,6 @@ static struct shash_alg octeon_sha256_algs[2] = { {
        .base           =       {
                .cra_name       =       "sha224",
                .cra_driver_name=       "octeon-sha224",
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA224_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/arch/mips/cavium-octeon/crypto/octeon-sha512.c b/arch/mips/cavium-octeon/crypto/octeon-sha512.c
index d5fb3c6f22ae7e3eb8db26246a918b37c06c58e4..6c956149625770e9a6b480d22f2c89fdcf2f1ef0 100644 (file)
--- a/arch/mips/cavium-octeon/crypto/octeon-sha512.c
+++ b/arch/mips/cavium-octeon/crypto/octeon-sha512.c
@@ -235,7 +235,6 @@ static struct shash_alg octeon_sha512_algs[2] = { {
                .cra_name       =       "sha512",
                .cra_driver_name=       "octeon-sha512",
                .cra_priority   =       OCTEON_CR_OPCODE_PRIORITY,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA512_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -249,7 +248,6 @@ static struct shash_alg octeon_sha512_algs[2] = { {
                .cra_name       =       "sha384",
                .cra_driver_name=       "octeon-sha384",
                .cra_priority   =       OCTEON_CR_OPCODE_PRIORITY,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA384_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/arch/powerpc/crypto/md5-glue.c b/arch/powerpc/crypto/md5-glue.c
index 92289679b4c47112d29b3753de84bc7cd1cb52b4..7e44cec37bdbece8cbf1068cb53b6fecdfc2daca 100644 (file)
--- a/arch/powerpc/crypto/md5-glue.c
+++ b/arch/powerpc/crypto/md5-glue.c
@@ -139,7 +139,6 @@ static struct shash_alg alg = {
                .cra_name       =       "md5",
                .cra_driver_name=       "md5-ppc",
                .cra_priority   =       200,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       MD5_HMAC_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/arch/powerpc/crypto/sha1-spe-glue.c b/arch/powerpc/crypto/sha1-spe-glue.c
index f9ebc38d3fe79376956c83bf4bda9af3f11dd792..9e1814d993189e896d820fdf70f3290fb3af91d7 100644 (file)
--- a/arch/powerpc/crypto/sha1-spe-glue.c
+++ b/arch/powerpc/crypto/sha1-spe-glue.c
@@ -185,7 +185,6 @@ static struct shash_alg alg = {
                .cra_name       =       "sha1",
                .cra_driver_name=       "sha1-ppc-spe",
                .cra_priority   =       300,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA1_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/arch/powerpc/crypto/sha1.c b/arch/powerpc/crypto/sha1.c
index c154cebc1041c4ac24d72c5e51b93bfec2f0d9ee..3911d5c254fa6422a5792dc3fc99e3b0fb458f10 100644 (file)
--- a/arch/powerpc/crypto/sha1.c
+++ b/arch/powerpc/crypto/sha1.c
@@ -132,7 +132,6 @@ static struct shash_alg alg = {
        .base           =       {
                .cra_name       =       "sha1",
                .cra_driver_name=       "sha1-powerpc",
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA1_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/arch/powerpc/crypto/sha256-spe-glue.c b/arch/powerpc/crypto/sha256-spe-glue.c
index 718a079dcdbfb3b92919c58b1e084a4769f0f4db..6227888dcf7e888d63c19d3056cff64570a1c1a9 100644 (file)
--- a/arch/powerpc/crypto/sha256-spe-glue.c
+++ b/arch/powerpc/crypto/sha256-spe-glue.c
@@ -231,7 +231,6 @@ static struct shash_alg algs[2] = { {
                .cra_name       =       "sha256",
                .cra_driver_name=       "sha256-ppc-spe",
                .cra_priority   =       300,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA256_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -248,7 +247,6 @@ static struct shash_alg algs[2] = { {
                .cra_name       =       "sha224",
                .cra_driver_name=       "sha224-ppc-spe",
                .cra_priority   =       300,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA224_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/arch/s390/crypto/ghash_s390.c b/arch/s390/crypto/ghash_s390.c
index 3b7f96c9eead8f994e979603216fd0d190fc9e42..86aed30fad3a4e98352b52ae2a1a7eee4da58c77 100644 (file)
--- a/arch/s390/crypto/ghash_s390.c
+++ b/arch/s390/crypto/ghash_s390.c
@@ -128,7 +128,6 @@ static struct shash_alg ghash_alg = {
                .cra_name               = "ghash",
                .cra_driver_name        = "ghash-s390",
                .cra_priority           = 300,
-               .cra_flags              = CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          = GHASH_BLOCK_SIZE,
                .cra_ctxsize            = sizeof(struct ghash_ctx),
                .cra_module             = THIS_MODULE,

diff --git a/arch/s390/crypto/sha1_s390.c b/arch/s390/crypto/sha1_s390.c
index a00c17f761c190269058d2052cc1cf40758bb0c8..009572e8276da7918fd61369a88fff404c067ac4 100644 (file)
--- a/arch/s390/crypto/sha1_s390.c
+++ b/arch/s390/crypto/sha1_s390.c
@@ -78,7 +78,6 @@ static struct shash_alg alg = {
                .cra_name       =       "sha1",
                .cra_driver_name=       "sha1-s390",
                .cra_priority   =       300,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA1_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/arch/s390/crypto/sha256_s390.c b/arch/s390/crypto/sha256_s390.c
index 944aa6b237cd828fa17356b2eb961be87b57bbab..62833a1d87240836499c416c2a763b73f30cc872 100644 (file)
--- a/arch/s390/crypto/sha256_s390.c
+++ b/arch/s390/crypto/sha256_s390.c
@@ -71,7 +71,6 @@ static struct shash_alg sha256_alg = {
                .cra_name       =       "sha256",
                .cra_driver_name=       "sha256-s390",
                .cra_priority   =       300,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA256_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -108,7 +107,6 @@ static struct shash_alg sha224_alg = {
                .cra_name       =       "sha224",
                .cra_driver_name=       "sha224-s390",
                .cra_priority   =       300,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA224_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/arch/s390/crypto/sha512_s390.c b/arch/s390/crypto/sha512_s390.c
index b17eded532b121a76ddab6a8e9227a92fcbbfef6..be589c340d159ee05964f802b1163e2ec449d5a9 100644 (file)
--- a/arch/s390/crypto/sha512_s390.c
+++ b/arch/s390/crypto/sha512_s390.c
@@ -76,7 +76,6 @@ static struct shash_alg sha512_alg = {
                .cra_name       =       "sha512",
                .cra_driver_name=       "sha512-s390",
                .cra_priority   =       300,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA512_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -115,7 +114,6 @@ static struct shash_alg sha384_alg = {
                .cra_name       =       "sha384",
                .cra_driver_name=       "sha384-s390",
                .cra_priority   =       300,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA384_BLOCK_SIZE,
                .cra_ctxsize    =       sizeof(struct s390_sha_ctx),
                .cra_module     =       THIS_MODULE,

diff --git a/arch/sparc/crypto/md5_glue.c b/arch/sparc/crypto/md5_glue.c
index c9d2b922734beefc7522b454fb30427ea5f789d7..bc9cc26efa3d5fe60a6851adb971165b8a89fb7d 100644 (file)
--- a/arch/sparc/crypto/md5_glue.c
+++ b/arch/sparc/crypto/md5_glue.c
@@ -144,7 +144,6 @@ static struct shash_alg alg = {
                .cra_name       =       "md5",
                .cra_driver_name=       "md5-sparc64",
                .cra_priority   =       SPARC_CR_OPCODE_PRIORITY,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       MD5_HMAC_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/arch/sparc/crypto/sha1_glue.c b/arch/sparc/crypto/sha1_glue.c
index 1b3e47accc7466a90fb5729321df4e48273d7f31..4d6d7faf728e25195ea4d452bb22079ebde53239 100644 (file)
--- a/arch/sparc/crypto/sha1_glue.c
+++ b/arch/sparc/crypto/sha1_glue.c
@@ -139,7 +139,6 @@ static struct shash_alg alg = {
                .cra_name       =       "sha1",
                .cra_driver_name=       "sha1-sparc64",
                .cra_priority   =       SPARC_CR_OPCODE_PRIORITY,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA1_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/arch/sparc/crypto/sha256_glue.c b/arch/sparc/crypto/sha256_glue.c
index 285268ca927937434877eeb39a1c1fcc307b0682..54c4de2db188ee7799730226faaf94d6e5d96eca 100644 (file)
--- a/arch/sparc/crypto/sha256_glue.c
+++ b/arch/sparc/crypto/sha256_glue.c
@@ -169,7 +169,6 @@ static struct shash_alg sha256 = {
                .cra_name       =       "sha256",
                .cra_driver_name=       "sha256-sparc64",
                .cra_priority   =       SPARC_CR_OPCODE_PRIORITY,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA256_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -185,7 +184,6 @@ static struct shash_alg sha224 = {
                .cra_name       =       "sha224",
                .cra_driver_name=       "sha224-sparc64",
                .cra_priority   =       SPARC_CR_OPCODE_PRIORITY,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA224_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/arch/sparc/crypto/sha512_glue.c b/arch/sparc/crypto/sha512_glue.c
index 11eb36c3fc8c4a8ee6559914895474b44fd6ca89..4c55e97a4408d3d2bd5abc4b6be58bf242520ec9 100644 (file)
--- a/arch/sparc/crypto/sha512_glue.c
+++ b/arch/sparc/crypto/sha512_glue.c
@@ -154,7 +154,6 @@ static struct shash_alg sha512 = {
                .cra_name       =       "sha512",
                .cra_driver_name=       "sha512-sparc64",
                .cra_priority   =       SPARC_CR_OPCODE_PRIORITY,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA512_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -170,7 +169,6 @@ static struct shash_alg sha384 = {
                .cra_name       =       "sha384",
                .cra_driver_name=       "sha384-sparc64",
                .cra_priority   =       SPARC_CR_OPCODE_PRIORITY,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA384_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/arch/x86/crypto/ghash-clmulni-intel_glue.c b/arch/x86/crypto/ghash-clmulni-intel_glue.c
index 2ddbe3a1868b4f6ef02949e26b60dd4710eea414..b1430e92e6382df165f47aa0749c094f20d643be 100644 (file)
--- a/arch/x86/crypto/ghash-clmulni-intel_glue.c
+++ b/arch/x86/crypto/ghash-clmulni-intel_glue.c
@@ -154,8 +154,7 @@ static struct shash_alg ghash_alg = {
                .cra_name               = "__ghash",
                .cra_driver_name        = "__ghash-pclmulqdqni",
                .cra_priority           = 0,
-               .cra_flags              = CRYPTO_ALG_TYPE_SHASH |
-                                         CRYPTO_ALG_INTERNAL,
+               .cra_flags              = CRYPTO_ALG_INTERNAL,
                .cra_blocksize          = GHASH_BLOCK_SIZE,
                .cra_ctxsize            = sizeof(struct ghash_ctx),
                .cra_module             = THIS_MODULE,

diff --git a/arch/x86/crypto/poly1305_glue.c b/arch/x86/crypto/poly1305_glue.c
index 790377797544b414f5ba86b22a227e51d5f4cd3a..f012b7e28ad1d9d0914699462586b136b0411a16 100644 (file)
--- a/arch/x86/crypto/poly1305_glue.c
+++ b/arch/x86/crypto/poly1305_glue.c
@@ -169,7 +169,6 @@ static struct shash_alg alg = {
                .cra_name               = "poly1305",
                .cra_driver_name        = "poly1305-simd",
                .cra_priority           = 300,
-               .cra_flags              = CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          = POLY1305_BLOCK_SIZE,
                .cra_module             = THIS_MODULE,
        },

diff --git a/arch/x86/crypto/sha1_ssse3_glue.c b/arch/x86/crypto/sha1_ssse3_glue.c
index fc61739150e7c2c5a484c020b14441551fe5403a..7391c7de72c7cabdbab895726de8ec4db7e2f7e9 100644 (file)
--- a/arch/x86/crypto/sha1_ssse3_glue.c
+++ b/arch/x86/crypto/sha1_ssse3_glue.c
@@ -104,7 +104,6 @@ static struct shash_alg sha1_ssse3_alg = {
                .cra_name       =       "sha1",
                .cra_driver_name =      "sha1-ssse3",
                .cra_priority   =       150,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA1_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -157,7 +156,6 @@ static struct shash_alg sha1_avx_alg = {
                .cra_name       =       "sha1",
                .cra_driver_name =      "sha1-avx",
                .cra_priority   =       160,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA1_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -249,7 +247,6 @@ static struct shash_alg sha1_avx2_alg = {
                .cra_name       =       "sha1",
                .cra_driver_name =      "sha1-avx2",
                .cra_priority   =       170,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA1_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -307,7 +304,6 @@ static struct shash_alg sha1_ni_alg = {
                .cra_name       =       "sha1",
                .cra_driver_name =      "sha1-ni",
                .cra_priority   =       250,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA1_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/arch/x86/crypto/sha256_ssse3_glue.c b/arch/x86/crypto/sha256_ssse3_glue.c
index 9e79baf03a4b206ced0e5e2b0a1f055cd0ca73c6..773a873d2b28a31cdcaa3b1d085cb8ddf94664d6 100644 (file)
--- a/arch/x86/crypto/sha256_ssse3_glue.c
+++ b/arch/x86/crypto/sha256_ssse3_glue.c
@@ -109,7 +109,6 @@ static struct shash_alg sha256_ssse3_algs[] = { {
                .cra_name       =       "sha256",
                .cra_driver_name =      "sha256-ssse3",
                .cra_priority   =       150,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA256_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -124,7 +123,6 @@ static struct shash_alg sha256_ssse3_algs[] = { {
                .cra_name       =       "sha224",
                .cra_driver_name =      "sha224-ssse3",
                .cra_priority   =       150,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA224_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -177,7 +175,6 @@ static struct shash_alg sha256_avx_algs[] = { {
                .cra_name       =       "sha256",
                .cra_driver_name =      "sha256-avx",
                .cra_priority   =       160,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA256_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -192,7 +189,6 @@ static struct shash_alg sha256_avx_algs[] = { {
                .cra_name       =       "sha224",
                .cra_driver_name =      "sha224-avx",
                .cra_priority   =       160,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA224_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -261,7 +257,6 @@ static struct shash_alg sha256_avx2_algs[] = { {
                .cra_name       =       "sha256",
                .cra_driver_name =      "sha256-avx2",
                .cra_priority   =       170,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA256_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -276,7 +271,6 @@ static struct shash_alg sha256_avx2_algs[] = { {
                .cra_name       =       "sha224",
                .cra_driver_name =      "sha224-avx2",
                .cra_priority   =       170,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA224_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -343,7 +337,6 @@ static struct shash_alg sha256_ni_algs[] = { {
                .cra_name       =       "sha256",
                .cra_driver_name =      "sha256-ni",
                .cra_priority   =       250,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA256_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -358,7 +351,6 @@ static struct shash_alg sha256_ni_algs[] = { {
                .cra_name       =       "sha224",
                .cra_driver_name =      "sha224-ni",
                .cra_priority   =       250,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA224_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/arch/x86/crypto/sha512_ssse3_glue.c b/arch/x86/crypto/sha512_ssse3_glue.c
index 2b0e2a6825f337f2defe72d6a4bc7760ee9b587b..f1b811b60ba6f852968274cb6ecbf8ea976406b4 100644 (file)
--- a/arch/x86/crypto/sha512_ssse3_glue.c
+++ b/arch/x86/crypto/sha512_ssse3_glue.c
@@ -109,7 +109,6 @@ static struct shash_alg sha512_ssse3_algs[] = { {
                .cra_name       =       "sha512",
                .cra_driver_name =      "sha512-ssse3",
                .cra_priority   =       150,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA512_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -124,7 +123,6 @@ static struct shash_alg sha512_ssse3_algs[] = { {
                .cra_name       =       "sha384",
                .cra_driver_name =      "sha384-ssse3",
                .cra_priority   =       150,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA384_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -188,7 +186,6 @@ static struct shash_alg sha512_avx_algs[] = { {
                .cra_name       =       "sha512",
                .cra_driver_name =      "sha512-avx",
                .cra_priority   =       160,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA512_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -203,7 +200,6 @@ static struct shash_alg sha512_avx_algs[] = { {
                .cra_name       =       "sha384",
                .cra_driver_name =      "sha384-avx",
                .cra_priority   =       160,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA384_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -261,7 +257,6 @@ static struct shash_alg sha512_avx2_algs[] = { {
                .cra_name       =       "sha512",
                .cra_driver_name =      "sha512-avx2",
                .cra_priority   =       170,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA512_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -276,7 +271,6 @@ static struct shash_alg sha512_avx2_algs[] = { {
                .cra_name       =       "sha384",
                .cra_driver_name =      "sha384-avx2",
                .cra_priority   =       170,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA384_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/crypto/crypto_null.c b/crypto/crypto_null.c
index 20ff2c746e0ba220a192dc460194b97de0cc0702..0959b268966c6e9e8700937c8f2dbf7f682f6309 100644 (file)
--- a/crypto/crypto_null.c
+++ b/crypto/crypto_null.c
@@ -104,7 +104,6 @@ static struct shash_alg digest_null = {
        .final                  =       null_final,
        .base                   =       {
                .cra_name               =       "digest_null",
-               .cra_flags              =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          =       NULL_BLOCK_SIZE,
                .cra_module             =       THIS_MODULE,
        }

diff --git a/crypto/ghash-generic.c b/crypto/ghash-generic.c
index 1bffb3f712dd394c43d9082db36dc710cf7a8ecd..d9f192b953b22b06ea4adc6b921a1d59a1dde1f2 100644 (file)
--- a/crypto/ghash-generic.c
+++ b/crypto/ghash-generic.c
@@ -132,7 +132,6 @@ static struct shash_alg ghash_alg = {
                .cra_name               = "ghash",
                .cra_driver_name        = "ghash-generic",
                .cra_priority           = 100,
-               .cra_flags              = CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          = GHASH_BLOCK_SIZE,
                .cra_ctxsize            = sizeof(struct ghash_ctx),
                .cra_module             = THIS_MODULE,

diff --git a/crypto/md4.c b/crypto/md4.c
index 810fefb0a007a3f26d8323617418017e52f68345..9965ec40d9f976dbca63a662477a7f9d83d4eed1 100644 (file)
--- a/crypto/md4.c
+++ b/crypto/md4.c
@@ -217,7 +217,6 @@ static struct shash_alg alg = {
        .descsize       =       sizeof(struct md4_ctx),
        .base           =       {
                .cra_name       =       "md4",
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       MD4_HMAC_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/crypto/md5.c b/crypto/md5.c
index f776ef43d6217699d5b3f1e035f4f6a7ff39a009..94dd78144ba3e38b29341e2c229867a838a123bb 100644 (file)
--- a/crypto/md5.c
+++ b/crypto/md5.c
@@ -229,7 +229,6 @@ static struct shash_alg alg = {
        .statesize      =       sizeof(struct md5_state),
        .base           =       {
                .cra_name       =       "md5",
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       MD5_HMAC_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/crypto/poly1305_generic.c b/crypto/poly1305_generic.c
index b7a3a0613a30781a62d730e3b1b61a74d17ee53b..47d3a6b83931ed20f9d64598d84b34c6e929f4e4 100644 (file)
--- a/crypto/poly1305_generic.c
+++ b/crypto/poly1305_generic.c
@@ -279,7 +279,6 @@ static struct shash_alg poly1305_alg = {
                .cra_name               = "poly1305",
                .cra_driver_name        = "poly1305-generic",
                .cra_priority           = 100,
-               .cra_flags              = CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          = POLY1305_BLOCK_SIZE,
                .cra_module             = THIS_MODULE,
        },

diff --git a/crypto/rmd128.c b/crypto/rmd128.c
index 40e053b97b697cfa4eeda4e7935b1932fde13156..5f4472256e272f522ae32202779a732fa8ad791a 100644 (file)
--- a/crypto/rmd128.c
+++ b/crypto/rmd128.c
@@ -303,7 +303,6 @@ static struct shash_alg alg = {
        .descsize       =       sizeof(struct rmd128_ctx),
        .base           =       {
                .cra_name        =      "rmd128",
-               .cra_flags       =      CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize   =      RMD128_BLOCK_SIZE,
                .cra_module      =      THIS_MODULE,
        }

diff --git a/crypto/rmd160.c b/crypto/rmd160.c
index 5f3e6ea35268d5ef849637daaf4605b674ab2794..737645344d1cbe53b467d7b13590417f33f9f340 100644 (file)
--- a/crypto/rmd160.c
+++ b/crypto/rmd160.c
@@ -347,7 +347,6 @@ static struct shash_alg alg = {
        .descsize       =       sizeof(struct rmd160_ctx),
        .base           =       {
                .cra_name        =      "rmd160",
-               .cra_flags       =      CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize   =      RMD160_BLOCK_SIZE,
                .cra_module      =      THIS_MODULE,
        }

diff --git a/crypto/rmd256.c b/crypto/rmd256.c
index f50c025cc9623a65abdbce4d494db5ddb20f02aa..0afbb5af44990b733b600db1569c15057ecd5fc2 100644 (file)
--- a/crypto/rmd256.c
+++ b/crypto/rmd256.c
@@ -322,7 +322,6 @@ static struct shash_alg alg = {
        .descsize       =       sizeof(struct rmd256_ctx),
        .base           =       {
                .cra_name        =      "rmd256",
-               .cra_flags       =      CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize   =      RMD256_BLOCK_SIZE,
                .cra_module      =      THIS_MODULE,
        }

diff --git a/crypto/rmd320.c b/crypto/rmd320.c
index e1315e4869e8b55802ce444737184fdc9b26b586..ab3cf93624d2da22e0886b4745d7b06be96aa56c 100644 (file)
--- a/crypto/rmd320.c
+++ b/crypto/rmd320.c
@@ -371,7 +371,6 @@ static struct shash_alg alg = {
        .descsize       =       sizeof(struct rmd320_ctx),
        .base           =       {
                .cra_name        =      "rmd320",
-               .cra_flags       =      CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize   =      RMD320_BLOCK_SIZE,
                .cra_module      =      THIS_MODULE,
        }

diff --git a/crypto/sha1_generic.c b/crypto/sha1_generic.c
index a3d701632ca2c1040d741b7fcbe4a7662b323ff3..2af64ef81f402a4778a5c56a45b604f4d569fd3f 100644 (file)
--- a/crypto/sha1_generic.c
+++ b/crypto/sha1_generic.c
@@ -77,7 +77,6 @@ static struct shash_alg alg = {
                .cra_name       =       "sha1",
                .cra_driver_name=       "sha1-generic",
                .cra_priority   =       100,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA1_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/crypto/sha256_generic.c b/crypto/sha256_generic.c
index dfcb7beb73a72f94f116898c4e2e2c2d7dbbc41c..1e5ba6649e8dbc47932d5c45c5d7706dbf62b498 100644 (file)
--- a/crypto/sha256_generic.c
+++ b/crypto/sha256_generic.c
@@ -272,7 +272,6 @@ static struct shash_alg sha256_algs[2] = { {
                .cra_name       =       "sha256",
                .cra_driver_name=       "sha256-generic",
                .cra_priority   =       100,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA256_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -287,7 +286,6 @@ static struct shash_alg sha256_algs[2] = { {
                .cra_name       =       "sha224",
                .cra_driver_name=       "sha224-generic",
                .cra_priority   =       100,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA224_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/crypto/sha3_generic.c b/crypto/sha3_generic.c
index 264ec12c0b9c334a16d743651771a18b616616a0..153fe33b8c9b53fd8b114db065ed7c502f15d88d 100644 (file)
--- a/crypto/sha3_generic.c
+++ b/crypto/sha3_generic.c
@@ -250,7 +250,6 @@ static struct shash_alg algs[] = { {
        .descsize               = sizeof(struct sha3_state),
        .base.cra_name          = "sha3-224",
        .base.cra_driver_name   = "sha3-224-generic",
-       .base.cra_flags         = CRYPTO_ALG_TYPE_SHASH,
        .base.cra_blocksize     = SHA3_224_BLOCK_SIZE,
        .base.cra_module        = THIS_MODULE,
 }, {
@@ -261,7 +260,6 @@ static struct shash_alg algs[] = { {
        .descsize               = sizeof(struct sha3_state),
        .base.cra_name          = "sha3-256",
        .base.cra_driver_name   = "sha3-256-generic",
-       .base.cra_flags         = CRYPTO_ALG_TYPE_SHASH,
        .base.cra_blocksize     = SHA3_256_BLOCK_SIZE,
        .base.cra_module        = THIS_MODULE,
 }, {
@@ -272,7 +270,6 @@ static struct shash_alg algs[] = { {
        .descsize               = sizeof(struct sha3_state),
        .base.cra_name          = "sha3-384",
        .base.cra_driver_name   = "sha3-384-generic",
-       .base.cra_flags         = CRYPTO_ALG_TYPE_SHASH,
        .base.cra_blocksize     = SHA3_384_BLOCK_SIZE,
        .base.cra_module        = THIS_MODULE,
 }, {
@@ -283,7 +280,6 @@ static struct shash_alg algs[] = { {
        .descsize               = sizeof(struct sha3_state),
        .base.cra_name          = "sha3-512",
        .base.cra_driver_name   = "sha3-512-generic",
-       .base.cra_flags         = CRYPTO_ALG_TYPE_SHASH,
        .base.cra_blocksize     = SHA3_512_BLOCK_SIZE,
        .base.cra_module        = THIS_MODULE,
 } };

diff --git a/crypto/sha512_generic.c b/crypto/sha512_generic.c
index 55377b1cba6b2ebd482368a9dfb377821ab60965..4097cd555eb6becc50dfa83e7e6596eccc891498 100644 (file)
--- a/crypto/sha512_generic.c
+++ b/crypto/sha512_generic.c
@@ -194,7 +194,6 @@ static struct shash_alg sha512_algs[2] = { {
                .cra_name       =       "sha512",
                .cra_driver_name =      "sha512-generic",
                .cra_priority   =       100,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA512_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -209,7 +208,6 @@ static struct shash_alg sha512_algs[2] = { {
                .cra_name       =       "sha384",
                .cra_driver_name =      "sha384-generic",
                .cra_priority   =       100,
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       SHA384_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/crypto/sm3_generic.c b/crypto/sm3_generic.c
index 9e823d99f095f714015f5f6c37253f593170bf0e..9a5c60f08aad8482cce58bf2a660aa37a4c652e6 100644 (file)
--- a/crypto/sm3_generic.c
+++ b/crypto/sm3_generic.c
@@ -184,7 +184,6 @@ static struct shash_alg sm3_alg = {
        .base           =       {
                .cra_name        =      "sm3",
                .cra_driver_name =      "sm3-generic",
-               .cra_flags       =      CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize   =      SM3_BLOCK_SIZE,
                .cra_module      =      THIS_MODULE,
        }

diff --git a/crypto/tgr192.c b/crypto/tgr192.c
index 321bc6ff2a9d1ff714b3f27e49b68f0d48ce17e0..022d3dd76c3b22c27c16137d1c686dbb0abce97a 100644 (file)
--- a/crypto/tgr192.c
+++ b/crypto/tgr192.c
@@ -636,7 +636,6 @@ static struct shash_alg tgr_algs[3] = { {
        .descsize       =       sizeof(struct tgr192_ctx),
        .base           =       {
                .cra_name       =       "tgr192",
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       TGR192_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -648,7 +647,6 @@ static struct shash_alg tgr_algs[3] = { {
        .descsize       =       sizeof(struct tgr192_ctx),
        .base           =       {
                .cra_name       =       "tgr160",
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       TGR192_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -660,7 +658,6 @@ static struct shash_alg tgr_algs[3] = { {
        .descsize       =       sizeof(struct tgr192_ctx),
        .base           =       {
                .cra_name       =       "tgr128",
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       TGR192_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/crypto/wp512.c b/crypto/wp512.c
index 7ee5a043a988350770c3fe712f45b4f3995063c9..149e577fb7726afac56369488adaca6ca6118b1e 100644 (file)
--- a/crypto/wp512.c
+++ b/crypto/wp512.c
@@ -1127,7 +1127,6 @@ static struct shash_alg wp_algs[3] = { {
        .descsize       =       sizeof(struct wp512_ctx),
        .base           =       {
                .cra_name       =       "wp512",
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       WP512_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -1139,7 +1138,6 @@ static struct shash_alg wp_algs[3] = { {
        .descsize       =       sizeof(struct wp512_ctx),
        .base           =       {
                .cra_name       =       "wp384",
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       WP512_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }
@@ -1151,7 +1149,6 @@ static struct shash_alg wp_algs[3] = { {
        .descsize       =       sizeof(struct wp512_ctx),
        .base           =       {
                .cra_name       =       "wp256",
-               .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize  =       WP512_BLOCK_SIZE,
                .cra_module     =       THIS_MODULE,
        }

diff --git a/drivers/crypto/nx/nx-aes-xcbc.c b/drivers/crypto/nx/nx-aes-xcbc.c
index c2f7d4befb5599fa4e7c947ba25b796c8612d24e..ad3358e74f5c442df14c75c76f8ec6b6e9fb0158 100644 (file)
--- a/drivers/crypto/nx/nx-aes-xcbc.c
+++ b/drivers/crypto/nx/nx-aes-xcbc.c
@@ -386,7 +386,6 @@ struct shash_alg nx_shash_aes_xcbc_alg = {
                .cra_name        = "xcbc(aes)",
                .cra_driver_name = "xcbc-aes-nx",
                .cra_priority    = 300,
-               .cra_flags       = CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize   = AES_BLOCK_SIZE,
                .cra_module      = THIS_MODULE,
                .cra_ctxsize     = sizeof(struct nx_crypto_ctx),

diff --git a/drivers/crypto/nx/nx-sha256.c b/drivers/crypto/nx/nx-sha256.c
index becb738c897b1b5d93b632e3ab80ed2b146ead5a..a6764af83c6dc7b4c028761b5cae8f7b4bec803e 100644 (file)
--- a/drivers/crypto/nx/nx-sha256.c
+++ b/drivers/crypto/nx/nx-sha256.c
@@ -288,7 +288,6 @@ struct shash_alg nx_shash_sha256_alg = {
                .cra_name        = "sha256",
                .cra_driver_name = "sha256-nx",
                .cra_priority    = 300,
-               .cra_flags       = CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize   = SHA256_BLOCK_SIZE,
                .cra_module      = THIS_MODULE,
                .cra_ctxsize     = sizeof(struct nx_crypto_ctx),

diff --git a/drivers/crypto/nx/nx-sha512.c b/drivers/crypto/nx/nx-sha512.c
index b6e183d58d73d5a4e38fff2925344783e8e581bc..92956bc6e45eed1cff29d56040d2615e34ae6a8e 100644 (file)
--- a/drivers/crypto/nx/nx-sha512.c
+++ b/drivers/crypto/nx/nx-sha512.c
@@ -294,7 +294,6 @@ struct shash_alg nx_shash_sha512_alg = {
                .cra_name        = "sha512",
                .cra_driver_name = "sha512-nx",
                .cra_priority    = 300,
-               .cra_flags       = CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize   = SHA512_BLOCK_SIZE,
                .cra_module      = THIS_MODULE,
                .cra_ctxsize     = sizeof(struct nx_crypto_ctx),

diff --git a/drivers/crypto/padlock-sha.c b/drivers/crypto/padlock-sha.c
index d32c7932887697afcfc8350215805b4972dc560b..21e5cae0a1e046ee84176569cd23c908af736a4d 100644 (file)
--- a/drivers/crypto/padlock-sha.c
+++ b/drivers/crypto/padlock-sha.c
@@ -247,8 +247,7 @@ static struct shash_alg sha1_alg = {
                .cra_name               =       "sha1",
                .cra_driver_name        =       "sha1-padlock",
                .cra_priority           =       PADLOCK_CRA_PRIORITY,
-               .cra_flags              =       CRYPTO_ALG_TYPE_SHASH |
-                                               CRYPTO_ALG_NEED_FALLBACK,
+               .cra_flags              =       CRYPTO_ALG_NEED_FALLBACK,
                .cra_blocksize          =       SHA1_BLOCK_SIZE,
                .cra_ctxsize            =       sizeof(struct padlock_sha_ctx),
                .cra_module             =       THIS_MODULE,
@@ -271,8 +270,7 @@ static struct shash_alg sha256_alg = {
                .cra_name               =       "sha256",
                .cra_driver_name        =       "sha256-padlock",
                .cra_priority           =       PADLOCK_CRA_PRIORITY,
-               .cra_flags              =       CRYPTO_ALG_TYPE_SHASH |
-                                               CRYPTO_ALG_NEED_FALLBACK,
+               .cra_flags              =       CRYPTO_ALG_NEED_FALLBACK,
                .cra_blocksize          =       SHA256_BLOCK_SIZE,
                .cra_ctxsize            =       sizeof(struct padlock_sha_ctx),
                .cra_module             =       THIS_MODULE,
@@ -484,7 +482,6 @@ static struct shash_alg sha1_alg_nano = {
                .cra_name               =       "sha1",
                .cra_driver_name        =       "sha1-padlock-nano",
                .cra_priority           =       PADLOCK_CRA_PRIORITY,
-               .cra_flags              =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          =       SHA1_BLOCK_SIZE,
                .cra_module             =       THIS_MODULE,
        }
@@ -503,7 +500,6 @@ static struct shash_alg sha256_alg_nano = {
                .cra_name               =       "sha256",
                .cra_driver_name        =       "sha256-padlock-nano",
                .cra_priority           =       PADLOCK_CRA_PRIORITY,
-               .cra_flags              =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          =       SHA256_BLOCK_SIZE,
                .cra_module             =       THIS_MODULE,
        }

diff --git a/drivers/crypto/vmx/ghash.c b/drivers/crypto/vmx/ghash.c
index 1c4b5b889fbacf181c074baf21d7ae0d65d64c3e..dd8b8716467a2cdd314683541436de0742b0106e 100644 (file)
--- a/drivers/crypto/vmx/ghash.c
+++ b/drivers/crypto/vmx/ghash.c
@@ -215,7 +215,7 @@ struct shash_alg p8_ghash_alg = {
                 .cra_name = "ghash",
                 .cra_driver_name = "p8_ghash",
                 .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_ctxsize = sizeof(struct p8_ghash_ctx),
                 .cra_module = THIS_MODULE,

diff --git a/drivers/staging/skein/skein_generic.c b/drivers/staging/skein/skein_generic.c
index 11f5e530a75f4c16138a49ee6b058b1b9ccc3196..c31fc6408383a1e742524fee4c05ef52e8798e19 100644 (file)
--- a/drivers/staging/skein/skein_generic.c
+++ b/drivers/staging/skein/skein_generic.c
@@ -137,7 +137,6 @@ static struct shash_alg alg256 = {
        .base           =       {
                .cra_name               =       "skein256",
                .cra_driver_name        =       "skein",
-               .cra_flags              =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          =       SKEIN_256_BLOCK_BYTES,
                .cra_module             =       THIS_MODULE,
        }
@@ -155,7 +154,6 @@ static struct shash_alg alg512 = {
        .base           =       {
                .cra_name               =       "skein512",
                .cra_driver_name        =       "skein",
-               .cra_flags              =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          =       SKEIN_512_BLOCK_BYTES,
                .cra_module             =       THIS_MODULE,
        }
@@ -173,7 +171,6 @@ static struct shash_alg alg1024 = {
        .base           =       {
                .cra_name               =       "skein1024",
                .cra_driver_name        =       "skein",
-               .cra_flags              =       CRYPTO_ALG_TYPE_SHASH,
                .cra_blocksize          =       SKEIN_1024_BLOCK_BYTES,
                .cra_module             =       THIS_MODULE,
        }