Commit 8d906d18 authored by Eric Biggers's avatar Eric Biggers Committed by Greg Kroah-Hartman

crypto: hash - annotate algorithms taking optional key

commit a208fa8f upstream.

We need to consistently enforce that keyed hashes cannot be used without
setting the key.  To do this we need a reliable way to determine whether
a given hash algorithm is keyed or not.  AF_ALG currently does this by
checking for the presence of a ->setkey() method.  However, this is
actually slightly broken because the CRC-32 algorithms implement
->setkey() but can also be used without a key.  (The CRC-32 "key" is not
actually a cryptographic key but rather represents the initial state.
If not overridden, then a default initial state is used.)

Prepare to fix this by introducing a flag CRYPTO_ALG_OPTIONAL_KEY which
indicates that the algorithm has a ->setkey() method, but it is not
required to be called.  Then set it on all the CRC-32 algorithms.

The same also applies to the Adler-32 implementation in Lustre.

Also, the cryptd and mcryptd templates have to pass through the flag
from their underlying algorithm.
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b806c0cc
...@@ -188,6 +188,7 @@ static struct shash_alg crc32_pmull_algs[] = { { ...@@ -188,6 +188,7 @@ static struct shash_alg crc32_pmull_algs[] = { {
.base.cra_name = "crc32", .base.cra_name = "crc32",
.base.cra_driver_name = "crc32-arm-ce", .base.cra_driver_name = "crc32-arm-ce",
.base.cra_priority = 200, .base.cra_priority = 200,
.base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
.base.cra_blocksize = 1, .base.cra_blocksize = 1,
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
}, { }, {
...@@ -203,6 +204,7 @@ static struct shash_alg crc32_pmull_algs[] = { { ...@@ -203,6 +204,7 @@ static struct shash_alg crc32_pmull_algs[] = { {
.base.cra_name = "crc32c", .base.cra_name = "crc32c",
.base.cra_driver_name = "crc32c-arm-ce", .base.cra_driver_name = "crc32c-arm-ce",
.base.cra_priority = 200, .base.cra_priority = 200,
.base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
.base.cra_blocksize = 1, .base.cra_blocksize = 1,
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
} }; } };
......
...@@ -185,6 +185,7 @@ static struct shash_alg crc32_pmull_algs[] = { { ...@@ -185,6 +185,7 @@ static struct shash_alg crc32_pmull_algs[] = { {
.base.cra_name = "crc32", .base.cra_name = "crc32",
.base.cra_driver_name = "crc32-arm64-ce", .base.cra_driver_name = "crc32-arm64-ce",
.base.cra_priority = 200, .base.cra_priority = 200,
.base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
.base.cra_blocksize = 1, .base.cra_blocksize = 1,
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
}, { }, {
...@@ -200,6 +201,7 @@ static struct shash_alg crc32_pmull_algs[] = { { ...@@ -200,6 +201,7 @@ static struct shash_alg crc32_pmull_algs[] = { {
.base.cra_name = "crc32c", .base.cra_name = "crc32c",
.base.cra_driver_name = "crc32c-arm64-ce", .base.cra_driver_name = "crc32c-arm64-ce",
.base.cra_priority = 200, .base.cra_priority = 200,
.base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
.base.cra_blocksize = 1, .base.cra_blocksize = 1,
.base.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
} }; } };
......
...@@ -141,6 +141,7 @@ static struct shash_alg alg = { ...@@ -141,6 +141,7 @@ static struct shash_alg alg = {
.cra_name = "crc32c", .cra_name = "crc32c",
.cra_driver_name = "crc32c-vpmsum", .cra_driver_name = "crc32c-vpmsum",
.cra_priority = 200, .cra_priority = 200,
.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
.cra_blocksize = CHKSUM_BLOCK_SIZE, .cra_blocksize = CHKSUM_BLOCK_SIZE,
.cra_ctxsize = sizeof(u32), .cra_ctxsize = sizeof(u32),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
......
...@@ -238,6 +238,7 @@ static struct shash_alg crc32_vx_algs[] = { ...@@ -238,6 +238,7 @@ static struct shash_alg crc32_vx_algs[] = {
.cra_name = "crc32", .cra_name = "crc32",
.cra_driver_name = "crc32-vx", .cra_driver_name = "crc32-vx",
.cra_priority = 200, .cra_priority = 200,
.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
.cra_blocksize = CRC32_BLOCK_SIZE, .cra_blocksize = CRC32_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct crc_ctx), .cra_ctxsize = sizeof(struct crc_ctx),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
...@@ -258,6 +259,7 @@ static struct shash_alg crc32_vx_algs[] = { ...@@ -258,6 +259,7 @@ static struct shash_alg crc32_vx_algs[] = {
.cra_name = "crc32be", .cra_name = "crc32be",
.cra_driver_name = "crc32be-vx", .cra_driver_name = "crc32be-vx",
.cra_priority = 200, .cra_priority = 200,
.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
.cra_blocksize = CRC32_BLOCK_SIZE, .cra_blocksize = CRC32_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct crc_ctx), .cra_ctxsize = sizeof(struct crc_ctx),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
...@@ -278,6 +280,7 @@ static struct shash_alg crc32_vx_algs[] = { ...@@ -278,6 +280,7 @@ static struct shash_alg crc32_vx_algs[] = {
.cra_name = "crc32c", .cra_name = "crc32c",
.cra_driver_name = "crc32c-vx", .cra_driver_name = "crc32c-vx",
.cra_priority = 200, .cra_priority = 200,
.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
.cra_blocksize = CRC32_BLOCK_SIZE, .cra_blocksize = CRC32_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct crc_ctx), .cra_ctxsize = sizeof(struct crc_ctx),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
......
...@@ -133,6 +133,7 @@ static struct shash_alg alg = { ...@@ -133,6 +133,7 @@ static struct shash_alg alg = {
.cra_name = "crc32c", .cra_name = "crc32c",
.cra_driver_name = "crc32c-sparc64", .cra_driver_name = "crc32c-sparc64",
.cra_priority = SPARC_CR_OPCODE_PRIORITY, .cra_priority = SPARC_CR_OPCODE_PRIORITY,
.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
.cra_blocksize = CHKSUM_BLOCK_SIZE, .cra_blocksize = CHKSUM_BLOCK_SIZE,
.cra_ctxsize = sizeof(u32), .cra_ctxsize = sizeof(u32),
.cra_alignmask = 7, .cra_alignmask = 7,
......
...@@ -162,6 +162,7 @@ static struct shash_alg alg = { ...@@ -162,6 +162,7 @@ static struct shash_alg alg = {
.cra_name = "crc32", .cra_name = "crc32",
.cra_driver_name = "crc32-pclmul", .cra_driver_name = "crc32-pclmul",
.cra_priority = 200, .cra_priority = 200,
.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
.cra_blocksize = CHKSUM_BLOCK_SIZE, .cra_blocksize = CHKSUM_BLOCK_SIZE,
.cra_ctxsize = sizeof(u32), .cra_ctxsize = sizeof(u32),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
......
...@@ -226,6 +226,7 @@ static struct shash_alg alg = { ...@@ -226,6 +226,7 @@ static struct shash_alg alg = {
.cra_name = "crc32c", .cra_name = "crc32c",
.cra_driver_name = "crc32c-intel", .cra_driver_name = "crc32c-intel",
.cra_priority = 200, .cra_priority = 200,
.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
.cra_blocksize = CHKSUM_BLOCK_SIZE, .cra_blocksize = CHKSUM_BLOCK_SIZE,
.cra_ctxsize = sizeof(u32), .cra_ctxsize = sizeof(u32),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
......
...@@ -133,6 +133,7 @@ static struct shash_alg alg = { ...@@ -133,6 +133,7 @@ static struct shash_alg alg = {
.cra_name = "crc32", .cra_name = "crc32",
.cra_driver_name = "crc32-generic", .cra_driver_name = "crc32-generic",
.cra_priority = 100, .cra_priority = 100,
.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
.cra_blocksize = CHKSUM_BLOCK_SIZE, .cra_blocksize = CHKSUM_BLOCK_SIZE,
.cra_ctxsize = sizeof(u32), .cra_ctxsize = sizeof(u32),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
......
...@@ -146,6 +146,7 @@ static struct shash_alg alg = { ...@@ -146,6 +146,7 @@ static struct shash_alg alg = {
.cra_name = "crc32c", .cra_name = "crc32c",
.cra_driver_name = "crc32c-generic", .cra_driver_name = "crc32c-generic",
.cra_priority = 100, .cra_priority = 100,
.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
.cra_blocksize = CHKSUM_BLOCK_SIZE, .cra_blocksize = CHKSUM_BLOCK_SIZE,
.cra_alignmask = 3, .cra_alignmask = 3,
.cra_ctxsize = sizeof(struct chksum_ctx), .cra_ctxsize = sizeof(struct chksum_ctx),
......
...@@ -895,10 +895,9 @@ static int cryptd_create_hash(struct crypto_template *tmpl, struct rtattr **tb, ...@@ -895,10 +895,9 @@ static int cryptd_create_hash(struct crypto_template *tmpl, struct rtattr **tb,
if (err) if (err)
goto out_free_inst; goto out_free_inst;
type = CRYPTO_ALG_ASYNC; inst->alg.halg.base.cra_flags = CRYPTO_ALG_ASYNC |
if (alg->cra_flags & CRYPTO_ALG_INTERNAL) (alg->cra_flags & (CRYPTO_ALG_INTERNAL |
type |= CRYPTO_ALG_INTERNAL; CRYPTO_ALG_OPTIONAL_KEY));
inst->alg.halg.base.cra_flags = type;
inst->alg.halg.digestsize = salg->digestsize; inst->alg.halg.digestsize = salg->digestsize;
inst->alg.halg.statesize = salg->statesize; inst->alg.halg.statesize = salg->statesize;
......
...@@ -517,10 +517,9 @@ static int mcryptd_create_hash(struct crypto_template *tmpl, struct rtattr **tb, ...@@ -517,10 +517,9 @@ static int mcryptd_create_hash(struct crypto_template *tmpl, struct rtattr **tb,
if (err) if (err)
goto out_free_inst; goto out_free_inst;
type = CRYPTO_ALG_ASYNC; inst->alg.halg.base.cra_flags = CRYPTO_ALG_ASYNC |
if (alg->cra_flags & CRYPTO_ALG_INTERNAL) (alg->cra_flags & (CRYPTO_ALG_INTERNAL |
type |= CRYPTO_ALG_INTERNAL; CRYPTO_ALG_OPTIONAL_KEY));
inst->alg.halg.base.cra_flags = type;
inst->alg.halg.digestsize = halg->digestsize; inst->alg.halg.digestsize = halg->digestsize;
inst->alg.halg.statesize = halg->statesize; inst->alg.halg.statesize = halg->statesize;
......
...@@ -494,7 +494,8 @@ static struct ahash_alg algs = { ...@@ -494,7 +494,8 @@ static struct ahash_alg algs = {
.cra_driver_name = DRIVER_NAME, .cra_driver_name = DRIVER_NAME,
.cra_priority = 100, .cra_priority = 100,
.cra_flags = CRYPTO_ALG_TYPE_AHASH | .cra_flags = CRYPTO_ALG_TYPE_AHASH |
CRYPTO_ALG_ASYNC, CRYPTO_ALG_ASYNC |
CRYPTO_ALG_OPTIONAL_KEY,
.cra_blocksize = CHKSUM_BLOCK_SIZE, .cra_blocksize = CHKSUM_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct bfin_crypto_crc_ctx), .cra_ctxsize = sizeof(struct bfin_crypto_crc_ctx),
.cra_alignmask = 3, .cra_alignmask = 3,
......
...@@ -208,6 +208,7 @@ static struct shash_alg algs[] = { ...@@ -208,6 +208,7 @@ static struct shash_alg algs[] = {
.cra_name = "crc32", .cra_name = "crc32",
.cra_driver_name = DRIVER_NAME, .cra_driver_name = DRIVER_NAME,
.cra_priority = 200, .cra_priority = 200,
.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
.cra_blocksize = CHKSUM_BLOCK_SIZE, .cra_blocksize = CHKSUM_BLOCK_SIZE,
.cra_alignmask = 3, .cra_alignmask = 3,
.cra_ctxsize = sizeof(struct stm32_crc_ctx), .cra_ctxsize = sizeof(struct stm32_crc_ctx),
...@@ -229,6 +230,7 @@ static struct shash_alg algs[] = { ...@@ -229,6 +230,7 @@ static struct shash_alg algs[] = {
.cra_name = "crc32c", .cra_name = "crc32c",
.cra_driver_name = DRIVER_NAME, .cra_driver_name = DRIVER_NAME,
.cra_priority = 200, .cra_priority = 200,
.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
.cra_blocksize = CHKSUM_BLOCK_SIZE, .cra_blocksize = CHKSUM_BLOCK_SIZE,
.cra_alignmask = 3, .cra_alignmask = 3,
.cra_ctxsize = sizeof(struct stm32_crc_ctx), .cra_ctxsize = sizeof(struct stm32_crc_ctx),
......
...@@ -119,6 +119,7 @@ static struct shash_alg alg = { ...@@ -119,6 +119,7 @@ static struct shash_alg alg = {
.cra_name = "adler32", .cra_name = "adler32",
.cra_driver_name = "adler32-zlib", .cra_driver_name = "adler32-zlib",
.cra_priority = 100, .cra_priority = 100,
.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
.cra_blocksize = CHKSUM_BLOCK_SIZE, .cra_blocksize = CHKSUM_BLOCK_SIZE,
.cra_ctxsize = sizeof(u32), .cra_ctxsize = sizeof(u32),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
......
...@@ -105,6 +105,12 @@ ...@@ -105,6 +105,12 @@
*/ */
#define CRYPTO_ALG_INTERNAL 0x00002000 #define CRYPTO_ALG_INTERNAL 0x00002000
/*
* Set if the algorithm has a ->setkey() method but can be used without
* calling it first, i.e. there is a default key.
*/
#define CRYPTO_ALG_OPTIONAL_KEY 0x00004000
/* /*
* Transform masks and values (for crt_flags). * Transform masks and values (for crt_flags).
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment