Skip to content

L
linux
Commit ef7c5c85 authored by Herbert Xu's avatar Herbert Xu
Browse files
Options

crypto: talitos - Forbid 2-key 3DES in FIPS mode 

This patch forbids the use of 2-key 3DES (K1 == K3) in FIPS mode.
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent aee11813
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 13 deletions
drivers/crypto/talitos.c
View file @ ef7c5c85
...@@ -913,6 +913,54 @@ static int aead_setkey(struct crypto_aead *authenc, ...@@ -913,6 +913,54 @@ static int aead_setkey(struct crypto_aead *authenc,
return -EINVAL; return -EINVAL;
} }
static int aead_des3_setkey(struct crypto_aead *authenc,
const u8 *key, unsigned int keylen)
{
struct talitos_ctx *ctx = crypto_aead_ctx(authenc);
struct device *dev = ctx->dev;
struct crypto_authenc_keys keys;
u32 flags;
int err;
err = crypto_authenc_extractkeys(&keys, key, keylen);
if (unlikely(err))
goto badkey;
err = -EINVAL;
if (keys.authkeylen + keys.enckeylen > TALITOS_MAX_KEY_SIZE)
goto badkey;
if (keys.enckeylen != DES3_EDE_KEY_SIZE)
goto badkey;
flags = crypto_aead_get_flags(authenc);
err = __des3_verify_key(&flags, keys.enckey);
if (unlikely(err)) {
crypto_aead_set_flags(authenc, flags);
goto out;
}
if (ctx->keylen)
dma_unmap_single(dev, ctx->dma_key, ctx->keylen, DMA_TO_DEVICE);
memcpy(ctx->key, keys.authkey, keys.authkeylen);
memcpy(&ctx->key[keys.authkeylen], keys.enckey, keys.enckeylen);
ctx->keylen = keys.authkeylen + keys.enckeylen;
ctx->enckeylen = keys.enckeylen;
ctx->authkeylen = keys.authkeylen;
ctx->dma_key = dma_map_single(dev, ctx->key, ctx->keylen,
DMA_TO_DEVICE);
out:
memzero_explicit(&keys, sizeof(keys));
return err;
badkey:
crypto_aead_set_flags(authenc, CRYPTO_TFM_RES_BAD_KEY_LEN);
goto out;
}
/* /*
* talitos_edesc - s/w-extended descriptor * talitos_edesc - s/w-extended descriptor
* @src_nents: number of segments in input scatterlist * @src_nents: number of segments in input scatterlist
...@@ -1527,12 +1575,22 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *cipher, ...@@ -1527,12 +1575,22 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *cipher,
{ {
struct talitos_ctx *ctx = crypto_ablkcipher_ctx(cipher); struct talitos_ctx *ctx = crypto_ablkcipher_ctx(cipher);
struct device *dev = ctx->dev; struct device *dev = ctx->dev;
u32 tmp[DES_EXPKEY_WORDS];
if (keylen > TALITOS_MAX_KEY_SIZE) { if (ctx->keylen)
crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN); dma_unmap_single(dev, ctx->dma_key, ctx->keylen, DMA_TO_DEVICE);
return -EINVAL;
} memcpy(&ctx->key, key, keylen);
ctx->keylen = keylen;
ctx->dma_key = dma_map_single(dev, ctx->key, keylen, DMA_TO_DEVICE);
return 0;
}
static int ablkcipher_des_setkey(struct crypto_ablkcipher *cipher,
const u8 *key, unsigned int keylen)
{
u32 tmp[DES_EXPKEY_WORDS];
if (unlikely(crypto_ablkcipher_get_flags(cipher) & if (unlikely(crypto_ablkcipher_get_flags(cipher) &
CRYPTO_TFM_REQ_FORBID_WEAK_KEYS) && CRYPTO_TFM_REQ_FORBID_WEAK_KEYS) &&
...@@ -1541,15 +1599,23 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *cipher, ...@@ -1541,15 +1599,23 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *cipher,
return -EINVAL; return -EINVAL;
} }
if (ctx->keylen) return ablkcipher_setkey(cipher, key, keylen);
dma_unmap_single(dev, ctx->dma_key, ctx->keylen, DMA_TO_DEVICE); }
memcpy(&ctx->key, key, keylen); static int ablkcipher_des3_setkey(struct crypto_ablkcipher *cipher,
ctx->keylen = keylen; const u8 *key, unsigned int keylen)
{
u32 flags;
int err;
ctx->dma_key = dma_map_single(dev, ctx->key, keylen, DMA_TO_DEVICE); flags = crypto_ablkcipher_get_flags(cipher);
err = __des3_verify_key(&flags, key);
if (unlikely(err)) {
crypto_ablkcipher_set_flags(cipher, flags);
return err;
}
return 0; return ablkcipher_setkey(cipher, key, keylen);
} }
static void common_nonsnoop_unmap(struct device *dev, static void common_nonsnoop_unmap(struct device *dev,
...@@ -2313,6 +2379,7 @@ static struct talitos_alg_template driver_algs[] = { ...@@ -2313,6 +2379,7 @@ static struct talitos_alg_template driver_algs[] = {
}, },
.ivsize = DES3_EDE_BLOCK_SIZE, .ivsize = DES3_EDE_BLOCK_SIZE,
.maxauthsize = SHA1_DIGEST_SIZE, .maxauthsize = SHA1_DIGEST_SIZE,
.setkey = aead_des3_setkey,
}, },
.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP | .desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
DESC_HDR_SEL0_DEU | DESC_HDR_SEL0_DEU |
...@@ -2336,6 +2403,7 @@ static struct talitos_alg_template driver_algs[] = { ...@@ -2336,6 +2403,7 @@ static struct talitos_alg_template driver_algs[] = {
}, },
.ivsize = DES3_EDE_BLOCK_SIZE, .ivsize = DES3_EDE_BLOCK_SIZE,
.maxauthsize = SHA1_DIGEST_SIZE, .maxauthsize = SHA1_DIGEST_SIZE,
.setkey = aead_des3_setkey,
}, },
.desc_hdr_template = DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | .desc_hdr_template = DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU |
DESC_HDR_SEL0_DEU | DESC_HDR_SEL0_DEU |
...@@ -2399,6 +2467,7 @@ static struct talitos_alg_template driver_algs[] = { ...@@ -2399,6 +2467,7 @@ static struct talitos_alg_template driver_algs[] = {
}, },
.ivsize = DES3_EDE_BLOCK_SIZE, .ivsize = DES3_EDE_BLOCK_SIZE,
.maxauthsize = SHA224_DIGEST_SIZE, .maxauthsize = SHA224_DIGEST_SIZE,
.setkey = aead_des3_setkey,
}, },
.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP | .desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
DESC_HDR_SEL0_DEU | DESC_HDR_SEL0_DEU |
...@@ -2422,6 +2491,7 @@ static struct talitos_alg_template driver_algs[] = { ...@@ -2422,6 +2491,7 @@ static struct talitos_alg_template driver_algs[] = {
}, },
.ivsize = DES3_EDE_BLOCK_SIZE, .ivsize = DES3_EDE_BLOCK_SIZE,
.maxauthsize = SHA224_DIGEST_SIZE, .maxauthsize = SHA224_DIGEST_SIZE,
.setkey = aead_des3_setkey,
}, },
.desc_hdr_template = DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | .desc_hdr_template = DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU |
DESC_HDR_SEL0_DEU | DESC_HDR_SEL0_DEU |
...@@ -2485,6 +2555,7 @@ static struct talitos_alg_template driver_algs[] = { ...@@ -2485,6 +2555,7 @@ static struct talitos_alg_template driver_algs[] = {
}, },
.ivsize = DES3_EDE_BLOCK_SIZE, .ivsize = DES3_EDE_BLOCK_SIZE,
.maxauthsize = SHA256_DIGEST_SIZE, .maxauthsize = SHA256_DIGEST_SIZE,
.setkey = aead_des3_setkey,
}, },
.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP | .desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
DESC_HDR_SEL0_DEU | DESC_HDR_SEL0_DEU |
...@@ -2508,6 +2579,7 @@ static struct talitos_alg_template driver_algs[] = { ...@@ -2508,6 +2579,7 @@ static struct talitos_alg_template driver_algs[] = {
}, },
.ivsize = DES3_EDE_BLOCK_SIZE, .ivsize = DES3_EDE_BLOCK_SIZE,
.maxauthsize = SHA256_DIGEST_SIZE, .maxauthsize = SHA256_DIGEST_SIZE,
.setkey = aead_des3_setkey,
}, },
.desc_hdr_template = DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | .desc_hdr_template = DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU |
DESC_HDR_SEL0_DEU | DESC_HDR_SEL0_DEU |
...@@ -2550,6 +2622,7 @@ static struct talitos_alg_template driver_algs[] = { ...@@ -2550,6 +2622,7 @@ static struct talitos_alg_template driver_algs[] = {
}, },
.ivsize = DES3_EDE_BLOCK_SIZE, .ivsize = DES3_EDE_BLOCK_SIZE,
.maxauthsize = SHA384_DIGEST_SIZE, .maxauthsize = SHA384_DIGEST_SIZE,
.setkey = aead_des3_setkey,
}, },
.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP | .desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
DESC_HDR_SEL0_DEU | DESC_HDR_SEL0_DEU |
...@@ -2592,6 +2665,7 @@ static struct talitos_alg_template driver_algs[] = { ...@@ -2592,6 +2665,7 @@ static struct talitos_alg_template driver_algs[] = {
}, },
.ivsize = DES3_EDE_BLOCK_SIZE, .ivsize = DES3_EDE_BLOCK_SIZE,
.maxauthsize = SHA512_DIGEST_SIZE, .maxauthsize = SHA512_DIGEST_SIZE,
.setkey = aead_des3_setkey,
}, },
.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP | .desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
DESC_HDR_SEL0_DEU | DESC_HDR_SEL0_DEU |
...@@ -2654,6 +2728,7 @@ static struct talitos_alg_template driver_algs[] = { ...@@ -2654,6 +2728,7 @@ static struct talitos_alg_template driver_algs[] = {
}, },
.ivsize = DES3_EDE_BLOCK_SIZE, .ivsize = DES3_EDE_BLOCK_SIZE,
.maxauthsize = MD5_DIGEST_SIZE, .maxauthsize = MD5_DIGEST_SIZE,
.setkey = aead_des3_setkey,
}, },
.desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP | .desc_hdr_template = DESC_HDR_TYPE_IPSEC_ESP |
DESC_HDR_SEL0_DEU | DESC_HDR_SEL0_DEU |
...@@ -2676,6 +2751,7 @@ static struct talitos_alg_template driver_algs[] = { ...@@ -2676,6 +2751,7 @@ static struct talitos_alg_template driver_algs[] = {
}, },
.ivsize = DES3_EDE_BLOCK_SIZE, .ivsize = DES3_EDE_BLOCK_SIZE,
.maxauthsize = MD5_DIGEST_SIZE, .maxauthsize = MD5_DIGEST_SIZE,
.setkey = aead_des3_setkey,
}, },
.desc_hdr_template = DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | .desc_hdr_template = DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU |
DESC_HDR_SEL0_DEU | DESC_HDR_SEL0_DEU |
...@@ -2748,6 +2824,7 @@ static struct talitos_alg_template driver_algs[] = { ...@@ -2748,6 +2824,7 @@ static struct talitos_alg_template driver_algs[] = {
.min_keysize = DES_KEY_SIZE, .min_keysize = DES_KEY_SIZE,
.max_keysize = DES_KEY_SIZE, .max_keysize = DES_KEY_SIZE,
.ivsize = DES_BLOCK_SIZE, .ivsize = DES_BLOCK_SIZE,
.setkey = ablkcipher_des_setkey,
} }
}, },
.desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | .desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |
...@@ -2764,6 +2841,7 @@ static struct talitos_alg_template driver_algs[] = { ...@@ -2764,6 +2841,7 @@ static struct talitos_alg_template driver_algs[] = {
.min_keysize = DES_KEY_SIZE, .min_keysize = DES_KEY_SIZE,
.max_keysize = DES_KEY_SIZE, .max_keysize = DES_KEY_SIZE,
.ivsize = DES_BLOCK_SIZE, .ivsize = DES_BLOCK_SIZE,
.setkey = ablkcipher_des_setkey,
} }
}, },
.desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | .desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |
...@@ -2781,6 +2859,7 @@ static struct talitos_alg_template driver_algs[] = { ...@@ -2781,6 +2859,7 @@ static struct talitos_alg_template driver_algs[] = {
.min_keysize = DES3_EDE_KEY_SIZE, .min_keysize = DES3_EDE_KEY_SIZE,
.max_keysize = DES3_EDE_KEY_SIZE, .max_keysize = DES3_EDE_KEY_SIZE,
.ivsize = DES3_EDE_BLOCK_SIZE, .ivsize = DES3_EDE_BLOCK_SIZE,
.setkey = ablkcipher_des3_setkey,
} }
}, },
.desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | .desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |
...@@ -2798,6 +2877,7 @@ static struct talitos_alg_template driver_algs[] = { ...@@ -2798,6 +2877,7 @@ static struct talitos_alg_template driver_algs[] = {
.min_keysize = DES3_EDE_KEY_SIZE, .min_keysize = DES3_EDE_KEY_SIZE,
.max_keysize = DES3_EDE_KEY_SIZE, .max_keysize = DES3_EDE_KEY_SIZE,
.ivsize = DES3_EDE_BLOCK_SIZE, .ivsize = DES3_EDE_BLOCK_SIZE,
.setkey = ablkcipher_des3_setkey,
} }
}, },
.desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | .desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |
...@@ -3144,7 +3224,8 @@ static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev, ...@@ -3144,7 +3224,8 @@ static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev,
alg->cra_init = talitos_cra_init; alg->cra_init = talitos_cra_init;
alg->cra_exit = talitos_cra_exit; alg->cra_exit = talitos_cra_exit;
alg->cra_type = &crypto_ablkcipher_type; alg->cra_type = &crypto_ablkcipher_type;
alg->cra_ablkcipher.setkey = ablkcipher_setkey; alg->cra_ablkcipher.setkey = alg->cra_ablkcipher.setkey ?:
ablkcipher_setkey;
alg->cra_ablkcipher.encrypt = ablkcipher_encrypt; alg->cra_ablkcipher.encrypt = ablkcipher_encrypt;
alg->cra_ablkcipher.decrypt = ablkcipher_decrypt; alg->cra_ablkcipher.decrypt = ablkcipher_decrypt;
break; break;
...@@ -3152,7 +3233,8 @@ static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev, ...@@ -3152,7 +3233,8 @@ static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev,
alg = &t_alg->algt.alg.aead.base; alg = &t_alg->algt.alg.aead.base;
alg->cra_exit = talitos_cra_exit; alg->cra_exit = talitos_cra_exit;
t_alg->algt.alg.aead.init = talitos_cra_init_aead; t_alg->algt.alg.aead.init = talitos_cra_init_aead;
t_alg->algt.alg.aead.setkey = aead_setkey; t_alg->algt.alg.aead.setkey = t_alg->algt.alg.aead.setkey ?:
aead_setkey;
t_alg->algt.alg.aead.encrypt = aead_encrypt; t_alg->algt.alg.aead.encrypt = aead_encrypt;
t_alg->algt.alg.aead.decrypt = aead_decrypt; t_alg->algt.alg.aead.decrypt = aead_decrypt;
if (!(priv->features & TALITOS_FTR_SHA224_HWINIT) && if (!(priv->features & TALITOS_FTR_SHA224_HWINIT) &&
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7