summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/crypto/crc32-ce-glue.c2
-rw-r--r--arch/arm64/crypto/crc32-ce-glue.c2
-rw-r--r--arch/powerpc/crypto/crc32c-vpmsum_glue.c1
-rw-r--r--arch/s390/crypto/crc32-vx.c3
-rw-r--r--arch/sparc/crypto/crc32c_glue.c1
-rw-r--r--arch/x86/crypto/crc32-pclmul_glue.c1
-rw-r--r--arch/x86/crypto/crc32c-intel_glue.c1
-rw-r--r--crypto/crc32_generic.c1
-rw-r--r--crypto/crc32c_generic.c1
-rw-r--r--crypto/cryptd.c7
-rw-r--r--crypto/mcryptd.c7
-rw-r--r--drivers/crypto/bfin_crc.c3
-rw-r--r--drivers/crypto/stm32/stm32_crc32.c2
-rw-r--r--drivers/staging/lustre/lnet/libcfs/linux/linux-crypto-adler.c1
-rw-r--r--include/linux/crypto.h6
15 files changed, 30 insertions, 9 deletions
diff --git a/arch/arm/crypto/crc32-ce-glue.c b/arch/arm/crypto/crc32-ce-glue.c
index 1b0e0e86ee9c..96e62ec105d0 100644
--- a/arch/arm/crypto/crc32-ce-glue.c
+++ b/arch/arm/crypto/crc32-ce-glue.c
@@ -188,6 +188,7 @@ static struct shash_alg crc32_pmull_algs[] = { {
188 .base.cra_name = "crc32", 188 .base.cra_name = "crc32",
189 .base.cra_driver_name = "crc32-arm-ce", 189 .base.cra_driver_name = "crc32-arm-ce",
190 .base.cra_priority = 200, 190 .base.cra_priority = 200,
191 .base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
191 .base.cra_blocksize = 1, 192 .base.cra_blocksize = 1,
192 .base.cra_module = THIS_MODULE, 193 .base.cra_module = THIS_MODULE,
193}, { 194}, {
@@ -203,6 +204,7 @@ static struct shash_alg crc32_pmull_algs[] = { {
203 .base.cra_name = "crc32c", 204 .base.cra_name = "crc32c",
204 .base.cra_driver_name = "crc32c-arm-ce", 205 .base.cra_driver_name = "crc32c-arm-ce",
205 .base.cra_priority = 200, 206 .base.cra_priority = 200,
207 .base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
206 .base.cra_blocksize = 1, 208 .base.cra_blocksize = 1,
207 .base.cra_module = THIS_MODULE, 209 .base.cra_module = THIS_MODULE,
208} }; 210} };
diff --git a/arch/arm64/crypto/crc32-ce-glue.c b/arch/arm64/crypto/crc32-ce-glue.c
index 624f4137918c..34b4e3d46aab 100644
--- a/arch/arm64/crypto/crc32-ce-glue.c
+++ b/arch/arm64/crypto/crc32-ce-glue.c
@@ -185,6 +185,7 @@ static struct shash_alg crc32_pmull_algs[] = { {
185 .base.cra_name = "crc32", 185 .base.cra_name = "crc32",
186 .base.cra_driver_name = "crc32-arm64-ce", 186 .base.cra_driver_name = "crc32-arm64-ce",
187 .base.cra_priority = 200, 187 .base.cra_priority = 200,
188 .base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
188 .base.cra_blocksize = 1, 189 .base.cra_blocksize = 1,
189 .base.cra_module = THIS_MODULE, 190 .base.cra_module = THIS_MODULE,
190}, { 191}, {
@@ -200,6 +201,7 @@ static struct shash_alg crc32_pmull_algs[] = { {
200 .base.cra_name = "crc32c", 201 .base.cra_name = "crc32c",
201 .base.cra_driver_name = "crc32c-arm64-ce", 202 .base.cra_driver_name = "crc32c-arm64-ce",
202 .base.cra_priority = 200, 203 .base.cra_priority = 200,
204 .base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
203 .base.cra_blocksize = 1, 205 .base.cra_blocksize = 1,
204 .base.cra_module = THIS_MODULE, 206 .base.cra_module = THIS_MODULE,
205} }; 207} };
diff --git a/arch/powerpc/crypto/crc32c-vpmsum_glue.c b/arch/powerpc/crypto/crc32c-vpmsum_glue.c
index f058e0c3e4d4..fd1d6c83f0c0 100644
--- a/arch/powerpc/crypto/crc32c-vpmsum_glue.c
+++ b/arch/powerpc/crypto/crc32c-vpmsum_glue.c
@@ -141,6 +141,7 @@ static struct shash_alg alg = {
141 .cra_name = "crc32c", 141 .cra_name = "crc32c",
142 .cra_driver_name = "crc32c-vpmsum", 142 .cra_driver_name = "crc32c-vpmsum",
143 .cra_priority = 200, 143 .cra_priority = 200,
144 .cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
144 .cra_blocksize = CHKSUM_BLOCK_SIZE, 145 .cra_blocksize = CHKSUM_BLOCK_SIZE,
145 .cra_ctxsize = sizeof(u32), 146 .cra_ctxsize = sizeof(u32),
146 .cra_module = THIS_MODULE, 147 .cra_module = THIS_MODULE,
diff --git a/arch/s390/crypto/crc32-vx.c b/arch/s390/crypto/crc32-vx.c
index 436865926c26..423ee05887e6 100644
--- a/arch/s390/crypto/crc32-vx.c
+++ b/arch/s390/crypto/crc32-vx.c
@@ -239,6 +239,7 @@ static struct shash_alg crc32_vx_algs[] = {
239 .cra_name = "crc32", 239 .cra_name = "crc32",
240 .cra_driver_name = "crc32-vx", 240 .cra_driver_name = "crc32-vx",
241 .cra_priority = 200, 241 .cra_priority = 200,
242 .cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
242 .cra_blocksize = CRC32_BLOCK_SIZE, 243 .cra_blocksize = CRC32_BLOCK_SIZE,
243 .cra_ctxsize = sizeof(struct crc_ctx), 244 .cra_ctxsize = sizeof(struct crc_ctx),
244 .cra_module = THIS_MODULE, 245 .cra_module = THIS_MODULE,
@@ -259,6 +260,7 @@ static struct shash_alg crc32_vx_algs[] = {
259 .cra_name = "crc32be", 260 .cra_name = "crc32be",
260 .cra_driver_name = "crc32be-vx", 261 .cra_driver_name = "crc32be-vx",
261 .cra_priority = 200, 262 .cra_priority = 200,
263 .cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
262 .cra_blocksize = CRC32_BLOCK_SIZE, 264 .cra_blocksize = CRC32_BLOCK_SIZE,
263 .cra_ctxsize = sizeof(struct crc_ctx), 265 .cra_ctxsize = sizeof(struct crc_ctx),
264 .cra_module = THIS_MODULE, 266 .cra_module = THIS_MODULE,
@@ -279,6 +281,7 @@ static struct shash_alg crc32_vx_algs[] = {
279 .cra_name = "crc32c", 281 .cra_name = "crc32c",
280 .cra_driver_name = "crc32c-vx", 282 .cra_driver_name = "crc32c-vx",
281 .cra_priority = 200, 283 .cra_priority = 200,
284 .cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
282 .cra_blocksize = CRC32_BLOCK_SIZE, 285 .cra_blocksize = CRC32_BLOCK_SIZE,
283 .cra_ctxsize = sizeof(struct crc_ctx), 286 .cra_ctxsize = sizeof(struct crc_ctx),
284 .cra_module = THIS_MODULE, 287 .cra_module = THIS_MODULE,
diff --git a/arch/sparc/crypto/crc32c_glue.c b/arch/sparc/crypto/crc32c_glue.c
index d1064e46efe8..8aa664638c3c 100644
--- a/arch/sparc/crypto/crc32c_glue.c
+++ b/arch/sparc/crypto/crc32c_glue.c
@@ -133,6 +133,7 @@ static struct shash_alg alg = {
133 .cra_name = "crc32c", 133 .cra_name = "crc32c",
134 .cra_driver_name = "crc32c-sparc64", 134 .cra_driver_name = "crc32c-sparc64",
135 .cra_priority = SPARC_CR_OPCODE_PRIORITY, 135 .cra_priority = SPARC_CR_OPCODE_PRIORITY,
136 .cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
136 .cra_blocksize = CHKSUM_BLOCK_SIZE, 137 .cra_blocksize = CHKSUM_BLOCK_SIZE,
137 .cra_ctxsize = sizeof(u32), 138 .cra_ctxsize = sizeof(u32),
138 .cra_alignmask = 7, 139 .cra_alignmask = 7,
diff --git a/arch/x86/crypto/crc32-pclmul_glue.c b/arch/x86/crypto/crc32-pclmul_glue.c
index 27226df3f7d8..c8d9cdacbf10 100644
--- a/arch/x86/crypto/crc32-pclmul_glue.c
+++ b/arch/x86/crypto/crc32-pclmul_glue.c
@@ -162,6 +162,7 @@ static struct shash_alg alg = {
162 .cra_name = "crc32", 162 .cra_name = "crc32",
163 .cra_driver_name = "crc32-pclmul", 163 .cra_driver_name = "crc32-pclmul",
164 .cra_priority = 200, 164 .cra_priority = 200,
165 .cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
165 .cra_blocksize = CHKSUM_BLOCK_SIZE, 166 .cra_blocksize = CHKSUM_BLOCK_SIZE,
166 .cra_ctxsize = sizeof(u32), 167 .cra_ctxsize = sizeof(u32),
167 .cra_module = THIS_MODULE, 168 .cra_module = THIS_MODULE,
diff --git a/arch/x86/crypto/crc32c-intel_glue.c b/arch/x86/crypto/crc32c-intel_glue.c
index c194d5717ae5..5773e1161072 100644
--- a/arch/x86/crypto/crc32c-intel_glue.c
+++ b/arch/x86/crypto/crc32c-intel_glue.c
@@ -226,6 +226,7 @@ static struct shash_alg alg = {
226 .cra_name = "crc32c", 226 .cra_name = "crc32c",
227 .cra_driver_name = "crc32c-intel", 227 .cra_driver_name = "crc32c-intel",
228 .cra_priority = 200, 228 .cra_priority = 200,
229 .cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
229 .cra_blocksize = CHKSUM_BLOCK_SIZE, 230 .cra_blocksize = CHKSUM_BLOCK_SIZE,
230 .cra_ctxsize = sizeof(u32), 231 .cra_ctxsize = sizeof(u32),
231 .cra_module = THIS_MODULE, 232 .cra_module = THIS_MODULE,
diff --git a/crypto/crc32_generic.c b/crypto/crc32_generic.c
index aa2a25fc7482..718cbce8d169 100644
--- a/crypto/crc32_generic.c
+++ b/crypto/crc32_generic.c
@@ -133,6 +133,7 @@ static struct shash_alg alg = {
133 .cra_name = "crc32", 133 .cra_name = "crc32",
134 .cra_driver_name = "crc32-generic", 134 .cra_driver_name = "crc32-generic",
135 .cra_priority = 100, 135 .cra_priority = 100,
136 .cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
136 .cra_blocksize = CHKSUM_BLOCK_SIZE, 137 .cra_blocksize = CHKSUM_BLOCK_SIZE,
137 .cra_ctxsize = sizeof(u32), 138 .cra_ctxsize = sizeof(u32),
138 .cra_module = THIS_MODULE, 139 .cra_module = THIS_MODULE,
diff --git a/crypto/crc32c_generic.c b/crypto/crc32c_generic.c
index 4c0a0e271876..372320399622 100644
--- a/crypto/crc32c_generic.c
+++ b/crypto/crc32c_generic.c
@@ -146,6 +146,7 @@ static struct shash_alg alg = {
146 .cra_name = "crc32c", 146 .cra_name = "crc32c",
147 .cra_driver_name = "crc32c-generic", 147 .cra_driver_name = "crc32c-generic",
148 .cra_priority = 100, 148 .cra_priority = 100,
149 .cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
149 .cra_blocksize = CHKSUM_BLOCK_SIZE, 150 .cra_blocksize = CHKSUM_BLOCK_SIZE,
150 .cra_alignmask = 3, 151 .cra_alignmask = 3,
151 .cra_ctxsize = sizeof(struct chksum_ctx), 152 .cra_ctxsize = sizeof(struct chksum_ctx),
diff --git a/crypto/cryptd.c b/crypto/cryptd.c
index 457ae3e66a41..addca7bae33f 100644
--- a/crypto/cryptd.c
+++ b/crypto/cryptd.c
@@ -896,10 +896,9 @@ static int cryptd_create_hash(struct crypto_template *tmpl, struct rtattr **tb,
896 if (err) 896 if (err)
897 goto out_free_inst; 897 goto out_free_inst;
898 898
899 type = CRYPTO_ALG_ASYNC; 899 inst->alg.halg.base.cra_flags = CRYPTO_ALG_ASYNC |
900 if (alg->cra_flags & CRYPTO_ALG_INTERNAL) 900 (alg->cra_flags & (CRYPTO_ALG_INTERNAL |
901 type |= CRYPTO_ALG_INTERNAL; 901 CRYPTO_ALG_OPTIONAL_KEY));
902 inst->alg.halg.base.cra_flags = type;
903 902
904 inst->alg.halg.digestsize = salg->digestsize; 903 inst->alg.halg.digestsize = salg->digestsize;
905 inst->alg.halg.statesize = salg->statesize; 904 inst->alg.halg.statesize = salg->statesize;
diff --git a/crypto/mcryptd.c b/crypto/mcryptd.c
index ace346b976b3..fe5129d6ff4e 100644
--- a/crypto/mcryptd.c
+++ b/crypto/mcryptd.c
@@ -516,10 +516,9 @@ static int mcryptd_create_hash(struct crypto_template *tmpl, struct rtattr **tb,
516 if (err) 516 if (err)
517 goto out_free_inst; 517 goto out_free_inst;
518 518
519 type = CRYPTO_ALG_ASYNC; 519 inst->alg.halg.base.cra_flags = CRYPTO_ALG_ASYNC |
520 if (alg->cra_flags & CRYPTO_ALG_INTERNAL) 520 (alg->cra_flags & (CRYPTO_ALG_INTERNAL |
521 type |= CRYPTO_ALG_INTERNAL; 521 CRYPTO_ALG_OPTIONAL_KEY));
522 inst->alg.halg.base.cra_flags = type;
523 522
524 inst->alg.halg.digestsize = halg->digestsize; 523 inst->alg.halg.digestsize = halg->digestsize;
525 inst->alg.halg.statesize = halg->statesize; 524 inst->alg.halg.statesize = halg->statesize;
diff --git a/drivers/crypto/bfin_crc.c b/drivers/crypto/bfin_crc.c
index a118b9bed669..bfbf8bf77f03 100644
--- a/drivers/crypto/bfin_crc.c
+++ b/drivers/crypto/bfin_crc.c
@@ -494,7 +494,8 @@ static struct ahash_alg algs = {
494 .cra_driver_name = DRIVER_NAME, 494 .cra_driver_name = DRIVER_NAME,
495 .cra_priority = 100, 495 .cra_priority = 100,
496 .cra_flags = CRYPTO_ALG_TYPE_AHASH | 496 .cra_flags = CRYPTO_ALG_TYPE_AHASH |
497 CRYPTO_ALG_ASYNC, 497 CRYPTO_ALG_ASYNC |
498 CRYPTO_ALG_OPTIONAL_KEY,
498 .cra_blocksize = CHKSUM_BLOCK_SIZE, 499 .cra_blocksize = CHKSUM_BLOCK_SIZE,
499 .cra_ctxsize = sizeof(struct bfin_crypto_crc_ctx), 500 .cra_ctxsize = sizeof(struct bfin_crypto_crc_ctx),
500 .cra_alignmask = 3, 501 .cra_alignmask = 3,
diff --git a/drivers/crypto/stm32/stm32_crc32.c b/drivers/crypto/stm32/stm32_crc32.c
index 090582baecfe..8f09b8430893 100644
--- a/drivers/crypto/stm32/stm32_crc32.c
+++ b/drivers/crypto/stm32/stm32_crc32.c
@@ -208,6 +208,7 @@ static struct shash_alg algs[] = {
208 .cra_name = "crc32", 208 .cra_name = "crc32",
209 .cra_driver_name = DRIVER_NAME, 209 .cra_driver_name = DRIVER_NAME,
210 .cra_priority = 200, 210 .cra_priority = 200,
211 .cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
211 .cra_blocksize = CHKSUM_BLOCK_SIZE, 212 .cra_blocksize = CHKSUM_BLOCK_SIZE,
212 .cra_alignmask = 3, 213 .cra_alignmask = 3,
213 .cra_ctxsize = sizeof(struct stm32_crc_ctx), 214 .cra_ctxsize = sizeof(struct stm32_crc_ctx),
@@ -229,6 +230,7 @@ static struct shash_alg algs[] = {
229 .cra_name = "crc32c", 230 .cra_name = "crc32c",
230 .cra_driver_name = DRIVER_NAME, 231 .cra_driver_name = DRIVER_NAME,
231 .cra_priority = 200, 232 .cra_priority = 200,
233 .cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
232 .cra_blocksize = CHKSUM_BLOCK_SIZE, 234 .cra_blocksize = CHKSUM_BLOCK_SIZE,
233 .cra_alignmask = 3, 235 .cra_alignmask = 3,
234 .cra_ctxsize = sizeof(struct stm32_crc_ctx), 236 .cra_ctxsize = sizeof(struct stm32_crc_ctx),
diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto-adler.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto-adler.c
index 2e5d311d2438..db81ed527452 100644
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto-adler.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto-adler.c
@@ -120,6 +120,7 @@ static struct shash_alg alg = {
120 .cra_name = "adler32", 120 .cra_name = "adler32",
121 .cra_driver_name = "adler32-zlib", 121 .cra_driver_name = "adler32-zlib",
122 .cra_priority = 100, 122 .cra_priority = 100,
123 .cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
123 .cra_blocksize = CHKSUM_BLOCK_SIZE, 124 .cra_blocksize = CHKSUM_BLOCK_SIZE,
124 .cra_ctxsize = sizeof(u32), 125 .cra_ctxsize = sizeof(u32),
125 .cra_module = THIS_MODULE, 126 .cra_module = THIS_MODULE,
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 231e59f90d32..d2e33a90825b 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -107,6 +107,12 @@
107#define CRYPTO_ALG_INTERNAL 0x00002000 107#define CRYPTO_ALG_INTERNAL 0x00002000
108 108
109/* 109/*
110 * Set if the algorithm has a ->setkey() method but can be used without
111 * calling it first, i.e. there is a default key.
112 */
113#define CRYPTO_ALG_OPTIONAL_KEY 0x00004000
114
115/*
110 * Transform masks and values (for crt_flags). 116 * Transform masks and values (for crt_flags).
111 */ 117 */
112#define CRYPTO_TFM_REQ_MASK 0x000fff00 118#define CRYPTO_TFM_REQ_MASK 0x000fff00
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-22 07:43:36 -0500