summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2018-06-30 18:16:11 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2018-07-08 12:30:24 -0400
commite50944e219f908968a6e01fbd0e8811a33bd5f04 (patch)
treebbb469d864e455db482f0240a14b7298604b9551
parent8aeef492fe248e0e56d888e2d5432724ac45f80d (diff)
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>
-rw-r--r--arch/arm/crypto/ghash-ce-glue.c2
-rw-r--r--arch/arm/crypto/sha1-ce-glue.c1
-rw-r--r--arch/arm/crypto/sha1_glue.c1
-rw-r--r--arch/arm/crypto/sha1_neon_glue.c1
-rw-r--r--arch/arm/crypto/sha2-ce-glue.c2
-rw-r--r--arch/arm/crypto/sha256_glue.c2
-rw-r--r--arch/arm/crypto/sha256_neon_glue.c2
-rw-r--r--arch/arm/crypto/sha512-glue.c2
-rw-r--r--arch/arm/crypto/sha512-neon-glue.c2
-rw-r--r--arch/arm64/crypto/aes-glue.c3
-rw-r--r--arch/arm64/crypto/ghash-ce-glue.c1
-rw-r--r--arch/arm64/crypto/sha1-ce-glue.c1
-rw-r--r--arch/arm64/crypto/sha2-ce-glue.c2
-rw-r--r--arch/arm64/crypto/sha256-glue.c4
-rw-r--r--arch/arm64/crypto/sha3-ce-glue.c4
-rw-r--r--arch/arm64/crypto/sha512-ce-glue.c2
-rw-r--r--arch/arm64/crypto/sha512-glue.c2
-rw-r--r--arch/arm64/crypto/sm3-ce-glue.c1
-rw-r--r--arch/mips/cavium-octeon/crypto/octeon-md5.c1
-rw-r--r--arch/mips/cavium-octeon/crypto/octeon-sha1.c1
-rw-r--r--arch/mips/cavium-octeon/crypto/octeon-sha256.c2
-rw-r--r--arch/mips/cavium-octeon/crypto/octeon-sha512.c2
-rw-r--r--arch/powerpc/crypto/md5-glue.c1
-rw-r--r--arch/powerpc/crypto/sha1-spe-glue.c1
-rw-r--r--arch/powerpc/crypto/sha1.c1
-rw-r--r--arch/powerpc/crypto/sha256-spe-glue.c2
-rw-r--r--arch/s390/crypto/ghash_s390.c1
-rw-r--r--arch/s390/crypto/sha1_s390.c1
-rw-r--r--arch/s390/crypto/sha256_s390.c2
-rw-r--r--arch/s390/crypto/sha512_s390.c2
-rw-r--r--arch/sparc/crypto/md5_glue.c1
-rw-r--r--arch/sparc/crypto/sha1_glue.c1
-rw-r--r--arch/sparc/crypto/sha256_glue.c2
-rw-r--r--arch/sparc/crypto/sha512_glue.c2
-rw-r--r--arch/x86/crypto/ghash-clmulni-intel_glue.c3
-rw-r--r--arch/x86/crypto/poly1305_glue.c1
-rw-r--r--arch/x86/crypto/sha1_ssse3_glue.c4
-rw-r--r--arch/x86/crypto/sha256_ssse3_glue.c8
-rw-r--r--arch/x86/crypto/sha512_ssse3_glue.c6
-rw-r--r--crypto/crypto_null.c1
-rw-r--r--crypto/ghash-generic.c1
-rw-r--r--crypto/md4.c1
-rw-r--r--crypto/md5.c1
-rw-r--r--crypto/poly1305_generic.c1
-rw-r--r--crypto/rmd128.c1
-rw-r--r--crypto/rmd160.c1
-rw-r--r--crypto/rmd256.c1
-rw-r--r--crypto/rmd320.c1
-rw-r--r--crypto/sha1_generic.c1
-rw-r--r--crypto/sha256_generic.c2
-rw-r--r--crypto/sha3_generic.c4
-rw-r--r--crypto/sha512_generic.c2
-rw-r--r--crypto/sm3_generic.c1
-rw-r--r--crypto/tgr192.c3
-rw-r--r--crypto/wp512.c3
-rw-r--r--drivers/crypto/nx/nx-aes-xcbc.c1
-rw-r--r--drivers/crypto/nx/nx-sha256.c1
-rw-r--r--drivers/crypto/nx/nx-sha512.c1
-rw-r--r--drivers/crypto/padlock-sha.c8
-rw-r--r--drivers/crypto/vmx/ghash.c2
-rw-r--r--drivers/staging/skein/skein_generic.c3
61 files changed, 5 insertions, 116 deletions
diff --git a/arch/arm/crypto/ghash-ce-glue.c b/arch/arm/crypto/ghash-ce-glue.c
index d9bb52cae2ac..f93c0761929d 100644
--- 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 = {
152 .cra_name = "__ghash", 152 .cra_name = "__ghash",
153 .cra_driver_name = "__driver-ghash-ce", 153 .cra_driver_name = "__driver-ghash-ce",
154 .cra_priority = 0, 154 .cra_priority = 0,
155 .cra_flags = CRYPTO_ALG_TYPE_SHASH | CRYPTO_ALG_INTERNAL, 155 .cra_flags = CRYPTO_ALG_INTERNAL,
156 .cra_blocksize = GHASH_BLOCK_SIZE, 156 .cra_blocksize = GHASH_BLOCK_SIZE,
157 .cra_ctxsize = sizeof(struct ghash_key), 157 .cra_ctxsize = sizeof(struct ghash_key),
158 .cra_module = THIS_MODULE, 158 .cra_module = THIS_MODULE,
diff --git a/arch/arm/crypto/sha1-ce-glue.c b/arch/arm/crypto/sha1-ce-glue.c
index 555f72b5e659..b732522e20f8 100644
--- 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 = {
75 .cra_name = "sha1", 75 .cra_name = "sha1",
76 .cra_driver_name = "sha1-ce", 76 .cra_driver_name = "sha1-ce",
77 .cra_priority = 200, 77 .cra_priority = 200,
78 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
79 .cra_blocksize = SHA1_BLOCK_SIZE, 78 .cra_blocksize = SHA1_BLOCK_SIZE,
80 .cra_module = THIS_MODULE, 79 .cra_module = THIS_MODULE,
81 } 80 }
diff --git a/arch/arm/crypto/sha1_glue.c b/arch/arm/crypto/sha1_glue.c
index 6fc73bf8766d..98ab8239f919 100644
--- a/arch/arm/crypto/sha1_glue.c
+++ b/arch/arm/crypto/sha1_glue.c
@@ -67,7 +67,6 @@ static struct shash_alg alg = {
67 .cra_name = "sha1", 67 .cra_name = "sha1",
68 .cra_driver_name= "sha1-asm", 68 .cra_driver_name= "sha1-asm",
69 .cra_priority = 150, 69 .cra_priority = 150,
70 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
71 .cra_blocksize = SHA1_BLOCK_SIZE, 70 .cra_blocksize = SHA1_BLOCK_SIZE,
72 .cra_module = THIS_MODULE, 71 .cra_module = THIS_MODULE,
73 } 72 }
diff --git a/arch/arm/crypto/sha1_neon_glue.c b/arch/arm/crypto/sha1_neon_glue.c
index 4e22f122f966..d15e0ea2c95e 100644
--- 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 = {
83 .cra_name = "sha1", 83 .cra_name = "sha1",
84 .cra_driver_name = "sha1-neon", 84 .cra_driver_name = "sha1-neon",
85 .cra_priority = 250, 85 .cra_priority = 250,
86 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
87 .cra_blocksize = SHA1_BLOCK_SIZE, 86 .cra_blocksize = SHA1_BLOCK_SIZE,
88 .cra_module = THIS_MODULE, 87 .cra_module = THIS_MODULE,
89 } 88 }
diff --git a/arch/arm/crypto/sha2-ce-glue.c b/arch/arm/crypto/sha2-ce-glue.c
index df4dcef054ae..1211a5c129fc 100644
--- 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[] = { {
78 .cra_name = "sha224", 78 .cra_name = "sha224",
79 .cra_driver_name = "sha224-ce", 79 .cra_driver_name = "sha224-ce",
80 .cra_priority = 300, 80 .cra_priority = 300,
81 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
82 .cra_blocksize = SHA256_BLOCK_SIZE, 81 .cra_blocksize = SHA256_BLOCK_SIZE,
83 .cra_module = THIS_MODULE, 82 .cra_module = THIS_MODULE,
84 } 83 }
@@ -93,7 +92,6 @@ static struct shash_alg algs[] = { {
93 .cra_name = "sha256", 92 .cra_name = "sha256",
94 .cra_driver_name = "sha256-ce", 93 .cra_driver_name = "sha256-ce",
95 .cra_priority = 300, 94 .cra_priority = 300,
96 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
97 .cra_blocksize = SHA256_BLOCK_SIZE, 95 .cra_blocksize = SHA256_BLOCK_SIZE,
98 .cra_module = THIS_MODULE, 96 .cra_module = THIS_MODULE,
99 } 97 }
diff --git a/arch/arm/crypto/sha256_glue.c b/arch/arm/crypto/sha256_glue.c
index a84e869ef900..bf8ccff2c9d0 100644
--- a/arch/arm/crypto/sha256_glue.c
+++ b/arch/arm/crypto/sha256_glue.c
@@ -71,7 +71,6 @@ static struct shash_alg algs[] = { {
71 .cra_name = "sha256", 71 .cra_name = "sha256",
72 .cra_driver_name = "sha256-asm", 72 .cra_driver_name = "sha256-asm",
73 .cra_priority = 150, 73 .cra_priority = 150,
74 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
75 .cra_blocksize = SHA256_BLOCK_SIZE, 74 .cra_blocksize = SHA256_BLOCK_SIZE,
76 .cra_module = THIS_MODULE, 75 .cra_module = THIS_MODULE,
77 } 76 }
@@ -86,7 +85,6 @@ static struct shash_alg algs[] = { {
86 .cra_name = "sha224", 85 .cra_name = "sha224",
87 .cra_driver_name = "sha224-asm", 86 .cra_driver_name = "sha224-asm",
88 .cra_priority = 150, 87 .cra_priority = 150,
89 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
90 .cra_blocksize = SHA224_BLOCK_SIZE, 88 .cra_blocksize = SHA224_BLOCK_SIZE,
91 .cra_module = THIS_MODULE, 89 .cra_module = THIS_MODULE,
92 } 90 }
diff --git a/arch/arm/crypto/sha256_neon_glue.c b/arch/arm/crypto/sha256_neon_glue.c
index 39ccd658817e..9bbee56fbdc8 100644
--- 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[] = { {
79 .cra_name = "sha256", 79 .cra_name = "sha256",
80 .cra_driver_name = "sha256-neon", 80 .cra_driver_name = "sha256-neon",
81 .cra_priority = 250, 81 .cra_priority = 250,
82 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
83 .cra_blocksize = SHA256_BLOCK_SIZE, 82 .cra_blocksize = SHA256_BLOCK_SIZE,
84 .cra_module = THIS_MODULE, 83 .cra_module = THIS_MODULE,
85 } 84 }
@@ -94,7 +93,6 @@ struct shash_alg sha256_neon_algs[] = { {
94 .cra_name = "sha224", 93 .cra_name = "sha224",
95 .cra_driver_name = "sha224-neon", 94 .cra_driver_name = "sha224-neon",
96 .cra_priority = 250, 95 .cra_priority = 250,
97 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
98 .cra_blocksize = SHA224_BLOCK_SIZE, 96 .cra_blocksize = SHA224_BLOCK_SIZE,
99 .cra_module = THIS_MODULE, 97 .cra_module = THIS_MODULE,
100 } 98 }
diff --git a/arch/arm/crypto/sha512-glue.c b/arch/arm/crypto/sha512-glue.c
index 269a394e4a53..86540cd4a6fa 100644
--- 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[] = { {
63 .cra_name = "sha384", 63 .cra_name = "sha384",
64 .cra_driver_name = "sha384-arm", 64 .cra_driver_name = "sha384-arm",
65 .cra_priority = 250, 65 .cra_priority = 250,
66 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
67 .cra_blocksize = SHA512_BLOCK_SIZE, 66 .cra_blocksize = SHA512_BLOCK_SIZE,
68 .cra_module = THIS_MODULE, 67 .cra_module = THIS_MODULE,
69 } 68 }
@@ -78,7 +77,6 @@ static struct shash_alg sha512_arm_algs[] = { {
78 .cra_name = "sha512", 77 .cra_name = "sha512",
79 .cra_driver_name = "sha512-arm", 78 .cra_driver_name = "sha512-arm",
80 .cra_priority = 250, 79 .cra_priority = 250,
81 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
82 .cra_blocksize = SHA512_BLOCK_SIZE, 80 .cra_blocksize = SHA512_BLOCK_SIZE,
83 .cra_module = THIS_MODULE, 81 .cra_module = THIS_MODULE,
84 } 82 }
diff --git a/arch/arm/crypto/sha512-neon-glue.c b/arch/arm/crypto/sha512-neon-glue.c
index 32693684a3ab..8a5642b41fd6 100644
--- 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[] = { {
75 .cra_name = "sha384", 75 .cra_name = "sha384",
76 .cra_driver_name = "sha384-neon", 76 .cra_driver_name = "sha384-neon",
77 .cra_priority = 300, 77 .cra_priority = 300,
78 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
79 .cra_blocksize = SHA384_BLOCK_SIZE, 78 .cra_blocksize = SHA384_BLOCK_SIZE,
80 .cra_module = THIS_MODULE, 79 .cra_module = THIS_MODULE,
81 80
@@ -91,7 +90,6 @@ struct shash_alg sha512_neon_algs[] = { {
91 .cra_name = "sha512", 90 .cra_name = "sha512",
92 .cra_driver_name = "sha512-neon", 91 .cra_driver_name = "sha512-neon",
93 .cra_priority = 300, 92 .cra_priority = 300,
94 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
95 .cra_blocksize = SHA512_BLOCK_SIZE, 93 .cra_blocksize = SHA512_BLOCK_SIZE,
96 .cra_module = THIS_MODULE, 94 .cra_module = THIS_MODULE,
97 } 95 }
diff --git a/arch/arm64/crypto/aes-glue.c b/arch/arm64/crypto/aes-glue.c
index 253188fb8cb0..a615a9a991a3 100644
--- a/arch/arm64/crypto/aes-glue.c
+++ b/arch/arm64/crypto/aes-glue.c
@@ -567,7 +567,6 @@ static struct shash_alg mac_algs[] = { {
567 .base.cra_name = "cmac(aes)", 567 .base.cra_name = "cmac(aes)",
568 .base.cra_driver_name = "cmac-aes-" MODE, 568 .base.cra_driver_name = "cmac-aes-" MODE,
569 .base.cra_priority = PRIO, 569 .base.cra_priority = PRIO,
570 .base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
571 .base.cra_blocksize = AES_BLOCK_SIZE, 570 .base.cra_blocksize = AES_BLOCK_SIZE,
572 .base.cra_ctxsize = sizeof(struct mac_tfm_ctx) + 571 .base.cra_ctxsize = sizeof(struct mac_tfm_ctx) +
573 2 * AES_BLOCK_SIZE, 572 2 * AES_BLOCK_SIZE,
@@ -583,7 +582,6 @@ static struct shash_alg mac_algs[] = { {
583 .base.cra_name = "xcbc(aes)", 582 .base.cra_name = "xcbc(aes)",
584 .base.cra_driver_name = "xcbc-aes-" MODE, 583 .base.cra_driver_name = "xcbc-aes-" MODE,
585 .base.cra_priority = PRIO, 584 .base.cra_priority = PRIO,
586 .base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
587 .base.cra_blocksize = AES_BLOCK_SIZE, 585 .base.cra_blocksize = AES_BLOCK_SIZE,
588 .base.cra_ctxsize = sizeof(struct mac_tfm_ctx) + 586 .base.cra_ctxsize = sizeof(struct mac_tfm_ctx) +
589 2 * AES_BLOCK_SIZE, 587 2 * AES_BLOCK_SIZE,
@@ -599,7 +597,6 @@ static struct shash_alg mac_algs[] = { {
599 .base.cra_name = "cbcmac(aes)", 597 .base.cra_name = "cbcmac(aes)",
600 .base.cra_driver_name = "cbcmac-aes-" MODE, 598 .base.cra_driver_name = "cbcmac-aes-" MODE,
601 .base.cra_priority = PRIO, 599 .base.cra_priority = PRIO,
602 .base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
603 .base.cra_blocksize = 1, 600 .base.cra_blocksize = 1,
604 .base.cra_ctxsize = sizeof(struct mac_tfm_ctx), 601 .base.cra_ctxsize = sizeof(struct mac_tfm_ctx),
605 .base.cra_module = THIS_MODULE, 602 .base.cra_module = THIS_MODULE,
diff --git a/arch/arm64/crypto/ghash-ce-glue.c b/arch/arm64/crypto/ghash-ce-glue.c
index 7cf0b1aa6ea8..757fae186753 100644
--- 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 = {
204 .base.cra_name = "ghash", 204 .base.cra_name = "ghash",
205 .base.cra_driver_name = "ghash-ce", 205 .base.cra_driver_name = "ghash-ce",
206 .base.cra_priority = 200, 206 .base.cra_priority = 200,
207 .base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
208 .base.cra_blocksize = GHASH_BLOCK_SIZE, 207 .base.cra_blocksize = GHASH_BLOCK_SIZE,
209 .base.cra_ctxsize = sizeof(struct ghash_key), 208 .base.cra_ctxsize = sizeof(struct ghash_key),
210 .base.cra_module = THIS_MODULE, 209 .base.cra_module = THIS_MODULE,
diff --git a/arch/arm64/crypto/sha1-ce-glue.c b/arch/arm64/crypto/sha1-ce-glue.c
index efbeb3e0dcfb..17fac2889f56 100644
--- 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 = {
99 .cra_name = "sha1", 99 .cra_name = "sha1",
100 .cra_driver_name = "sha1-ce", 100 .cra_driver_name = "sha1-ce",
101 .cra_priority = 200, 101 .cra_priority = 200,
102 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
103 .cra_blocksize = SHA1_BLOCK_SIZE, 102 .cra_blocksize = SHA1_BLOCK_SIZE,
104 .cra_module = THIS_MODULE, 103 .cra_module = THIS_MODULE,
105 } 104 }
diff --git a/arch/arm64/crypto/sha2-ce-glue.c b/arch/arm64/crypto/sha2-ce-glue.c
index fd1ff2b13dfa..261f5195cab7 100644
--- 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[] = { {
114 .cra_name = "sha224", 114 .cra_name = "sha224",
115 .cra_driver_name = "sha224-ce", 115 .cra_driver_name = "sha224-ce",
116 .cra_priority = 200, 116 .cra_priority = 200,
117 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
118 .cra_blocksize = SHA256_BLOCK_SIZE, 117 .cra_blocksize = SHA256_BLOCK_SIZE,
119 .cra_module = THIS_MODULE, 118 .cra_module = THIS_MODULE,
120 } 119 }
@@ -129,7 +128,6 @@ static struct shash_alg algs[] = { {
129 .cra_name = "sha256", 128 .cra_name = "sha256",
130 .cra_driver_name = "sha256-ce", 129 .cra_driver_name = "sha256-ce",
131 .cra_priority = 200, 130 .cra_priority = 200,
132 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
133 .cra_blocksize = SHA256_BLOCK_SIZE, 131 .cra_blocksize = SHA256_BLOCK_SIZE,
134 .cra_module = THIS_MODULE, 132 .cra_module = THIS_MODULE,
135 } 133 }
diff --git a/arch/arm64/crypto/sha256-glue.c b/arch/arm64/crypto/sha256-glue.c
index e8880ccdc71f..f1b4f4420ca1 100644
--- a/arch/arm64/crypto/sha256-glue.c
+++ b/arch/arm64/crypto/sha256-glue.c
@@ -68,7 +68,6 @@ static struct shash_alg algs[] = { {
68 .base.cra_name = "sha256", 68 .base.cra_name = "sha256",
69 .base.cra_driver_name = "sha256-arm64", 69 .base.cra_driver_name = "sha256-arm64",
70 .base.cra_priority = 100, 70 .base.cra_priority = 100,
71 .base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
72 .base.cra_blocksize = SHA256_BLOCK_SIZE, 71 .base.cra_blocksize = SHA256_BLOCK_SIZE,
73 .base.cra_module = THIS_MODULE, 72 .base.cra_module = THIS_MODULE,
74}, { 73}, {
@@ -81,7 +80,6 @@ static struct shash_alg algs[] = { {
81 .base.cra_name = "sha224", 80 .base.cra_name = "sha224",
82 .base.cra_driver_name = "sha224-arm64", 81 .base.cra_driver_name = "sha224-arm64",
83 .base.cra_priority = 100, 82 .base.cra_priority = 100,
84 .base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
85 .base.cra_blocksize = SHA224_BLOCK_SIZE, 83 .base.cra_blocksize = SHA224_BLOCK_SIZE,
86 .base.cra_module = THIS_MODULE, 84 .base.cra_module = THIS_MODULE,
87} }; 85} };
@@ -153,7 +151,6 @@ static struct shash_alg neon_algs[] = { {
153 .base.cra_name = "sha256", 151 .base.cra_name = "sha256",
154 .base.cra_driver_name = "sha256-arm64-neon", 152 .base.cra_driver_name = "sha256-arm64-neon",
155 .base.cra_priority = 150, 153 .base.cra_priority = 150,
156 .base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
157 .base.cra_blocksize = SHA256_BLOCK_SIZE, 154 .base.cra_blocksize = SHA256_BLOCK_SIZE,
158 .base.cra_module = THIS_MODULE, 155 .base.cra_module = THIS_MODULE,
159}, { 156}, {
@@ -166,7 +163,6 @@ static struct shash_alg neon_algs[] = { {
166 .base.cra_name = "sha224", 163 .base.cra_name = "sha224",
167 .base.cra_driver_name = "sha224-arm64-neon", 164 .base.cra_driver_name = "sha224-arm64-neon",
168 .base.cra_priority = 150, 165 .base.cra_priority = 150,
169 .base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
170 .base.cra_blocksize = SHA224_BLOCK_SIZE, 166 .base.cra_blocksize = SHA224_BLOCK_SIZE,
171 .base.cra_module = THIS_MODULE, 167 .base.cra_module = THIS_MODULE,
172} }; 168} };
diff --git a/arch/arm64/crypto/sha3-ce-glue.c b/arch/arm64/crypto/sha3-ce-glue.c
index da8222e528bd..a336feac0f59 100644
--- 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[] = { {
105 .descsize = sizeof(struct sha3_state), 105 .descsize = sizeof(struct sha3_state),
106 .base.cra_name = "sha3-224", 106 .base.cra_name = "sha3-224",
107 .base.cra_driver_name = "sha3-224-ce", 107 .base.cra_driver_name = "sha3-224-ce",
108 .base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
109 .base.cra_blocksize = SHA3_224_BLOCK_SIZE, 108 .base.cra_blocksize = SHA3_224_BLOCK_SIZE,
110 .base.cra_module = THIS_MODULE, 109 .base.cra_module = THIS_MODULE,
111 .base.cra_priority = 200, 110 .base.cra_priority = 200,
@@ -117,7 +116,6 @@ static struct shash_alg algs[] = { {
117 .descsize = sizeof(struct sha3_state), 116 .descsize = sizeof(struct sha3_state),
118 .base.cra_name = "sha3-256", 117 .base.cra_name = "sha3-256",
119 .base.cra_driver_name = "sha3-256-ce", 118 .base.cra_driver_name = "sha3-256-ce",
120 .base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
121 .base.cra_blocksize = SHA3_256_BLOCK_SIZE, 119 .base.cra_blocksize = SHA3_256_BLOCK_SIZE,
122 .base.cra_module = THIS_MODULE, 120 .base.cra_module = THIS_MODULE,
123 .base.cra_priority = 200, 121 .base.cra_priority = 200,
@@ -129,7 +127,6 @@ static struct shash_alg algs[] = { {
129 .descsize = sizeof(struct sha3_state), 127 .descsize = sizeof(struct sha3_state),
130 .base.cra_name = "sha3-384", 128 .base.cra_name = "sha3-384",
131 .base.cra_driver_name = "sha3-384-ce", 129 .base.cra_driver_name = "sha3-384-ce",
132 .base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
133 .base.cra_blocksize = SHA3_384_BLOCK_SIZE, 130 .base.cra_blocksize = SHA3_384_BLOCK_SIZE,
134 .base.cra_module = THIS_MODULE, 131 .base.cra_module = THIS_MODULE,
135 .base.cra_priority = 200, 132 .base.cra_priority = 200,
@@ -141,7 +138,6 @@ static struct shash_alg algs[] = { {
141 .descsize = sizeof(struct sha3_state), 138 .descsize = sizeof(struct sha3_state),
142 .base.cra_name = "sha3-512", 139 .base.cra_name = "sha3-512",
143 .base.cra_driver_name = "sha3-512-ce", 140 .base.cra_driver_name = "sha3-512-ce",
144 .base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
145 .base.cra_blocksize = SHA3_512_BLOCK_SIZE, 141 .base.cra_blocksize = SHA3_512_BLOCK_SIZE,
146 .base.cra_module = THIS_MODULE, 142 .base.cra_module = THIS_MODULE,
147 .base.cra_priority = 200, 143 .base.cra_priority = 200,
diff --git a/arch/arm64/crypto/sha512-ce-glue.c b/arch/arm64/crypto/sha512-ce-glue.c
index a77c8632a589..f2c5f28c622a 100644
--- 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[] = { {
87 .base.cra_name = "sha384", 87 .base.cra_name = "sha384",
88 .base.cra_driver_name = "sha384-ce", 88 .base.cra_driver_name = "sha384-ce",
89 .base.cra_priority = 200, 89 .base.cra_priority = 200,
90 .base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
91 .base.cra_blocksize = SHA512_BLOCK_SIZE, 90 .base.cra_blocksize = SHA512_BLOCK_SIZE,
92 .base.cra_module = THIS_MODULE, 91 .base.cra_module = THIS_MODULE,
93}, { 92}, {
@@ -100,7 +99,6 @@ static struct shash_alg algs[] = { {
100 .base.cra_name = "sha512", 99 .base.cra_name = "sha512",
101 .base.cra_driver_name = "sha512-ce", 100 .base.cra_driver_name = "sha512-ce",
102 .base.cra_priority = 200, 101 .base.cra_priority = 200,
103 .base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
104 .base.cra_blocksize = SHA512_BLOCK_SIZE, 102 .base.cra_blocksize = SHA512_BLOCK_SIZE,
105 .base.cra_module = THIS_MODULE, 103 .base.cra_module = THIS_MODULE,
106} }; 104} };
diff --git a/arch/arm64/crypto/sha512-glue.c b/arch/arm64/crypto/sha512-glue.c
index 27db4851e380..325b23b43a9b 100644
--- a/arch/arm64/crypto/sha512-glue.c
+++ b/arch/arm64/crypto/sha512-glue.c
@@ -63,7 +63,6 @@ static struct shash_alg algs[] = { {
63 .base.cra_name = "sha512", 63 .base.cra_name = "sha512",
64 .base.cra_driver_name = "sha512-arm64", 64 .base.cra_driver_name = "sha512-arm64",
65 .base.cra_priority = 150, 65 .base.cra_priority = 150,
66 .base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
67 .base.cra_blocksize = SHA512_BLOCK_SIZE, 66 .base.cra_blocksize = SHA512_BLOCK_SIZE,
68 .base.cra_module = THIS_MODULE, 67 .base.cra_module = THIS_MODULE,
69}, { 68}, {
@@ -76,7 +75,6 @@ static struct shash_alg algs[] = { {
76 .base.cra_name = "sha384", 75 .base.cra_name = "sha384",
77 .base.cra_driver_name = "sha384-arm64", 76 .base.cra_driver_name = "sha384-arm64",
78 .base.cra_priority = 150, 77 .base.cra_priority = 150,
79 .base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
80 .base.cra_blocksize = SHA384_BLOCK_SIZE, 78 .base.cra_blocksize = SHA384_BLOCK_SIZE,
81 .base.cra_module = THIS_MODULE, 79 .base.cra_module = THIS_MODULE,
82} }; 80} };
diff --git a/arch/arm64/crypto/sm3-ce-glue.c b/arch/arm64/crypto/sm3-ce-glue.c
index 3b4948f7e26f..88938a20d9b2 100644
--- 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 = {
72 .descsize = sizeof(struct sm3_state), 72 .descsize = sizeof(struct sm3_state),
73 .base.cra_name = "sm3", 73 .base.cra_name = "sm3",
74 .base.cra_driver_name = "sm3-ce", 74 .base.cra_driver_name = "sm3-ce",
75 .base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
76 .base.cra_blocksize = SM3_BLOCK_SIZE, 75 .base.cra_blocksize = SM3_BLOCK_SIZE,
77 .base.cra_module = THIS_MODULE, 76 .base.cra_module = THIS_MODULE,
78 .base.cra_priority = 200, 77 .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 af4c712f7afc..d1ed066e1a17 100644
--- 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 = {
182 .cra_name = "md5", 182 .cra_name = "md5",
183 .cra_driver_name= "octeon-md5", 183 .cra_driver_name= "octeon-md5",
184 .cra_priority = OCTEON_CR_OPCODE_PRIORITY, 184 .cra_priority = OCTEON_CR_OPCODE_PRIORITY,
185 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
186 .cra_blocksize = MD5_HMAC_BLOCK_SIZE, 185 .cra_blocksize = MD5_HMAC_BLOCK_SIZE,
187 .cra_module = THIS_MODULE, 186 .cra_module = THIS_MODULE,
188 } 187 }
diff --git a/arch/mips/cavium-octeon/crypto/octeon-sha1.c b/arch/mips/cavium-octeon/crypto/octeon-sha1.c
index 2b74b5b67cae..80d71e775936 100644
--- 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 = {
215 .cra_name = "sha1", 215 .cra_name = "sha1",
216 .cra_driver_name= "octeon-sha1", 216 .cra_driver_name= "octeon-sha1",
217 .cra_priority = OCTEON_CR_OPCODE_PRIORITY, 217 .cra_priority = OCTEON_CR_OPCODE_PRIORITY,
218 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
219 .cra_blocksize = SHA1_BLOCK_SIZE, 218 .cra_blocksize = SHA1_BLOCK_SIZE,
220 .cra_module = THIS_MODULE, 219 .cra_module = THIS_MODULE,
221 } 220 }
diff --git a/arch/mips/cavium-octeon/crypto/octeon-sha256.c b/arch/mips/cavium-octeon/crypto/octeon-sha256.c
index 97e96fead08a..8b931e640926 100644
--- 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] = { {
239 .cra_name = "sha256", 239 .cra_name = "sha256",
240 .cra_driver_name= "octeon-sha256", 240 .cra_driver_name= "octeon-sha256",
241 .cra_priority = OCTEON_CR_OPCODE_PRIORITY, 241 .cra_priority = OCTEON_CR_OPCODE_PRIORITY,
242 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
243 .cra_blocksize = SHA256_BLOCK_SIZE, 242 .cra_blocksize = SHA256_BLOCK_SIZE,
244 .cra_module = THIS_MODULE, 243 .cra_module = THIS_MODULE,
245 } 244 }
@@ -252,7 +251,6 @@ static struct shash_alg octeon_sha256_algs[2] = { {
252 .base = { 251 .base = {
253 .cra_name = "sha224", 252 .cra_name = "sha224",
254 .cra_driver_name= "octeon-sha224", 253 .cra_driver_name= "octeon-sha224",
255 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
256 .cra_blocksize = SHA224_BLOCK_SIZE, 254 .cra_blocksize = SHA224_BLOCK_SIZE,
257 .cra_module = THIS_MODULE, 255 .cra_module = THIS_MODULE,
258 } 256 }
diff --git a/arch/mips/cavium-octeon/crypto/octeon-sha512.c b/arch/mips/cavium-octeon/crypto/octeon-sha512.c
index d5fb3c6f22ae..6c9561496257 100644
--- 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] = { {
235 .cra_name = "sha512", 235 .cra_name = "sha512",
236 .cra_driver_name= "octeon-sha512", 236 .cra_driver_name= "octeon-sha512",
237 .cra_priority = OCTEON_CR_OPCODE_PRIORITY, 237 .cra_priority = OCTEON_CR_OPCODE_PRIORITY,
238 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
239 .cra_blocksize = SHA512_BLOCK_SIZE, 238 .cra_blocksize = SHA512_BLOCK_SIZE,
240 .cra_module = THIS_MODULE, 239 .cra_module = THIS_MODULE,
241 } 240 }
@@ -249,7 +248,6 @@ static struct shash_alg octeon_sha512_algs[2] = { {
249 .cra_name = "sha384", 248 .cra_name = "sha384",
250 .cra_driver_name= "octeon-sha384", 249 .cra_driver_name= "octeon-sha384",
251 .cra_priority = OCTEON_CR_OPCODE_PRIORITY, 250 .cra_priority = OCTEON_CR_OPCODE_PRIORITY,
252 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
253 .cra_blocksize = SHA384_BLOCK_SIZE, 251 .cra_blocksize = SHA384_BLOCK_SIZE,
254 .cra_module = THIS_MODULE, 252 .cra_module = THIS_MODULE,
255 } 253 }
diff --git a/arch/powerpc/crypto/md5-glue.c b/arch/powerpc/crypto/md5-glue.c
index 92289679b4c4..7e44cec37bdb 100644
--- a/arch/powerpc/crypto/md5-glue.c
+++ b/arch/powerpc/crypto/md5-glue.c
@@ -139,7 +139,6 @@ static struct shash_alg alg = {
139 .cra_name = "md5", 139 .cra_name = "md5",
140 .cra_driver_name= "md5-ppc", 140 .cra_driver_name= "md5-ppc",
141 .cra_priority = 200, 141 .cra_priority = 200,
142 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
143 .cra_blocksize = MD5_HMAC_BLOCK_SIZE, 142 .cra_blocksize = MD5_HMAC_BLOCK_SIZE,
144 .cra_module = THIS_MODULE, 143 .cra_module = THIS_MODULE,
145 } 144 }
diff --git a/arch/powerpc/crypto/sha1-spe-glue.c b/arch/powerpc/crypto/sha1-spe-glue.c
index f9ebc38d3fe7..9e1814d99318 100644
--- 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 = {
185 .cra_name = "sha1", 185 .cra_name = "sha1",
186 .cra_driver_name= "sha1-ppc-spe", 186 .cra_driver_name= "sha1-ppc-spe",
187 .cra_priority = 300, 187 .cra_priority = 300,
188 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
189 .cra_blocksize = SHA1_BLOCK_SIZE, 188 .cra_blocksize = SHA1_BLOCK_SIZE,
190 .cra_module = THIS_MODULE, 189 .cra_module = THIS_MODULE,
191 } 190 }
diff --git a/arch/powerpc/crypto/sha1.c b/arch/powerpc/crypto/sha1.c
index c154cebc1041..3911d5c254fa 100644
--- a/arch/powerpc/crypto/sha1.c
+++ b/arch/powerpc/crypto/sha1.c
@@ -132,7 +132,6 @@ static struct shash_alg alg = {
132 .base = { 132 .base = {
133 .cra_name = "sha1", 133 .cra_name = "sha1",
134 .cra_driver_name= "sha1-powerpc", 134 .cra_driver_name= "sha1-powerpc",
135 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
136 .cra_blocksize = SHA1_BLOCK_SIZE, 135 .cra_blocksize = SHA1_BLOCK_SIZE,
137 .cra_module = THIS_MODULE, 136 .cra_module = THIS_MODULE,
138 } 137 }
diff --git a/arch/powerpc/crypto/sha256-spe-glue.c b/arch/powerpc/crypto/sha256-spe-glue.c
index 718a079dcdbf..6227888dcf7e 100644
--- 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] = { {
231 .cra_name = "sha256", 231 .cra_name = "sha256",
232 .cra_driver_name= "sha256-ppc-spe", 232 .cra_driver_name= "sha256-ppc-spe",
233 .cra_priority = 300, 233 .cra_priority = 300,
234 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
235 .cra_blocksize = SHA256_BLOCK_SIZE, 234 .cra_blocksize = SHA256_BLOCK_SIZE,
236 .cra_module = THIS_MODULE, 235 .cra_module = THIS_MODULE,
237 } 236 }
@@ -248,7 +247,6 @@ static struct shash_alg algs[2] = { {
248 .cra_name = "sha224", 247 .cra_name = "sha224",
249 .cra_driver_name= "sha224-ppc-spe", 248 .cra_driver_name= "sha224-ppc-spe",
250 .cra_priority = 300, 249 .cra_priority = 300,
251 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
252 .cra_blocksize = SHA224_BLOCK_SIZE, 250 .cra_blocksize = SHA224_BLOCK_SIZE,
253 .cra_module = THIS_MODULE, 251 .cra_module = THIS_MODULE,
254 } 252 }
diff --git a/arch/s390/crypto/ghash_s390.c b/arch/s390/crypto/ghash_s390.c
index 3b7f96c9eead..86aed30fad3a 100644
--- a/arch/s390/crypto/ghash_s390.c
+++ b/arch/s390/crypto/ghash_s390.c
@@ -128,7 +128,6 @@ static struct shash_alg ghash_alg = {
128 .cra_name = "ghash", 128 .cra_name = "ghash",
129 .cra_driver_name = "ghash-s390", 129 .cra_driver_name = "ghash-s390",
130 .cra_priority = 300, 130 .cra_priority = 300,
131 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
132 .cra_blocksize = GHASH_BLOCK_SIZE, 131 .cra_blocksize = GHASH_BLOCK_SIZE,
133 .cra_ctxsize = sizeof(struct ghash_ctx), 132 .cra_ctxsize = sizeof(struct ghash_ctx),
134 .cra_module = THIS_MODULE, 133 .cra_module = THIS_MODULE,
diff --git a/arch/s390/crypto/sha1_s390.c b/arch/s390/crypto/sha1_s390.c
index a00c17f761c1..009572e8276d 100644
--- a/arch/s390/crypto/sha1_s390.c
+++ b/arch/s390/crypto/sha1_s390.c
@@ -78,7 +78,6 @@ static struct shash_alg alg = {
78 .cra_name = "sha1", 78 .cra_name = "sha1",
79 .cra_driver_name= "sha1-s390", 79 .cra_driver_name= "sha1-s390",
80 .cra_priority = 300, 80 .cra_priority = 300,
81 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
82 .cra_blocksize = SHA1_BLOCK_SIZE, 81 .cra_blocksize = SHA1_BLOCK_SIZE,
83 .cra_module = THIS_MODULE, 82 .cra_module = THIS_MODULE,
84 } 83 }
diff --git a/arch/s390/crypto/sha256_s390.c b/arch/s390/crypto/sha256_s390.c
index 944aa6b237cd..62833a1d8724 100644
--- a/arch/s390/crypto/sha256_s390.c
+++ b/arch/s390/crypto/sha256_s390.c
@@ -71,7 +71,6 @@ static struct shash_alg sha256_alg = {
71 .cra_name = "sha256", 71 .cra_name = "sha256",
72 .cra_driver_name= "sha256-s390", 72 .cra_driver_name= "sha256-s390",
73 .cra_priority = 300, 73 .cra_priority = 300,
74 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
75 .cra_blocksize = SHA256_BLOCK_SIZE, 74 .cra_blocksize = SHA256_BLOCK_SIZE,
76 .cra_module = THIS_MODULE, 75 .cra_module = THIS_MODULE,
77 } 76 }
@@ -108,7 +107,6 @@ static struct shash_alg sha224_alg = {
108 .cra_name = "sha224", 107 .cra_name = "sha224",
109 .cra_driver_name= "sha224-s390", 108 .cra_driver_name= "sha224-s390",
110 .cra_priority = 300, 109 .cra_priority = 300,
111 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
112 .cra_blocksize = SHA224_BLOCK_SIZE, 110 .cra_blocksize = SHA224_BLOCK_SIZE,
113 .cra_module = THIS_MODULE, 111 .cra_module = THIS_MODULE,
114 } 112 }
diff --git a/arch/s390/crypto/sha512_s390.c b/arch/s390/crypto/sha512_s390.c
index b17eded532b1..be589c340d15 100644
--- a/arch/s390/crypto/sha512_s390.c
+++ b/arch/s390/crypto/sha512_s390.c
@@ -76,7 +76,6 @@ static struct shash_alg sha512_alg = {
76 .cra_name = "sha512", 76 .cra_name = "sha512",
77 .cra_driver_name= "sha512-s390", 77 .cra_driver_name= "sha512-s390",
78 .cra_priority = 300, 78 .cra_priority = 300,
79 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
80 .cra_blocksize = SHA512_BLOCK_SIZE, 79 .cra_blocksize = SHA512_BLOCK_SIZE,
81 .cra_module = THIS_MODULE, 80 .cra_module = THIS_MODULE,
82 } 81 }
@@ -115,7 +114,6 @@ static struct shash_alg sha384_alg = {
115 .cra_name = "sha384", 114 .cra_name = "sha384",
116 .cra_driver_name= "sha384-s390", 115 .cra_driver_name= "sha384-s390",
117 .cra_priority = 300, 116 .cra_priority = 300,
118 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
119 .cra_blocksize = SHA384_BLOCK_SIZE, 117 .cra_blocksize = SHA384_BLOCK_SIZE,
120 .cra_ctxsize = sizeof(struct s390_sha_ctx), 118 .cra_ctxsize = sizeof(struct s390_sha_ctx),
121 .cra_module = THIS_MODULE, 119 .cra_module = THIS_MODULE,
diff --git a/arch/sparc/crypto/md5_glue.c b/arch/sparc/crypto/md5_glue.c
index c9d2b922734b..bc9cc26efa3d 100644
--- a/arch/sparc/crypto/md5_glue.c
+++ b/arch/sparc/crypto/md5_glue.c
@@ -144,7 +144,6 @@ static struct shash_alg alg = {
144 .cra_name = "md5", 144 .cra_name = "md5",
145 .cra_driver_name= "md5-sparc64", 145 .cra_driver_name= "md5-sparc64",
146 .cra_priority = SPARC_CR_OPCODE_PRIORITY, 146 .cra_priority = SPARC_CR_OPCODE_PRIORITY,
147 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
148 .cra_blocksize = MD5_HMAC_BLOCK_SIZE, 147 .cra_blocksize = MD5_HMAC_BLOCK_SIZE,
149 .cra_module = THIS_MODULE, 148 .cra_module = THIS_MODULE,
150 } 149 }
diff --git a/arch/sparc/crypto/sha1_glue.c b/arch/sparc/crypto/sha1_glue.c
index 1b3e47accc74..4d6d7faf728e 100644
--- a/arch/sparc/crypto/sha1_glue.c
+++ b/arch/sparc/crypto/sha1_glue.c
@@ -139,7 +139,6 @@ static struct shash_alg alg = {
139 .cra_name = "sha1", 139 .cra_name = "sha1",
140 .cra_driver_name= "sha1-sparc64", 140 .cra_driver_name= "sha1-sparc64",
141 .cra_priority = SPARC_CR_OPCODE_PRIORITY, 141 .cra_priority = SPARC_CR_OPCODE_PRIORITY,
142 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
143 .cra_blocksize = SHA1_BLOCK_SIZE, 142 .cra_blocksize = SHA1_BLOCK_SIZE,
144 .cra_module = THIS_MODULE, 143 .cra_module = THIS_MODULE,
145 } 144 }
diff --git a/arch/sparc/crypto/sha256_glue.c b/arch/sparc/crypto/sha256_glue.c
index 285268ca9279..54c4de2db188 100644
--- a/arch/sparc/crypto/sha256_glue.c
+++ b/arch/sparc/crypto/sha256_glue.c
@@ -169,7 +169,6 @@ static struct shash_alg sha256 = {
169 .cra_name = "sha256", 169 .cra_name = "sha256",
170 .cra_driver_name= "sha256-sparc64", 170 .cra_driver_name= "sha256-sparc64",
171 .cra_priority = SPARC_CR_OPCODE_PRIORITY, 171 .cra_priority = SPARC_CR_OPCODE_PRIORITY,
172 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
173 .cra_blocksize = SHA256_BLOCK_SIZE, 172 .cra_blocksize = SHA256_BLOCK_SIZE,
174 .cra_module = THIS_MODULE, 173 .cra_module = THIS_MODULE,
175 } 174 }
@@ -185,7 +184,6 @@ static struct shash_alg sha224 = {
185 .cra_name = "sha224", 184 .cra_name = "sha224",
186 .cra_driver_name= "sha224-sparc64", 185 .cra_driver_name= "sha224-sparc64",
187 .cra_priority = SPARC_CR_OPCODE_PRIORITY, 186 .cra_priority = SPARC_CR_OPCODE_PRIORITY,
188 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
189 .cra_blocksize = SHA224_BLOCK_SIZE, 187 .cra_blocksize = SHA224_BLOCK_SIZE,
190 .cra_module = THIS_MODULE, 188 .cra_module = THIS_MODULE,
191 } 189 }
diff --git a/arch/sparc/crypto/sha512_glue.c b/arch/sparc/crypto/sha512_glue.c
index 11eb36c3fc8c..4c55e97a4408 100644
--- a/arch/sparc/crypto/sha512_glue.c
+++ b/arch/sparc/crypto/sha512_glue.c
@@ -154,7 +154,6 @@ static struct shash_alg sha512 = {
154 .cra_name = "sha512", 154 .cra_name = "sha512",
155 .cra_driver_name= "sha512-sparc64", 155 .cra_driver_name= "sha512-sparc64",
156 .cra_priority = SPARC_CR_OPCODE_PRIORITY, 156 .cra_priority = SPARC_CR_OPCODE_PRIORITY,
157 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
158 .cra_blocksize = SHA512_BLOCK_SIZE, 157 .cra_blocksize = SHA512_BLOCK_SIZE,
159 .cra_module = THIS_MODULE, 158 .cra_module = THIS_MODULE,
160 } 159 }
@@ -170,7 +169,6 @@ static struct shash_alg sha384 = {
170 .cra_name = "sha384", 169 .cra_name = "sha384",
171 .cra_driver_name= "sha384-sparc64", 170 .cra_driver_name= "sha384-sparc64",
172 .cra_priority = SPARC_CR_OPCODE_PRIORITY, 171 .cra_priority = SPARC_CR_OPCODE_PRIORITY,
173 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
174 .cra_blocksize = SHA384_BLOCK_SIZE, 172 .cra_blocksize = SHA384_BLOCK_SIZE,
175 .cra_module = THIS_MODULE, 173 .cra_module = THIS_MODULE,
176 } 174 }
diff --git a/arch/x86/crypto/ghash-clmulni-intel_glue.c b/arch/x86/crypto/ghash-clmulni-intel_glue.c
index 2ddbe3a1868b..b1430e92e638 100644
--- 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 = {
154 .cra_name = "__ghash", 154 .cra_name = "__ghash",
155 .cra_driver_name = "__ghash-pclmulqdqni", 155 .cra_driver_name = "__ghash-pclmulqdqni",
156 .cra_priority = 0, 156 .cra_priority = 0,
157 .cra_flags = CRYPTO_ALG_TYPE_SHASH | 157 .cra_flags = CRYPTO_ALG_INTERNAL,
158 CRYPTO_ALG_INTERNAL,
159 .cra_blocksize = GHASH_BLOCK_SIZE, 158 .cra_blocksize = GHASH_BLOCK_SIZE,
160 .cra_ctxsize = sizeof(struct ghash_ctx), 159 .cra_ctxsize = sizeof(struct ghash_ctx),
161 .cra_module = THIS_MODULE, 160 .cra_module = THIS_MODULE,
diff --git a/arch/x86/crypto/poly1305_glue.c b/arch/x86/crypto/poly1305_glue.c
index 790377797544..f012b7e28ad1 100644
--- a/arch/x86/crypto/poly1305_glue.c
+++ b/arch/x86/crypto/poly1305_glue.c
@@ -169,7 +169,6 @@ static struct shash_alg alg = {
169 .cra_name = "poly1305", 169 .cra_name = "poly1305",
170 .cra_driver_name = "poly1305-simd", 170 .cra_driver_name = "poly1305-simd",
171 .cra_priority = 300, 171 .cra_priority = 300,
172 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
173 .cra_blocksize = POLY1305_BLOCK_SIZE, 172 .cra_blocksize = POLY1305_BLOCK_SIZE,
174 .cra_module = THIS_MODULE, 173 .cra_module = THIS_MODULE,
175 }, 174 },
diff --git a/arch/x86/crypto/sha1_ssse3_glue.c b/arch/x86/crypto/sha1_ssse3_glue.c
index fc61739150e7..7391c7de72c7 100644
--- 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 = {
104 .cra_name = "sha1", 104 .cra_name = "sha1",
105 .cra_driver_name = "sha1-ssse3", 105 .cra_driver_name = "sha1-ssse3",
106 .cra_priority = 150, 106 .cra_priority = 150,
107 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
108 .cra_blocksize = SHA1_BLOCK_SIZE, 107 .cra_blocksize = SHA1_BLOCK_SIZE,
109 .cra_module = THIS_MODULE, 108 .cra_module = THIS_MODULE,
110 } 109 }
@@ -157,7 +156,6 @@ static struct shash_alg sha1_avx_alg = {
157 .cra_name = "sha1", 156 .cra_name = "sha1",
158 .cra_driver_name = "sha1-avx", 157 .cra_driver_name = "sha1-avx",
159 .cra_priority = 160, 158 .cra_priority = 160,
160 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
161 .cra_blocksize = SHA1_BLOCK_SIZE, 159 .cra_blocksize = SHA1_BLOCK_SIZE,
162 .cra_module = THIS_MODULE, 160 .cra_module = THIS_MODULE,
163 } 161 }
@@ -249,7 +247,6 @@ static struct shash_alg sha1_avx2_alg = {
249 .cra_name = "sha1", 247 .cra_name = "sha1",
250 .cra_driver_name = "sha1-avx2", 248 .cra_driver_name = "sha1-avx2",
251 .cra_priority = 170, 249 .cra_priority = 170,
252 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
253 .cra_blocksize = SHA1_BLOCK_SIZE, 250 .cra_blocksize = SHA1_BLOCK_SIZE,
254 .cra_module = THIS_MODULE, 251 .cra_module = THIS_MODULE,
255 } 252 }
@@ -307,7 +304,6 @@ static struct shash_alg sha1_ni_alg = {
307 .cra_name = "sha1", 304 .cra_name = "sha1",
308 .cra_driver_name = "sha1-ni", 305 .cra_driver_name = "sha1-ni",
309 .cra_priority = 250, 306 .cra_priority = 250,
310 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
311 .cra_blocksize = SHA1_BLOCK_SIZE, 307 .cra_blocksize = SHA1_BLOCK_SIZE,
312 .cra_module = THIS_MODULE, 308 .cra_module = THIS_MODULE,
313 } 309 }
diff --git a/arch/x86/crypto/sha256_ssse3_glue.c b/arch/x86/crypto/sha256_ssse3_glue.c
index 9e79baf03a4b..773a873d2b28 100644
--- 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[] = { {
109 .cra_name = "sha256", 109 .cra_name = "sha256",
110 .cra_driver_name = "sha256-ssse3", 110 .cra_driver_name = "sha256-ssse3",
111 .cra_priority = 150, 111 .cra_priority = 150,
112 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
113 .cra_blocksize = SHA256_BLOCK_SIZE, 112 .cra_blocksize = SHA256_BLOCK_SIZE,
114 .cra_module = THIS_MODULE, 113 .cra_module = THIS_MODULE,
115 } 114 }
@@ -124,7 +123,6 @@ static struct shash_alg sha256_ssse3_algs[] = { {
124 .cra_name = "sha224", 123 .cra_name = "sha224",
125 .cra_driver_name = "sha224-ssse3", 124 .cra_driver_name = "sha224-ssse3",
126 .cra_priority = 150, 125 .cra_priority = 150,
127 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
128 .cra_blocksize = SHA224_BLOCK_SIZE, 126 .cra_blocksize = SHA224_BLOCK_SIZE,
129 .cra_module = THIS_MODULE, 127 .cra_module = THIS_MODULE,
130 } 128 }
@@ -177,7 +175,6 @@ static struct shash_alg sha256_avx_algs[] = { {
177 .cra_name = "sha256", 175 .cra_name = "sha256",
178 .cra_driver_name = "sha256-avx", 176 .cra_driver_name = "sha256-avx",
179 .cra_priority = 160, 177 .cra_priority = 160,
180 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
181 .cra_blocksize = SHA256_BLOCK_SIZE, 178 .cra_blocksize = SHA256_BLOCK_SIZE,
182 .cra_module = THIS_MODULE, 179 .cra_module = THIS_MODULE,
183 } 180 }
@@ -192,7 +189,6 @@ static struct shash_alg sha256_avx_algs[] = { {
192 .cra_name = "sha224", 189 .cra_name = "sha224",
193 .cra_driver_name = "sha224-avx", 190 .cra_driver_name = "sha224-avx",
194 .cra_priority = 160, 191 .cra_priority = 160,
195 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
196 .cra_blocksize = SHA224_BLOCK_SIZE, 192 .cra_blocksize = SHA224_BLOCK_SIZE,
197 .cra_module = THIS_MODULE, 193 .cra_module = THIS_MODULE,
198 } 194 }
@@ -261,7 +257,6 @@ static struct shash_alg sha256_avx2_algs[] = { {
261 .cra_name = "sha256", 257 .cra_name = "sha256",
262 .cra_driver_name = "sha256-avx2", 258 .cra_driver_name = "sha256-avx2",
263 .cra_priority = 170, 259 .cra_priority = 170,
264 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
265 .cra_blocksize = SHA256_BLOCK_SIZE, 260 .cra_blocksize = SHA256_BLOCK_SIZE,
266 .cra_module = THIS_MODULE, 261 .cra_module = THIS_MODULE,
267 } 262 }
@@ -276,7 +271,6 @@ static struct shash_alg sha256_avx2_algs[] = { {
276 .cra_name = "sha224", 271 .cra_name = "sha224",
277 .cra_driver_name = "sha224-avx2", 272 .cra_driver_name = "sha224-avx2",
278 .cra_priority = 170, 273 .cra_priority = 170,
279 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
280 .cra_blocksize = SHA224_BLOCK_SIZE, 274 .cra_blocksize = SHA224_BLOCK_SIZE,
281 .cra_module = THIS_MODULE, 275 .cra_module = THIS_MODULE,
282 } 276 }
@@ -343,7 +337,6 @@ static struct shash_alg sha256_ni_algs[] = { {
343 .cra_name = "sha256", 337 .cra_name = "sha256",
344 .cra_driver_name = "sha256-ni", 338 .cra_driver_name = "sha256-ni",
345 .cra_priority = 250, 339 .cra_priority = 250,
346 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
347 .cra_blocksize = SHA256_BLOCK_SIZE, 340 .cra_blocksize = SHA256_BLOCK_SIZE,
348 .cra_module = THIS_MODULE, 341 .cra_module = THIS_MODULE,
349 } 342 }
@@ -358,7 +351,6 @@ static struct shash_alg sha256_ni_algs[] = { {
358 .cra_name = "sha224", 351 .cra_name = "sha224",
359 .cra_driver_name = "sha224-ni", 352 .cra_driver_name = "sha224-ni",
360 .cra_priority = 250, 353 .cra_priority = 250,
361 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
362 .cra_blocksize = SHA224_BLOCK_SIZE, 354 .cra_blocksize = SHA224_BLOCK_SIZE,
363 .cra_module = THIS_MODULE, 355 .cra_module = THIS_MODULE,
364 } 356 }
diff --git a/arch/x86/crypto/sha512_ssse3_glue.c b/arch/x86/crypto/sha512_ssse3_glue.c
index 2b0e2a6825f3..f1b811b60ba6 100644
--- 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[] = { {
109 .cra_name = "sha512", 109 .cra_name = "sha512",
110 .cra_driver_name = "sha512-ssse3", 110 .cra_driver_name = "sha512-ssse3",
111 .cra_priority = 150, 111 .cra_priority = 150,
112 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
113 .cra_blocksize = SHA512_BLOCK_SIZE, 112 .cra_blocksize = SHA512_BLOCK_SIZE,
114 .cra_module = THIS_MODULE, 113 .cra_module = THIS_MODULE,
115 } 114 }
@@ -124,7 +123,6 @@ static struct shash_alg sha512_ssse3_algs[] = { {
124 .cra_name = "sha384", 123 .cra_name = "sha384",
125 .cra_driver_name = "sha384-ssse3", 124 .cra_driver_name = "sha384-ssse3",
126 .cra_priority = 150, 125 .cra_priority = 150,
127 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
128 .cra_blocksize = SHA384_BLOCK_SIZE, 126 .cra_blocksize = SHA384_BLOCK_SIZE,
129 .cra_module = THIS_MODULE, 127 .cra_module = THIS_MODULE,
130 } 128 }
@@ -188,7 +186,6 @@ static struct shash_alg sha512_avx_algs[] = { {
188 .cra_name = "sha512", 186 .cra_name = "sha512",
189 .cra_driver_name = "sha512-avx", 187 .cra_driver_name = "sha512-avx",
190 .cra_priority = 160, 188 .cra_priority = 160,
191 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
192 .cra_blocksize = SHA512_BLOCK_SIZE, 189 .cra_blocksize = SHA512_BLOCK_SIZE,
193 .cra_module = THIS_MODULE, 190 .cra_module = THIS_MODULE,
194 } 191 }
@@ -203,7 +200,6 @@ static struct shash_alg sha512_avx_algs[] = { {
203 .cra_name = "sha384", 200 .cra_name = "sha384",
204 .cra_driver_name = "sha384-avx", 201 .cra_driver_name = "sha384-avx",
205 .cra_priority = 160, 202 .cra_priority = 160,
206 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
207 .cra_blocksize = SHA384_BLOCK_SIZE, 203 .cra_blocksize = SHA384_BLOCK_SIZE,
208 .cra_module = THIS_MODULE, 204 .cra_module = THIS_MODULE,
209 } 205 }
@@ -261,7 +257,6 @@ static struct shash_alg sha512_avx2_algs[] = { {
261 .cra_name = "sha512", 257 .cra_name = "sha512",
262 .cra_driver_name = "sha512-avx2", 258 .cra_driver_name = "sha512-avx2",
263 .cra_priority = 170, 259 .cra_priority = 170,
264 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
265 .cra_blocksize = SHA512_BLOCK_SIZE, 260 .cra_blocksize = SHA512_BLOCK_SIZE,
266 .cra_module = THIS_MODULE, 261 .cra_module = THIS_MODULE,
267 } 262 }
@@ -276,7 +271,6 @@ static struct shash_alg sha512_avx2_algs[] = { {
276 .cra_name = "sha384", 271 .cra_name = "sha384",
277 .cra_driver_name = "sha384-avx2", 272 .cra_driver_name = "sha384-avx2",
278 .cra_priority = 170, 273 .cra_priority = 170,
279 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
280 .cra_blocksize = SHA384_BLOCK_SIZE, 274 .cra_blocksize = SHA384_BLOCK_SIZE,
281 .cra_module = THIS_MODULE, 275 .cra_module = THIS_MODULE,
282 } 276 }
diff --git a/crypto/crypto_null.c b/crypto/crypto_null.c
index 20ff2c746e0b..0959b268966c 100644
--- a/crypto/crypto_null.c
+++ b/crypto/crypto_null.c
@@ -104,7 +104,6 @@ static struct shash_alg digest_null = {
104 .final = null_final, 104 .final = null_final,
105 .base = { 105 .base = {
106 .cra_name = "digest_null", 106 .cra_name = "digest_null",
107 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
108 .cra_blocksize = NULL_BLOCK_SIZE, 107 .cra_blocksize = NULL_BLOCK_SIZE,
109 .cra_module = THIS_MODULE, 108 .cra_module = THIS_MODULE,
110 } 109 }
diff --git a/crypto/ghash-generic.c b/crypto/ghash-generic.c
index 1bffb3f712dd..d9f192b953b2 100644
--- a/crypto/ghash-generic.c
+++ b/crypto/ghash-generic.c
@@ -132,7 +132,6 @@ static struct shash_alg ghash_alg = {
132 .cra_name = "ghash", 132 .cra_name = "ghash",
133 .cra_driver_name = "ghash-generic", 133 .cra_driver_name = "ghash-generic",
134 .cra_priority = 100, 134 .cra_priority = 100,
135 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
136 .cra_blocksize = GHASH_BLOCK_SIZE, 135 .cra_blocksize = GHASH_BLOCK_SIZE,
137 .cra_ctxsize = sizeof(struct ghash_ctx), 136 .cra_ctxsize = sizeof(struct ghash_ctx),
138 .cra_module = THIS_MODULE, 137 .cra_module = THIS_MODULE,
diff --git a/crypto/md4.c b/crypto/md4.c
index 810fefb0a007..9965ec40d9f9 100644
--- a/crypto/md4.c
+++ b/crypto/md4.c
@@ -217,7 +217,6 @@ static struct shash_alg alg = {
217 .descsize = sizeof(struct md4_ctx), 217 .descsize = sizeof(struct md4_ctx),
218 .base = { 218 .base = {
219 .cra_name = "md4", 219 .cra_name = "md4",
220 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
221 .cra_blocksize = MD4_HMAC_BLOCK_SIZE, 220 .cra_blocksize = MD4_HMAC_BLOCK_SIZE,
222 .cra_module = THIS_MODULE, 221 .cra_module = THIS_MODULE,
223 } 222 }
diff --git a/crypto/md5.c b/crypto/md5.c
index f776ef43d621..94dd78144ba3 100644
--- a/crypto/md5.c
+++ b/crypto/md5.c
@@ -229,7 +229,6 @@ static struct shash_alg alg = {
229 .statesize = sizeof(struct md5_state), 229 .statesize = sizeof(struct md5_state),
230 .base = { 230 .base = {
231 .cra_name = "md5", 231 .cra_name = "md5",
232 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
233 .cra_blocksize = MD5_HMAC_BLOCK_SIZE, 232 .cra_blocksize = MD5_HMAC_BLOCK_SIZE,
234 .cra_module = THIS_MODULE, 233 .cra_module = THIS_MODULE,
235 } 234 }
diff --git a/crypto/poly1305_generic.c b/crypto/poly1305_generic.c
index b7a3a0613a30..47d3a6b83931 100644
--- a/crypto/poly1305_generic.c
+++ b/crypto/poly1305_generic.c
@@ -279,7 +279,6 @@ static struct shash_alg poly1305_alg = {
279 .cra_name = "poly1305", 279 .cra_name = "poly1305",
280 .cra_driver_name = "poly1305-generic", 280 .cra_driver_name = "poly1305-generic",
281 .cra_priority = 100, 281 .cra_priority = 100,
282 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
283 .cra_blocksize = POLY1305_BLOCK_SIZE, 282 .cra_blocksize = POLY1305_BLOCK_SIZE,
284 .cra_module = THIS_MODULE, 283 .cra_module = THIS_MODULE,
285 }, 284 },
diff --git a/crypto/rmd128.c b/crypto/rmd128.c
index 40e053b97b69..5f4472256e27 100644
--- a/crypto/rmd128.c
+++ b/crypto/rmd128.c
@@ -303,7 +303,6 @@ static struct shash_alg alg = {
303 .descsize = sizeof(struct rmd128_ctx), 303 .descsize = sizeof(struct rmd128_ctx),
304 .base = { 304 .base = {
305 .cra_name = "rmd128", 305 .cra_name = "rmd128",
306 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
307 .cra_blocksize = RMD128_BLOCK_SIZE, 306 .cra_blocksize = RMD128_BLOCK_SIZE,
308 .cra_module = THIS_MODULE, 307 .cra_module = THIS_MODULE,
309 } 308 }
diff --git a/crypto/rmd160.c b/crypto/rmd160.c
index 5f3e6ea35268..737645344d1c 100644
--- a/crypto/rmd160.c
+++ b/crypto/rmd160.c
@@ -347,7 +347,6 @@ static struct shash_alg alg = {
347 .descsize = sizeof(struct rmd160_ctx), 347 .descsize = sizeof(struct rmd160_ctx),
348 .base = { 348 .base = {
349 .cra_name = "rmd160", 349 .cra_name = "rmd160",
350 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
351 .cra_blocksize = RMD160_BLOCK_SIZE, 350 .cra_blocksize = RMD160_BLOCK_SIZE,
352 .cra_module = THIS_MODULE, 351 .cra_module = THIS_MODULE,
353 } 352 }
diff --git a/crypto/rmd256.c b/crypto/rmd256.c
index f50c025cc962..0afbb5af4499 100644
--- a/crypto/rmd256.c
+++ b/crypto/rmd256.c
@@ -322,7 +322,6 @@ static struct shash_alg alg = {
322 .descsize = sizeof(struct rmd256_ctx), 322 .descsize = sizeof(struct rmd256_ctx),
323 .base = { 323 .base = {
324 .cra_name = "rmd256", 324 .cra_name = "rmd256",
325 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
326 .cra_blocksize = RMD256_BLOCK_SIZE, 325 .cra_blocksize = RMD256_BLOCK_SIZE,
327 .cra_module = THIS_MODULE, 326 .cra_module = THIS_MODULE,
328 } 327 }
diff --git a/crypto/rmd320.c b/crypto/rmd320.c
index e1315e4869e8..ab3cf93624d2 100644
--- a/crypto/rmd320.c
+++ b/crypto/rmd320.c
@@ -371,7 +371,6 @@ static struct shash_alg alg = {
371 .descsize = sizeof(struct rmd320_ctx), 371 .descsize = sizeof(struct rmd320_ctx),
372 .base = { 372 .base = {
373 .cra_name = "rmd320", 373 .cra_name = "rmd320",
374 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
375 .cra_blocksize = RMD320_BLOCK_SIZE, 374 .cra_blocksize = RMD320_BLOCK_SIZE,
376 .cra_module = THIS_MODULE, 375 .cra_module = THIS_MODULE,
377 } 376 }
diff --git a/crypto/sha1_generic.c b/crypto/sha1_generic.c
index a3d701632ca2..2af64ef81f40 100644
--- a/crypto/sha1_generic.c
+++ b/crypto/sha1_generic.c
@@ -77,7 +77,6 @@ static struct shash_alg alg = {
77 .cra_name = "sha1", 77 .cra_name = "sha1",
78 .cra_driver_name= "sha1-generic", 78 .cra_driver_name= "sha1-generic",
79 .cra_priority = 100, 79 .cra_priority = 100,
80 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
81 .cra_blocksize = SHA1_BLOCK_SIZE, 80 .cra_blocksize = SHA1_BLOCK_SIZE,
82 .cra_module = THIS_MODULE, 81 .cra_module = THIS_MODULE,
83 } 82 }
diff --git a/crypto/sha256_generic.c b/crypto/sha256_generic.c
index dfcb7beb73a7..1e5ba6649e8d 100644
--- a/crypto/sha256_generic.c
+++ b/crypto/sha256_generic.c
@@ -272,7 +272,6 @@ static struct shash_alg sha256_algs[2] = { {
272 .cra_name = "sha256", 272 .cra_name = "sha256",
273 .cra_driver_name= "sha256-generic", 273 .cra_driver_name= "sha256-generic",
274 .cra_priority = 100, 274 .cra_priority = 100,
275 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
276 .cra_blocksize = SHA256_BLOCK_SIZE, 275 .cra_blocksize = SHA256_BLOCK_SIZE,
277 .cra_module = THIS_MODULE, 276 .cra_module = THIS_MODULE,
278 } 277 }
@@ -287,7 +286,6 @@ static struct shash_alg sha256_algs[2] = { {
287 .cra_name = "sha224", 286 .cra_name = "sha224",
288 .cra_driver_name= "sha224-generic", 287 .cra_driver_name= "sha224-generic",
289 .cra_priority = 100, 288 .cra_priority = 100,
290 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
291 .cra_blocksize = SHA224_BLOCK_SIZE, 289 .cra_blocksize = SHA224_BLOCK_SIZE,
292 .cra_module = THIS_MODULE, 290 .cra_module = THIS_MODULE,
293 } 291 }
diff --git a/crypto/sha3_generic.c b/crypto/sha3_generic.c
index 264ec12c0b9c..153fe33b8c9b 100644
--- a/crypto/sha3_generic.c
+++ b/crypto/sha3_generic.c
@@ -250,7 +250,6 @@ static struct shash_alg algs[] = { {
250 .descsize = sizeof(struct sha3_state), 250 .descsize = sizeof(struct sha3_state),
251 .base.cra_name = "sha3-224", 251 .base.cra_name = "sha3-224",
252 .base.cra_driver_name = "sha3-224-generic", 252 .base.cra_driver_name = "sha3-224-generic",
253 .base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
254 .base.cra_blocksize = SHA3_224_BLOCK_SIZE, 253 .base.cra_blocksize = SHA3_224_BLOCK_SIZE,
255 .base.cra_module = THIS_MODULE, 254 .base.cra_module = THIS_MODULE,
256}, { 255}, {
@@ -261,7 +260,6 @@ static struct shash_alg algs[] = { {
261 .descsize = sizeof(struct sha3_state), 260 .descsize = sizeof(struct sha3_state),
262 .base.cra_name = "sha3-256", 261 .base.cra_name = "sha3-256",
263 .base.cra_driver_name = "sha3-256-generic", 262 .base.cra_driver_name = "sha3-256-generic",
264 .base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
265 .base.cra_blocksize = SHA3_256_BLOCK_SIZE, 263 .base.cra_blocksize = SHA3_256_BLOCK_SIZE,
266 .base.cra_module = THIS_MODULE, 264 .base.cra_module = THIS_MODULE,
267}, { 265}, {
@@ -272,7 +270,6 @@ static struct shash_alg algs[] = { {
272 .descsize = sizeof(struct sha3_state), 270 .descsize = sizeof(struct sha3_state),
273 .base.cra_name = "sha3-384", 271 .base.cra_name = "sha3-384",
274 .base.cra_driver_name = "sha3-384-generic", 272 .base.cra_driver_name = "sha3-384-generic",
275 .base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
276 .base.cra_blocksize = SHA3_384_BLOCK_SIZE, 273 .base.cra_blocksize = SHA3_384_BLOCK_SIZE,
277 .base.cra_module = THIS_MODULE, 274 .base.cra_module = THIS_MODULE,
278}, { 275}, {
@@ -283,7 +280,6 @@ static struct shash_alg algs[] = { {
283 .descsize = sizeof(struct sha3_state), 280 .descsize = sizeof(struct sha3_state),
284 .base.cra_name = "sha3-512", 281 .base.cra_name = "sha3-512",
285 .base.cra_driver_name = "sha3-512-generic", 282 .base.cra_driver_name = "sha3-512-generic",
286 .base.cra_flags = CRYPTO_ALG_TYPE_SHASH,
287 .base.cra_blocksize = SHA3_512_BLOCK_SIZE, 283 .base.cra_blocksize = SHA3_512_BLOCK_SIZE,
288 .base.cra_module = THIS_MODULE, 284 .base.cra_module = THIS_MODULE,
289} }; 285} };
diff --git a/crypto/sha512_generic.c b/crypto/sha512_generic.c
index 55377b1cba6b..4097cd555eb6 100644
--- a/crypto/sha512_generic.c
+++ b/crypto/sha512_generic.c
@@ -194,7 +194,6 @@ static struct shash_alg sha512_algs[2] = { {
194 .cra_name = "sha512", 194 .cra_name = "sha512",
195 .cra_driver_name = "sha512-generic", 195 .cra_driver_name = "sha512-generic",
196 .cra_priority = 100, 196 .cra_priority = 100,
197 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
198 .cra_blocksize = SHA512_BLOCK_SIZE, 197 .cra_blocksize = SHA512_BLOCK_SIZE,
199 .cra_module = THIS_MODULE, 198 .cra_module = THIS_MODULE,
200 } 199 }
@@ -209,7 +208,6 @@ static struct shash_alg sha512_algs[2] = { {
209 .cra_name = "sha384", 208 .cra_name = "sha384",
210 .cra_driver_name = "sha384-generic", 209 .cra_driver_name = "sha384-generic",
211 .cra_priority = 100, 210 .cra_priority = 100,
212 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
213 .cra_blocksize = SHA384_BLOCK_SIZE, 211 .cra_blocksize = SHA384_BLOCK_SIZE,
214 .cra_module = THIS_MODULE, 212 .cra_module = THIS_MODULE,
215 } 213 }
diff --git a/crypto/sm3_generic.c b/crypto/sm3_generic.c
index 9e823d99f095..9a5c60f08aad 100644
--- a/crypto/sm3_generic.c
+++ b/crypto/sm3_generic.c
@@ -184,7 +184,6 @@ static struct shash_alg sm3_alg = {
184 .base = { 184 .base = {
185 .cra_name = "sm3", 185 .cra_name = "sm3",
186 .cra_driver_name = "sm3-generic", 186 .cra_driver_name = "sm3-generic",
187 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
188 .cra_blocksize = SM3_BLOCK_SIZE, 187 .cra_blocksize = SM3_BLOCK_SIZE,
189 .cra_module = THIS_MODULE, 188 .cra_module = THIS_MODULE,
190 } 189 }
diff --git a/crypto/tgr192.c b/crypto/tgr192.c
index 321bc6ff2a9d..022d3dd76c3b 100644
--- a/crypto/tgr192.c
+++ b/crypto/tgr192.c
@@ -636,7 +636,6 @@ static struct shash_alg tgr_algs[3] = { {
636 .descsize = sizeof(struct tgr192_ctx), 636 .descsize = sizeof(struct tgr192_ctx),
637 .base = { 637 .base = {
638 .cra_name = "tgr192", 638 .cra_name = "tgr192",
639 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
640 .cra_blocksize = TGR192_BLOCK_SIZE, 639 .cra_blocksize = TGR192_BLOCK_SIZE,
641 .cra_module = THIS_MODULE, 640 .cra_module = THIS_MODULE,
642 } 641 }
@@ -648,7 +647,6 @@ static struct shash_alg tgr_algs[3] = { {
648 .descsize = sizeof(struct tgr192_ctx), 647 .descsize = sizeof(struct tgr192_ctx),
649 .base = { 648 .base = {
650 .cra_name = "tgr160", 649 .cra_name = "tgr160",
651 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
652 .cra_blocksize = TGR192_BLOCK_SIZE, 650 .cra_blocksize = TGR192_BLOCK_SIZE,
653 .cra_module = THIS_MODULE, 651 .cra_module = THIS_MODULE,
654 } 652 }
@@ -660,7 +658,6 @@ static struct shash_alg tgr_algs[3] = { {
660 .descsize = sizeof(struct tgr192_ctx), 658 .descsize = sizeof(struct tgr192_ctx),
661 .base = { 659 .base = {
662 .cra_name = "tgr128", 660 .cra_name = "tgr128",
663 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
664 .cra_blocksize = TGR192_BLOCK_SIZE, 661 .cra_blocksize = TGR192_BLOCK_SIZE,
665 .cra_module = THIS_MODULE, 662 .cra_module = THIS_MODULE,
666 } 663 }
diff --git a/crypto/wp512.c b/crypto/wp512.c
index 7ee5a043a988..149e577fb772 100644
--- a/crypto/wp512.c
+++ b/crypto/wp512.c
@@ -1127,7 +1127,6 @@ static struct shash_alg wp_algs[3] = { {
1127 .descsize = sizeof(struct wp512_ctx), 1127 .descsize = sizeof(struct wp512_ctx),
1128 .base = { 1128 .base = {
1129 .cra_name = "wp512", 1129 .cra_name = "wp512",
1130 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
1131 .cra_blocksize = WP512_BLOCK_SIZE, 1130 .cra_blocksize = WP512_BLOCK_SIZE,
1132 .cra_module = THIS_MODULE, 1131 .cra_module = THIS_MODULE,
1133 } 1132 }
@@ -1139,7 +1138,6 @@ static struct shash_alg wp_algs[3] = { {
1139 .descsize = sizeof(struct wp512_ctx), 1138 .descsize = sizeof(struct wp512_ctx),
1140 .base = { 1139 .base = {
1141 .cra_name = "wp384", 1140 .cra_name = "wp384",
1142 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
1143 .cra_blocksize = WP512_BLOCK_SIZE, 1141 .cra_blocksize = WP512_BLOCK_SIZE,
1144 .cra_module = THIS_MODULE, 1142 .cra_module = THIS_MODULE,
1145 } 1143 }
@@ -1151,7 +1149,6 @@ static struct shash_alg wp_algs[3] = { {
1151 .descsize = sizeof(struct wp512_ctx), 1149 .descsize = sizeof(struct wp512_ctx),
1152 .base = { 1150 .base = {
1153 .cra_name = "wp256", 1151 .cra_name = "wp256",
1154 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
1155 .cra_blocksize = WP512_BLOCK_SIZE, 1152 .cra_blocksize = WP512_BLOCK_SIZE,
1156 .cra_module = THIS_MODULE, 1153 .cra_module = THIS_MODULE,
1157 } 1154 }
diff --git a/drivers/crypto/nx/nx-aes-xcbc.c b/drivers/crypto/nx/nx-aes-xcbc.c
index c2f7d4befb55..ad3358e74f5c 100644
--- 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 = {
386 .cra_name = "xcbc(aes)", 386 .cra_name = "xcbc(aes)",
387 .cra_driver_name = "xcbc-aes-nx", 387 .cra_driver_name = "xcbc-aes-nx",
388 .cra_priority = 300, 388 .cra_priority = 300,
389 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
390 .cra_blocksize = AES_BLOCK_SIZE, 389 .cra_blocksize = AES_BLOCK_SIZE,
391 .cra_module = THIS_MODULE, 390 .cra_module = THIS_MODULE,
392 .cra_ctxsize = sizeof(struct nx_crypto_ctx), 391 .cra_ctxsize = sizeof(struct nx_crypto_ctx),
diff --git a/drivers/crypto/nx/nx-sha256.c b/drivers/crypto/nx/nx-sha256.c
index becb738c897b..a6764af83c6d 100644
--- 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 = {
288 .cra_name = "sha256", 288 .cra_name = "sha256",
289 .cra_driver_name = "sha256-nx", 289 .cra_driver_name = "sha256-nx",
290 .cra_priority = 300, 290 .cra_priority = 300,
291 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
292 .cra_blocksize = SHA256_BLOCK_SIZE, 291 .cra_blocksize = SHA256_BLOCK_SIZE,
293 .cra_module = THIS_MODULE, 292 .cra_module = THIS_MODULE,
294 .cra_ctxsize = sizeof(struct nx_crypto_ctx), 293 .cra_ctxsize = sizeof(struct nx_crypto_ctx),
diff --git a/drivers/crypto/nx/nx-sha512.c b/drivers/crypto/nx/nx-sha512.c
index b6e183d58d73..92956bc6e45e 100644
--- 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 = {
294 .cra_name = "sha512", 294 .cra_name = "sha512",
295 .cra_driver_name = "sha512-nx", 295 .cra_driver_name = "sha512-nx",
296 .cra_priority = 300, 296 .cra_priority = 300,
297 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
298 .cra_blocksize = SHA512_BLOCK_SIZE, 297 .cra_blocksize = SHA512_BLOCK_SIZE,
299 .cra_module = THIS_MODULE, 298 .cra_module = THIS_MODULE,
300 .cra_ctxsize = sizeof(struct nx_crypto_ctx), 299 .cra_ctxsize = sizeof(struct nx_crypto_ctx),
diff --git a/drivers/crypto/padlock-sha.c b/drivers/crypto/padlock-sha.c
index d32c79328876..21e5cae0a1e0 100644
--- a/drivers/crypto/padlock-sha.c
+++ b/drivers/crypto/padlock-sha.c
@@ -247,8 +247,7 @@ static struct shash_alg sha1_alg = {
247 .cra_name = "sha1", 247 .cra_name = "sha1",
248 .cra_driver_name = "sha1-padlock", 248 .cra_driver_name = "sha1-padlock",
249 .cra_priority = PADLOCK_CRA_PRIORITY, 249 .cra_priority = PADLOCK_CRA_PRIORITY,
250 .cra_flags = CRYPTO_ALG_TYPE_SHASH | 250 .cra_flags = CRYPTO_ALG_NEED_FALLBACK,
251 CRYPTO_ALG_NEED_FALLBACK,
252 .cra_blocksize = SHA1_BLOCK_SIZE, 251 .cra_blocksize = SHA1_BLOCK_SIZE,
253 .cra_ctxsize = sizeof(struct padlock_sha_ctx), 252 .cra_ctxsize = sizeof(struct padlock_sha_ctx),
254 .cra_module = THIS_MODULE, 253 .cra_module = THIS_MODULE,
@@ -271,8 +270,7 @@ static struct shash_alg sha256_alg = {
271 .cra_name = "sha256", 270 .cra_name = "sha256",
272 .cra_driver_name = "sha256-padlock", 271 .cra_driver_name = "sha256-padlock",
273 .cra_priority = PADLOCK_CRA_PRIORITY, 272 .cra_priority = PADLOCK_CRA_PRIORITY,
274 .cra_flags = CRYPTO_ALG_TYPE_SHASH | 273 .cra_flags = CRYPTO_ALG_NEED_FALLBACK,
275 CRYPTO_ALG_NEED_FALLBACK,
276 .cra_blocksize = SHA256_BLOCK_SIZE, 274 .cra_blocksize = SHA256_BLOCK_SIZE,
277 .cra_ctxsize = sizeof(struct padlock_sha_ctx), 275 .cra_ctxsize = sizeof(struct padlock_sha_ctx),
278 .cra_module = THIS_MODULE, 276 .cra_module = THIS_MODULE,
@@ -484,7 +482,6 @@ static struct shash_alg sha1_alg_nano = {
484 .cra_name = "sha1", 482 .cra_name = "sha1",
485 .cra_driver_name = "sha1-padlock-nano", 483 .cra_driver_name = "sha1-padlock-nano",
486 .cra_priority = PADLOCK_CRA_PRIORITY, 484 .cra_priority = PADLOCK_CRA_PRIORITY,
487 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
488 .cra_blocksize = SHA1_BLOCK_SIZE, 485 .cra_blocksize = SHA1_BLOCK_SIZE,
489 .cra_module = THIS_MODULE, 486 .cra_module = THIS_MODULE,
490 } 487 }
@@ -503,7 +500,6 @@ static struct shash_alg sha256_alg_nano = {
503 .cra_name = "sha256", 500 .cra_name = "sha256",
504 .cra_driver_name = "sha256-padlock-nano", 501 .cra_driver_name = "sha256-padlock-nano",
505 .cra_priority = PADLOCK_CRA_PRIORITY, 502 .cra_priority = PADLOCK_CRA_PRIORITY,
506 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
507 .cra_blocksize = SHA256_BLOCK_SIZE, 503 .cra_blocksize = SHA256_BLOCK_SIZE,
508 .cra_module = THIS_MODULE, 504 .cra_module = THIS_MODULE,
509 } 505 }
diff --git a/drivers/crypto/vmx/ghash.c b/drivers/crypto/vmx/ghash.c
index 1c4b5b889fba..dd8b8716467a 100644
--- a/drivers/crypto/vmx/ghash.c
+++ b/drivers/crypto/vmx/ghash.c
@@ -215,7 +215,7 @@ struct shash_alg p8_ghash_alg = {
215 .cra_name = "ghash", 215 .cra_name = "ghash",
216 .cra_driver_name = "p8_ghash", 216 .cra_driver_name = "p8_ghash",
217 .cra_priority = 1000, 217 .cra_priority = 1000,
218 .cra_flags = CRYPTO_ALG_TYPE_SHASH | CRYPTO_ALG_NEED_FALLBACK, 218 .cra_flags = CRYPTO_ALG_NEED_FALLBACK,
219 .cra_blocksize = GHASH_BLOCK_SIZE, 219 .cra_blocksize = GHASH_BLOCK_SIZE,
220 .cra_ctxsize = sizeof(struct p8_ghash_ctx), 220 .cra_ctxsize = sizeof(struct p8_ghash_ctx),
221 .cra_module = THIS_MODULE, 221 .cra_module = THIS_MODULE,
diff --git a/drivers/staging/skein/skein_generic.c b/drivers/staging/skein/skein_generic.c
index 11f5e530a75f..c31fc6408383 100644
--- a/drivers/staging/skein/skein_generic.c
+++ b/drivers/staging/skein/skein_generic.c
@@ -137,7 +137,6 @@ static struct shash_alg alg256 = {
137 .base = { 137 .base = {
138 .cra_name = "skein256", 138 .cra_name = "skein256",
139 .cra_driver_name = "skein", 139 .cra_driver_name = "skein",
140 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
141 .cra_blocksize = SKEIN_256_BLOCK_BYTES, 140 .cra_blocksize = SKEIN_256_BLOCK_BYTES,
142 .cra_module = THIS_MODULE, 141 .cra_module = THIS_MODULE,
143 } 142 }
@@ -155,7 +154,6 @@ static struct shash_alg alg512 = {
155 .base = { 154 .base = {
156 .cra_name = "skein512", 155 .cra_name = "skein512",
157 .cra_driver_name = "skein", 156 .cra_driver_name = "skein",
158 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
159 .cra_blocksize = SKEIN_512_BLOCK_BYTES, 157 .cra_blocksize = SKEIN_512_BLOCK_BYTES,
160 .cra_module = THIS_MODULE, 158 .cra_module = THIS_MODULE,
161 } 159 }
@@ -173,7 +171,6 @@ static struct shash_alg alg1024 = {
173 .base = { 171 .base = {
174 .cra_name = "skein1024", 172 .cra_name = "skein1024",
175 .cra_driver_name = "skein", 173 .cra_driver_name = "skein",
176 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
177 .cra_blocksize = SKEIN_1024_BLOCK_BYTES, 174 .cra_blocksize = SKEIN_1024_BLOCK_BYTES,
178 .cra_module = THIS_MODULE, 175 .cra_module = THIS_MODULE,
179 } 176 }