* [PATCH 0/4] crypto: caam - add ecb mode support
@ 2019-02-08 13:50 Iuliana Prodan
2019-02-08 13:50 ` [PATCH 1/4] crypto: caam - use mapped_{src,dst}_nents for job descriptor Iuliana Prodan
` (6 more replies)
0 siblings, 7 replies; 13+ messages in thread
From: Iuliana Prodan @ 2019-02-08 13:50 UTC (permalink / raw)
To: Herbert Xu, Horia Geanta, Aymen Sghaier
Cc: David S. Miller, linux-crypto, linux-kernel, linux-imx
This patch set adds ecb mode support for aes, des, 3des and arc4 ciphers.
skcipher implementation is reused, making sure to handle the no IV case.
While here:
-fix a DMA API issue where initial src/dst_nents are used instead of nents
returned by dma_map_sg()
-export arc4 defines in a common header
-update cbc des and 3des to check for weak keys
Iuliana Prodan (4):
crypto: caam - use mapped_{src,dst}_nents for job descriptor
crypto: export arc4 defines
crypto: caam - add ecb(*) support
crypto: caam - weak key checking for cbc des, 3des
crypto/arc4.c | 5 +-
drivers/crypto/bcm/cipher.h | 4 +-
drivers/crypto/caam/Kconfig | 1 +
drivers/crypto/caam/caamalg.c | 215 ++++++++++++++++++++++++++++---------
drivers/crypto/caam/caamalg_desc.c | 18 ++--
drivers/crypto/caam/compat.h | 1 +
include/crypto/arc4.h | 13 +++
7 files changed, 195 insertions(+), 62 deletions(-)
create mode 100644 include/crypto/arc4.h
--
2.1.0
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH 1/4] crypto: caam - use mapped_{src,dst}_nents for job descriptor 2019-02-08 13:50 [PATCH 0/4] crypto: caam - add ecb mode support Iuliana Prodan @ 2019-02-08 13:50 ` Iuliana Prodan 2019-02-08 13:50 ` [PATCH 2/4] crypto: export arc4 defines Iuliana Prodan ` (5 subsequent siblings) 6 siblings, 0 replies; 13+ messages in thread From: Iuliana Prodan @ 2019-02-08 13:50 UTC (permalink / raw) To: Herbert Xu, Horia Geanta, Aymen Sghaier Cc: David S. Miller, linux-crypto, linux-kernel, linux-imx The mapped_{src,dst}_nents _returned_ from the dma_map_sg call (which could be less than src/dst_nents) have to be used to generate the aead, skcipher job descriptors. Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com> --- drivers/crypto/caam/caamalg.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c index a9ff2e1..6a52115 100644 --- a/drivers/crypto/caam/caamalg.c +++ b/drivers/crypto/caam/caamalg.c @@ -802,6 +802,8 @@ static int xts_skcipher_setkey(struct crypto_skcipher *skcipher, const u8 *key, * aead_edesc - s/w-extended aead descriptor * @src_nents: number of segments in input s/w scatterlist * @dst_nents: number of segments in output s/w scatterlist + * @mapped_src_nents: number of segments in input h/w link table + * @mapped_dst_nents: number of segments in output h/w link table * @sec4_sg_bytes: length of dma mapped sec4_sg space * @sec4_sg_dma: bus physical mapped address of h/w link table * @sec4_sg: pointer to h/w link table @@ -810,6 +812,8 @@ static int xts_skcipher_setkey(struct crypto_skcipher *skcipher, const u8 *key, struct aead_edesc { int src_nents; int dst_nents; + int mapped_src_nents; + int mapped_dst_nents; int sec4_sg_bytes; dma_addr_t sec4_sg_dma; struct sec4_sg_entry *sec4_sg; @@ -820,6 +824,8 @@ struct aead_edesc { * skcipher_edesc - s/w-extended skcipher descriptor * @src_nents: number of segments in input s/w scatterlist * @dst_nents: number of segments in output s/w scatterlist + * @mapped_src_nents: number of segments in input h/w link table + * @mapped_dst_nents: number of segments in output h/w link table * @iv_dma: dma address of iv for checking continuity and link table * @sec4_sg_bytes: length of dma mapped sec4_sg space * @sec4_sg_dma: bus physical mapped address of h/w link table @@ -830,6 +836,8 @@ struct aead_edesc { struct skcipher_edesc { int src_nents; int dst_nents; + int mapped_src_nents; + int mapped_dst_nents; dma_addr_t iv_dma; int sec4_sg_bytes; dma_addr_t sec4_sg_dma; @@ -1024,11 +1032,12 @@ static void init_aead_job(struct aead_request *req, init_job_desc_shared(desc, ptr, len, HDR_SHARE_DEFER | HDR_REVERSE); if (all_contig) { - src_dma = edesc->src_nents ? sg_dma_address(req->src) : 0; + src_dma = edesc->mapped_src_nents ? sg_dma_address(req->src) : + 0; in_options = 0; } else { src_dma = edesc->sec4_sg_dma; - sec4_sg_index += edesc->src_nents; + sec4_sg_index += edesc->mapped_src_nents; in_options = LDST_SGF; } @@ -1039,9 +1048,9 @@ static void init_aead_job(struct aead_request *req, out_options = in_options; if (unlikely(req->src != req->dst)) { - if (!edesc->dst_nents) { + if (!edesc->mapped_dst_nents) { dst_dma = 0; - } else if (edesc->dst_nents == 1) { + } else if (edesc->mapped_dst_nents == 1) { dst_dma = sg_dma_address(req->dst); out_options = 0; } else { @@ -1214,11 +1223,11 @@ static void init_skcipher_job(struct skcipher_request *req, dst_dma = edesc->sec4_sg_dma + sizeof(struct sec4_sg_entry); out_options = LDST_SGF; } else { - if (edesc->dst_nents == 1) { + if (edesc->mapped_dst_nents == 1) { dst_dma = sg_dma_address(req->dst); } else { - dst_dma = edesc->sec4_sg_dma + (edesc->src_nents + 1) * - sizeof(struct sec4_sg_entry); + dst_dma = edesc->sec4_sg_dma + (edesc->mapped_src_nents + + 1) * sizeof(struct sec4_sg_entry); out_options = LDST_SGF; } } @@ -1324,6 +1333,8 @@ static struct aead_edesc *aead_edesc_alloc(struct aead_request *req, edesc->src_nents = src_nents; edesc->dst_nents = dst_nents; + edesc->mapped_src_nents = mapped_src_nents; + edesc->mapped_dst_nents = mapped_dst_nents; edesc->sec4_sg = (void *)edesc + sizeof(struct aead_edesc) + desc_bytes; *all_contig_ptr = !(mapped_src_nents > 1); @@ -1661,6 +1672,8 @@ static struct skcipher_edesc *skcipher_edesc_alloc(struct skcipher_request *req, edesc->src_nents = src_nents; edesc->dst_nents = dst_nents; + edesc->mapped_src_nents = mapped_src_nents; + edesc->mapped_dst_nents = mapped_dst_nents; edesc->sec4_sg_bytes = sec4_sg_bytes; edesc->sec4_sg = (struct sec4_sg_entry *)((u8 *)edesc->hw_desc + desc_bytes); -- 2.1.0 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 2/4] crypto: export arc4 defines 2019-02-08 13:50 [PATCH 0/4] crypto: caam - add ecb mode support Iuliana Prodan 2019-02-08 13:50 ` [PATCH 1/4] crypto: caam - use mapped_{src,dst}_nents for job descriptor Iuliana Prodan @ 2019-02-08 13:50 ` Iuliana Prodan 2019-02-08 13:50 ` [PATCH 3/4] crypto: caam - add ecb(*) support Iuliana Prodan ` (4 subsequent siblings) 6 siblings, 0 replies; 13+ messages in thread From: Iuliana Prodan @ 2019-02-08 13:50 UTC (permalink / raw) To: Herbert Xu, Horia Geanta, Aymen Sghaier Cc: David S. Miller, linux-crypto, linux-kernel, linux-imx Some arc4 cipher algorithm defines show up in two places: crypto/arc4.c and drivers/crypto/bcm/cipher.h. Let's export them in a common header and update their users. Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com> --- crypto/arc4.c | 5 +---- drivers/crypto/bcm/cipher.h | 4 +--- include/crypto/arc4.h | 13 +++++++++++++ 3 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 include/crypto/arc4.h diff --git a/crypto/arc4.c b/crypto/arc4.c index 652d243..6c93342 100644 --- a/crypto/arc4.c +++ b/crypto/arc4.c @@ -13,14 +13,11 @@ */ #include <crypto/algapi.h> +#include <crypto/arc4.h> #include <crypto/internal/skcipher.h> #include <linux/init.h> #include <linux/module.h> -#define ARC4_MIN_KEY_SIZE 1 -#define ARC4_MAX_KEY_SIZE 256 -#define ARC4_BLOCK_SIZE 1 - struct arc4_ctx { u32 S[256]; u32 x, y; diff --git a/drivers/crypto/bcm/cipher.h b/drivers/crypto/bcm/cipher.h index 763c425..f6da497 100644 --- a/drivers/crypto/bcm/cipher.h +++ b/drivers/crypto/bcm/cipher.h @@ -23,6 +23,7 @@ #include <crypto/aes.h> #include <crypto/internal/hash.h> #include <crypto/aead.h> +#include <crypto/arc4.h> #include <crypto/gcm.h> #include <crypto/sha.h> #include <crypto/sha3.h> @@ -34,9 +35,6 @@ /* Driver supports up to MAX_SPUS SPU blocks */ #define MAX_SPUS 16 -#define ARC4_MIN_KEY_SIZE 1 -#define ARC4_MAX_KEY_SIZE 256 -#define ARC4_BLOCK_SIZE 1 #define ARC4_STATE_SIZE 4 #define CCM_AES_IV_SIZE 16 diff --git a/include/crypto/arc4.h b/include/crypto/arc4.h new file mode 100644 index 0000000..5b2c24a --- /dev/null +++ b/include/crypto/arc4.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Common values for ARC4 Cipher Algorithm + */ + +#ifndef _CRYPTO_ARC4_H +#define _CRYPTO_ARC4_H + +#define ARC4_MIN_KEY_SIZE 1 +#define ARC4_MAX_KEY_SIZE 256 +#define ARC4_BLOCK_SIZE 1 + +#endif /* _CRYPTO_ARC4_H */ -- 2.1.0 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 3/4] crypto: caam - add ecb(*) support 2019-02-08 13:50 [PATCH 0/4] crypto: caam - add ecb mode support Iuliana Prodan 2019-02-08 13:50 ` [PATCH 1/4] crypto: caam - use mapped_{src,dst}_nents for job descriptor Iuliana Prodan 2019-02-08 13:50 ` [PATCH 2/4] crypto: export arc4 defines Iuliana Prodan @ 2019-02-08 13:50 ` Iuliana Prodan 2019-02-08 13:50 ` [PATCH 4/4] crypto: caam - weak key checking for cbc des, 3des Iuliana Prodan ` (3 subsequent siblings) 6 siblings, 0 replies; 13+ messages in thread From: Iuliana Prodan @ 2019-02-08 13:50 UTC (permalink / raw) To: Herbert Xu, Horia Geanta, Aymen Sghaier Cc: David S. Miller, linux-crypto, linux-kernel, linux-imx Add ecb mode support for aes, des, 3des and arc4 ciphers. ecb(*) reuses existing skcipher implementation, updating it with support for no IV. Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com> --- drivers/crypto/caam/Kconfig | 1 + drivers/crypto/caam/caamalg.c | 190 +++++++++++++++++++++++++++++-------- drivers/crypto/caam/caamalg_desc.c | 18 ++-- drivers/crypto/caam/compat.h | 1 + 4 files changed, 161 insertions(+), 49 deletions(-) diff --git a/drivers/crypto/caam/Kconfig b/drivers/crypto/caam/Kconfig index c4b1cad..577c984 100644 --- a/drivers/crypto/caam/Kconfig +++ b/drivers/crypto/caam/Kconfig @@ -91,6 +91,7 @@ config CRYPTO_DEV_FSL_CAAM_CRYPTO_API select CRYPTO_AEAD select CRYPTO_AUTHENC select CRYPTO_BLKCIPHER + select CRYPTO_DES help Selecting this will offload crypto for users of the scatterlist crypto API (such as the linux native IPSec diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c index 6a52115..90d83ae 100644 --- a/drivers/crypto/caam/caamalg.c +++ b/drivers/crypto/caam/caamalg.c @@ -3,7 +3,7 @@ * caam - Freescale FSL CAAM support for crypto API * * Copyright 2008-2011 Freescale Semiconductor, Inc. - * Copyright 2016-2018 NXP + * Copyright 2016-2019 NXP * * Based on talitos crypto API driver. * @@ -766,6 +766,27 @@ static int skcipher_setkey(struct crypto_skcipher *skcipher, const u8 *key, return 0; } +static int des_skcipher_setkey(struct crypto_skcipher *skcipher, + const u8 *key, unsigned int keylen) +{ + u32 tmp[DES3_EDE_EXPKEY_WORDS]; + struct crypto_tfm *tfm = crypto_skcipher_tfm(skcipher); + + if (keylen == DES3_EDE_KEY_SIZE && + __des3_ede_setkey(tmp, &tfm->crt_flags, key, DES3_EDE_KEY_SIZE)) { + return -EINVAL; + } + + if (!des_ekey(tmp, key) && (crypto_skcipher_get_flags(skcipher) & + CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) { + crypto_skcipher_set_flags(skcipher, + CRYPTO_TFM_RES_WEAK_KEY); + return -EINVAL; + } + + return skcipher_setkey(skcipher, key, keylen); +} + static int xts_skcipher_setkey(struct crypto_skcipher *skcipher, const u8 *key, unsigned int keylen) { @@ -970,8 +991,9 @@ static void skcipher_encrypt_done(struct device *jrdev, u32 *desc, u32 err, * The crypto API expects us to set the IV (req->iv) to the last * ciphertext block. This is used e.g. by the CTS mode. */ - scatterwalk_map_and_copy(req->iv, req->dst, req->cryptlen - ivsize, - ivsize, 0); + if (ivsize) + scatterwalk_map_and_copy(req->iv, req->dst, req->cryptlen - + ivsize, ivsize, 0); kfree(edesc); @@ -1196,9 +1218,9 @@ static void init_skcipher_job(struct skcipher_request *req, int ivsize = crypto_skcipher_ivsize(skcipher); u32 *desc = edesc->hw_desc; u32 *sh_desc; - u32 out_options = 0; - dma_addr_t dst_dma, ptr; - int len; + u32 in_options = 0, out_options = 0; + dma_addr_t src_dma, dst_dma, ptr; + int len, sec4_sg_index = 0; #ifdef DEBUG print_hex_dump(KERN_ERR, "presciv@"__stringify(__LINE__)": ", @@ -1216,21 +1238,27 @@ static void init_skcipher_job(struct skcipher_request *req, len = desc_len(sh_desc); init_job_desc_shared(desc, ptr, len, HDR_SHARE_DEFER | HDR_REVERSE); - append_seq_in_ptr(desc, edesc->sec4_sg_dma, req->cryptlen + ivsize, - LDST_SGF); + if (ivsize || edesc->mapped_src_nents > 1) { + src_dma = edesc->sec4_sg_dma; + sec4_sg_index = edesc->mapped_src_nents + !!ivsize; + in_options = LDST_SGF; + } else { + src_dma = sg_dma_address(req->src); + } + + append_seq_in_ptr(desc, src_dma, req->cryptlen + ivsize, in_options); if (likely(req->src == req->dst)) { - dst_dma = edesc->sec4_sg_dma + sizeof(struct sec4_sg_entry); - out_options = LDST_SGF; + dst_dma = src_dma + !!ivsize * sizeof(struct sec4_sg_entry); + out_options = in_options; + } else if (edesc->mapped_dst_nents == 1) { + dst_dma = sg_dma_address(req->dst); } else { - if (edesc->mapped_dst_nents == 1) { - dst_dma = sg_dma_address(req->dst); - } else { - dst_dma = edesc->sec4_sg_dma + (edesc->mapped_src_nents - + 1) * sizeof(struct sec4_sg_entry); - out_options = LDST_SGF; - } + dst_dma = edesc->sec4_sg_dma + sec4_sg_index * + sizeof(struct sec4_sg_entry); + out_options = LDST_SGF; } + append_seq_out_ptr(desc, dst_dma, req->cryptlen, out_options); } @@ -1608,7 +1636,7 @@ static struct skcipher_edesc *skcipher_edesc_alloc(struct skcipher_request *req, GFP_KERNEL : GFP_ATOMIC; int src_nents, mapped_src_nents, dst_nents = 0, mapped_dst_nents = 0; struct skcipher_edesc *edesc; - dma_addr_t iv_dma; + dma_addr_t iv_dma = 0; u8 *iv; int ivsize = crypto_skcipher_ivsize(skcipher); int dst_sg_idx, sec4_sg_ents, sec4_sg_bytes; @@ -1643,7 +1671,6 @@ static struct skcipher_edesc *skcipher_edesc_alloc(struct skcipher_request *req, dev_err(jrdev, "unable to map source\n"); return ERR_PTR(-ENOMEM); } - mapped_dst_nents = dma_map_sg(jrdev, req->dst, dst_nents, DMA_FROM_DEVICE); if (unlikely(!mapped_dst_nents)) { @@ -1653,7 +1680,10 @@ static struct skcipher_edesc *skcipher_edesc_alloc(struct skcipher_request *req, } } - sec4_sg_ents = 1 + mapped_src_nents; + if (!ivsize && mapped_src_nents == 1) + sec4_sg_ents = 0; // no need for an input hw s/g table + else + sec4_sg_ents = mapped_src_nents + !!ivsize; dst_sg_idx = sec4_sg_ents; sec4_sg_ents += mapped_dst_nents > 1 ? mapped_dst_nents : 0; sec4_sg_bytes = sec4_sg_ents * sizeof(struct sec4_sg_entry); @@ -1679,34 +1709,41 @@ static struct skcipher_edesc *skcipher_edesc_alloc(struct skcipher_request *req, desc_bytes); /* Make sure IV is located in a DMAable area */ - iv = (u8 *)edesc->hw_desc + desc_bytes + sec4_sg_bytes; - memcpy(iv, req->iv, ivsize); + if (ivsize) { + iv = (u8 *)edesc->hw_desc + desc_bytes + sec4_sg_bytes; + memcpy(iv, req->iv, ivsize); + + iv_dma = dma_map_single(jrdev, iv, ivsize, DMA_TO_DEVICE); + if (dma_mapping_error(jrdev, iv_dma)) { + dev_err(jrdev, "unable to map IV\n"); + caam_unmap(jrdev, req->src, req->dst, src_nents, + dst_nents, 0, 0, 0, 0); + kfree(edesc); + return ERR_PTR(-ENOMEM); + } - iv_dma = dma_map_single(jrdev, iv, ivsize, DMA_TO_DEVICE); - if (dma_mapping_error(jrdev, iv_dma)) { - dev_err(jrdev, "unable to map IV\n"); - caam_unmap(jrdev, req->src, req->dst, src_nents, dst_nents, 0, - 0, 0, 0); - kfree(edesc); - return ERR_PTR(-ENOMEM); + dma_to_sec4_sg_one(edesc->sec4_sg, iv_dma, ivsize, 0); } - - dma_to_sec4_sg_one(edesc->sec4_sg, iv_dma, ivsize, 0); - sg_to_sec4_sg_last(req->src, mapped_src_nents, edesc->sec4_sg + 1, 0); + if (dst_sg_idx) + sg_to_sec4_sg_last(req->src, mapped_src_nents, edesc->sec4_sg + + !!ivsize, 0); if (mapped_dst_nents > 1) { sg_to_sec4_sg_last(req->dst, mapped_dst_nents, edesc->sec4_sg + dst_sg_idx, 0); } - edesc->sec4_sg_dma = dma_map_single(jrdev, edesc->sec4_sg, - sec4_sg_bytes, DMA_TO_DEVICE); - if (dma_mapping_error(jrdev, edesc->sec4_sg_dma)) { - dev_err(jrdev, "unable to map S/G table\n"); - caam_unmap(jrdev, req->src, req->dst, src_nents, dst_nents, - iv_dma, ivsize, 0, 0); - kfree(edesc); - return ERR_PTR(-ENOMEM); + if (sec4_sg_bytes) { + edesc->sec4_sg_dma = dma_map_single(jrdev, edesc->sec4_sg, + sec4_sg_bytes, + DMA_TO_DEVICE); + if (dma_mapping_error(jrdev, edesc->sec4_sg_dma)) { + dev_err(jrdev, "unable to map S/G table\n"); + caam_unmap(jrdev, req->src, req->dst, src_nents, + dst_nents, iv_dma, ivsize, 0, 0); + kfree(edesc); + return ERR_PTR(-ENOMEM); + } } edesc->iv_dma = iv_dma; @@ -1773,8 +1810,9 @@ static int skcipher_decrypt(struct skcipher_request *req) * The crypto API expects us to set the IV (req->iv) to the last * ciphertext block. */ - scatterwalk_map_and_copy(req->iv, req->src, req->cryptlen - ivsize, - ivsize, 0); + if (ivsize) + scatterwalk_map_and_copy(req->iv, req->src, req->cryptlen - + ivsize, ivsize, 0); /* Create and submit job descriptor*/ init_skcipher_job(req, edesc, false); @@ -1902,6 +1940,66 @@ static struct caam_skcipher_alg driver_algs[] = { }, .caam.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_XTS, }, + { + .skcipher = { + .base = { + .cra_name = "ecb(des)", + .cra_driver_name = "ecb-des-caam", + .cra_blocksize = DES_BLOCK_SIZE, + }, + .setkey = des_skcipher_setkey, + .encrypt = skcipher_encrypt, + .decrypt = skcipher_decrypt, + .min_keysize = DES_KEY_SIZE, + .max_keysize = DES_KEY_SIZE, + }, + .caam.class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_ECB, + }, + { + .skcipher = { + .base = { + .cra_name = "ecb(aes)", + .cra_driver_name = "ecb-aes-caam", + .cra_blocksize = AES_BLOCK_SIZE, + }, + .setkey = skcipher_setkey, + .encrypt = skcipher_encrypt, + .decrypt = skcipher_decrypt, + .min_keysize = AES_MIN_KEY_SIZE, + .max_keysize = AES_MAX_KEY_SIZE, + }, + .caam.class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_ECB, + }, + { + .skcipher = { + .base = { + .cra_name = "ecb(des3_ede)", + .cra_driver_name = "ecb-des3-caam", + .cra_blocksize = DES3_EDE_BLOCK_SIZE, + }, + .setkey = des_skcipher_setkey, + .encrypt = skcipher_encrypt, + .decrypt = skcipher_decrypt, + .min_keysize = DES3_EDE_KEY_SIZE, + .max_keysize = DES3_EDE_KEY_SIZE, + }, + .caam.class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_ECB, + }, + { + .skcipher = { + .base = { + .cra_name = "ecb(arc4)", + .cra_driver_name = "ecb-arc4-caam", + .cra_blocksize = ARC4_BLOCK_SIZE, + }, + .setkey = skcipher_setkey, + .encrypt = skcipher_encrypt, + .decrypt = skcipher_decrypt, + .min_keysize = ARC4_MIN_KEY_SIZE, + .max_keysize = ARC4_MAX_KEY_SIZE, + }, + .caam.class1_alg_type = OP_ALG_ALGSEL_ARC4 | OP_ALG_AAI_ECB, + }, }; static struct caam_aead_alg driver_aeads[] = { @@ -3361,6 +3459,7 @@ static int __init caam_algapi_init(void) struct caam_drv_private *priv; int i = 0, err = 0; u32 aes_vid, aes_inst, des_inst, md_vid, md_inst, ccha_inst, ptha_inst; + u32 arc4_inst; unsigned int md_limit = SHA512_DIGEST_SIZE; bool registered = false; @@ -3405,6 +3504,8 @@ static int __init caam_algapi_init(void) CHA_ID_LS_DES_SHIFT; aes_inst = cha_inst & CHA_ID_LS_AES_MASK; md_inst = (cha_inst & CHA_ID_LS_MD_MASK) >> CHA_ID_LS_MD_SHIFT; + arc4_inst = (cha_inst & CHA_ID_LS_ARC4_MASK) >> + CHA_ID_LS_ARC4_SHIFT; ccha_inst = 0; ptha_inst = 0; } else { @@ -3421,6 +3522,7 @@ static int __init caam_algapi_init(void) md_inst = mdha & CHA_VER_NUM_MASK; ccha_inst = rd_reg32(&priv->ctrl->vreg.ccha) & CHA_VER_NUM_MASK; ptha_inst = rd_reg32(&priv->ctrl->vreg.ptha) & CHA_VER_NUM_MASK; + arc4_inst = rd_reg32(&priv->ctrl->vreg.afha) & CHA_VER_NUM_MASK; } /* If MD is present, limit digest size based on LP256 */ @@ -3441,6 +3543,10 @@ static int __init caam_algapi_init(void) if (!aes_inst && (alg_sel == OP_ALG_ALGSEL_AES)) continue; + /* Skip ARC4 algorithms if not supported by device */ + if (!arc4_inst && alg_sel == OP_ALG_ALGSEL_ARC4) + continue; + /* * Check support for AES modes not available * on LP devices. diff --git a/drivers/crypto/caam/caamalg_desc.c b/drivers/crypto/caam/caamalg_desc.c index 7db1640..1e1a376 100644 --- a/drivers/crypto/caam/caamalg_desc.c +++ b/drivers/crypto/caam/caamalg_desc.c @@ -2,7 +2,7 @@ /* * Shared descriptors for aead, skcipher algorithms * - * Copyright 2016-2018 NXP + * Copyright 2016-2019 NXP */ #include "compat.h" @@ -1396,9 +1396,11 @@ void cnstr_shdsc_skcipher_encap(u32 * const desc, struct alginfo *cdata, set_jump_tgt_here(desc, key_jump_cmd); - /* Load iv */ - append_seq_load(desc, ivsize, LDST_SRCDST_BYTE_CONTEXT | - LDST_CLASS_1_CCB | (ctx1_iv_off << LDST_OFFSET_SHIFT)); + /* Load IV, if there is one */ + if (ivsize) + append_seq_load(desc, ivsize, LDST_SRCDST_BYTE_CONTEXT | + LDST_CLASS_1_CCB | (ctx1_iv_off << + LDST_OFFSET_SHIFT)); /* Load counter into CONTEXT1 reg */ if (is_rfc3686) @@ -1462,9 +1464,11 @@ void cnstr_shdsc_skcipher_decap(u32 * const desc, struct alginfo *cdata, set_jump_tgt_here(desc, key_jump_cmd); - /* load IV */ - append_seq_load(desc, ivsize, LDST_SRCDST_BYTE_CONTEXT | - LDST_CLASS_1_CCB | (ctx1_iv_off << LDST_OFFSET_SHIFT)); + /* Load IV, if there is one */ + if (ivsize) + append_seq_load(desc, ivsize, LDST_SRCDST_BYTE_CONTEXT | + LDST_CLASS_1_CCB | (ctx1_iv_off << + LDST_OFFSET_SHIFT)); /* Load counter into CONTEXT1 reg */ if (is_rfc3686) diff --git a/drivers/crypto/caam/compat.h b/drivers/crypto/caam/compat.h index 87d9efe..8639b2df 100644 --- a/drivers/crypto/caam/compat.h +++ b/drivers/crypto/caam/compat.h @@ -43,6 +43,7 @@ #include <crypto/akcipher.h> #include <crypto/scatterwalk.h> #include <crypto/skcipher.h> +#include <crypto/arc4.h> #include <crypto/internal/skcipher.h> #include <crypto/internal/hash.h> #include <crypto/internal/rsa.h> -- 2.1.0 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 4/4] crypto: caam - weak key checking for cbc des, 3des 2019-02-08 13:50 [PATCH 0/4] crypto: caam - add ecb mode support Iuliana Prodan ` (2 preceding siblings ...) 2019-02-08 13:50 ` [PATCH 3/4] crypto: caam - add ecb(*) support Iuliana Prodan @ 2019-02-08 13:50 ` Iuliana Prodan 2019-02-09 21:52 ` [PATCH 0/4] crypto: caam - add ecb mode support Eric Biggers ` (2 subsequent siblings) 6 siblings, 0 replies; 13+ messages in thread From: Iuliana Prodan @ 2019-02-08 13:50 UTC (permalink / raw) To: Herbert Xu, Horia Geanta, Aymen Sghaier Cc: David S. Miller, linux-crypto, linux-kernel, linux-imx Modify setkey callback for cbc des and 3des to check for weak keys. Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com> --- drivers/crypto/caam/caamalg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c index 90d83ae..9eac509 100644 --- a/drivers/crypto/caam/caamalg.c +++ b/drivers/crypto/caam/caamalg.c @@ -1858,7 +1858,7 @@ static struct caam_skcipher_alg driver_algs[] = { .cra_driver_name = "cbc-3des-caam", .cra_blocksize = DES3_EDE_BLOCK_SIZE, }, - .setkey = skcipher_setkey, + .setkey = des_skcipher_setkey, .encrypt = skcipher_encrypt, .decrypt = skcipher_decrypt, .min_keysize = DES3_EDE_KEY_SIZE, @@ -1874,7 +1874,7 @@ static struct caam_skcipher_alg driver_algs[] = { .cra_driver_name = "cbc-des-caam", .cra_blocksize = DES_BLOCK_SIZE, }, - .setkey = skcipher_setkey, + .setkey = des_skcipher_setkey, .encrypt = skcipher_encrypt, .decrypt = skcipher_decrypt, .min_keysize = DES_KEY_SIZE, -- 2.1.0 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 0/4] crypto: caam - add ecb mode support 2019-02-08 13:50 [PATCH 0/4] crypto: caam - add ecb mode support Iuliana Prodan ` (3 preceding siblings ...) 2019-02-08 13:50 ` [PATCH 4/4] crypto: caam - weak key checking for cbc des, 3des Iuliana Prodan @ 2019-02-09 21:52 ` Eric Biggers 2019-02-13 18:45 ` Horia Geanta 2019-02-14 20:57 ` Horia Geanta 2019-02-15 5:24 ` Herbert Xu 6 siblings, 1 reply; 13+ messages in thread From: Eric Biggers @ 2019-02-09 21:52 UTC (permalink / raw) To: Iuliana Prodan Cc: Herbert Xu, Horia Geanta, Aymen Sghaier, David S. Miller, linux-crypto, linux-kernel, linux-imx Hi Iuliana, On Fri, Feb 08, 2019 at 03:50:06PM +0200, Iuliana Prodan wrote: > This patch set adds ecb mode support for aes, des, 3des and arc4 ciphers. > skcipher implementation is reused, making sure to handle the no IV case. > > While here: > -fix a DMA API issue where initial src/dst_nents are used instead of nents > returned by dma_map_sg() > -export arc4 defines in a common header > -update cbc des and 3des to check for weak keys > > Iuliana Prodan (4): > crypto: caam - use mapped_{src,dst}_nents for job descriptor > crypto: export arc4 defines > crypto: caam - add ecb(*) support > crypto: caam - weak key checking for cbc des, 3des > Do you have an actual use case for adding more DES, 3DES, and ARC4 implementations, or are you simply adding them because the hardware happens to supports it? These old ciphers are insecure, so IMO more implementations should only be added if there is a real use case where they're absolutely needed. - Eric ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/4] crypto: caam - add ecb mode support 2019-02-09 21:52 ` [PATCH 0/4] crypto: caam - add ecb mode support Eric Biggers @ 2019-02-13 18:45 ` Horia Geanta 2019-02-13 18:51 ` Eric Biggers 0 siblings, 1 reply; 13+ messages in thread From: Horia Geanta @ 2019-02-13 18:45 UTC (permalink / raw) To: Eric Biggers, Iuliana Prodan Cc: Herbert Xu, Aymen Sghaier, David S. Miller, linux-crypto, linux-kernel, dl-linux-imx On 2/9/2019 11:52 PM, Eric Biggers wrote: > Do you have an actual use case for adding more DES, 3DES, and ARC4 > implementations, or are you simply adding them because the hardware happens to > supports it? These old ciphers are insecure, so IMO more implementations should > only be added if there is a real use case where they're absolutely needed. > One legit use case is PIN encryption in Point of Sale solution. Horia ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/4] crypto: caam - add ecb mode support 2019-02-13 18:45 ` Horia Geanta @ 2019-02-13 18:51 ` Eric Biggers 2019-02-15 5:24 ` Herbert Xu 0 siblings, 1 reply; 13+ messages in thread From: Eric Biggers @ 2019-02-13 18:51 UTC (permalink / raw) To: Horia Geanta Cc: Iuliana Prodan, Herbert Xu, Aymen Sghaier, David S. Miller, linux-crypto, linux-kernel, dl-linux-imx On Wed, Feb 13, 2019 at 06:45:16PM +0000, Horia Geanta wrote: > On 2/9/2019 11:52 PM, Eric Biggers wrote: > > Do you have an actual use case for adding more DES, 3DES, and ARC4 > > implementations, or are you simply adding them because the hardware happens to > > supports it? These old ciphers are insecure, so IMO more implementations should > > only be added if there is a real use case where they're absolutely needed. > > > One legit use case is PIN encryption in Point of Sale solution. > > Horia You are claiming you need DES-ECB, 3DES-ECB, *and* ARC4 for that? Which one is it actually, if any? ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/4] crypto: caam - add ecb mode support 2019-02-13 18:51 ` Eric Biggers @ 2019-02-15 5:24 ` Herbert Xu 2019-02-15 5:54 ` Eric Biggers 0 siblings, 1 reply; 13+ messages in thread From: Herbert Xu @ 2019-02-15 5:24 UTC (permalink / raw) To: Eric Biggers Cc: Horia Geanta, Iuliana Prodan, Aymen Sghaier, David S. Miller, linux-crypto, linux-kernel, dl-linux-imx On Wed, Feb 13, 2019 at 10:51:36AM -0800, Eric Biggers wrote: > > You are claiming you need DES-ECB, 3DES-ECB, *and* ARC4 for that? > > Which one is it actually, if any? Since these are existing algorithms in the crypto API and we're simply adding them to the driver I think the bar of acceptance is lower than if it were a completely new addition to the kernel. Thanks, -- Email: Herbert Xu <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/4] crypto: caam - add ecb mode support 2019-02-15 5:24 ` Herbert Xu @ 2019-02-15 5:54 ` Eric Biggers 2019-02-15 6:16 ` Herbert Xu 0 siblings, 1 reply; 13+ messages in thread From: Eric Biggers @ 2019-02-15 5:54 UTC (permalink / raw) To: Herbert Xu Cc: Horia Geanta, Iuliana Prodan, Aymen Sghaier, David S. Miller, linux-crypto, linux-kernel, dl-linux-imx On Fri, Feb 15, 2019 at 01:24:42PM +0800, Herbert Xu wrote: > On Wed, Feb 13, 2019 at 10:51:36AM -0800, Eric Biggers wrote: > > > > You are claiming you need DES-ECB, 3DES-ECB, *and* ARC4 for that? > > > > Which one is it actually, if any? > > Since these are existing algorithms in the crypto API and we're > simply adding them to the driver I think the bar of acceptance > is lower than if it were a completely new addition to the kernel. > > Thanks, > -- > Email: Herbert Xu <herbert@gondor.apana.org.au> > Home Page: http://gondor.apana.org.au/~herbert/ > PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt Sure, but the bar shouldn't be so low that new implementations of insecure algorithms the world is moving away from are accepted without a real use case. We should be moving towards removing these algorithms instead. The original DES is especially bad as it only has a 56-bit key. I'd like to better understand if/why people claim to not only still need these algorithms in 2019, but also need brand new implementations of them. - Eric ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/4] crypto: caam - add ecb mode support 2019-02-15 5:54 ` Eric Biggers @ 2019-02-15 6:16 ` Herbert Xu 0 siblings, 0 replies; 13+ messages in thread From: Herbert Xu @ 2019-02-15 6:16 UTC (permalink / raw) To: Eric Biggers Cc: Horia Geanta, Iuliana Prodan, Aymen Sghaier, David S. Miller, linux-crypto, linux-kernel, dl-linux-imx On Thu, Feb 14, 2019 at 09:54:47PM -0800, Eric Biggers wrote: > > Sure, but the bar shouldn't be so low that new implementations of insecure > algorithms the world is moving away from are accepted without a real use case. > We should be moving towards removing these algorithms instead. The original DES > is especially bad as it only has a 56-bit key. I'd like to better understand > if/why people claim to not only still need these algorithms in 2019, but also > need brand new implementations of them. If we're going to remove DES then we should remove all implementations of it and not single out a single driver. Cheers, -- Email: Herbert Xu <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/4] crypto: caam - add ecb mode support 2019-02-08 13:50 [PATCH 0/4] crypto: caam - add ecb mode support Iuliana Prodan ` (4 preceding siblings ...) 2019-02-09 21:52 ` [PATCH 0/4] crypto: caam - add ecb mode support Eric Biggers @ 2019-02-14 20:57 ` Horia Geanta 2019-02-15 5:24 ` Herbert Xu 6 siblings, 0 replies; 13+ messages in thread From: Horia Geanta @ 2019-02-14 20:57 UTC (permalink / raw) To: Iuliana Prodan, Herbert Xu, Aymen Sghaier Cc: David S. Miller, linux-crypto, linux-kernel, dl-linux-imx On 2/8/2019 3:51 PM, Iuliana Prodan wrote: > This patch set adds ecb mode support for aes, des, 3des and arc4 ciphers. > skcipher implementation is reused, making sure to handle the no IV case. > For the series: Reviewed-by: Horia Geantă <horia.geanta@nxp.com> Thanks, Horia ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/4] crypto: caam - add ecb mode support 2019-02-08 13:50 [PATCH 0/4] crypto: caam - add ecb mode support Iuliana Prodan ` (5 preceding siblings ...) 2019-02-14 20:57 ` Horia Geanta @ 2019-02-15 5:24 ` Herbert Xu 6 siblings, 0 replies; 13+ messages in thread From: Herbert Xu @ 2019-02-15 5:24 UTC (permalink / raw) To: Iuliana Prodan Cc: Horia Geanta, Aymen Sghaier, David S. Miller, linux-crypto, linux-kernel, linux-imx On Fri, Feb 08, 2019 at 03:50:06PM +0200, Iuliana Prodan wrote: > This patch set adds ecb mode support for aes, des, 3des and arc4 ciphers. > skcipher implementation is reused, making sure to handle the no IV case. > > While here: > -fix a DMA API issue where initial src/dst_nents are used instead of nents > returned by dma_map_sg() > -export arc4 defines in a common header > -update cbc des and 3des to check for weak keys > > Iuliana Prodan (4): > crypto: caam - use mapped_{src,dst}_nents for job descriptor > crypto: export arc4 defines > crypto: caam - add ecb(*) support > crypto: caam - weak key checking for cbc des, 3des > > crypto/arc4.c | 5 +- > drivers/crypto/bcm/cipher.h | 4 +- > drivers/crypto/caam/Kconfig | 1 + > drivers/crypto/caam/caamalg.c | 215 ++++++++++++++++++++++++++++--------- > drivers/crypto/caam/caamalg_desc.c | 18 ++-- > drivers/crypto/caam/compat.h | 1 + > include/crypto/arc4.h | 13 +++ > 7 files changed, 195 insertions(+), 62 deletions(-) > create mode 100644 include/crypto/arc4.h All applied. Thanks. -- Email: Herbert Xu <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2019-02-15 6:16 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-08 13:50 [PATCH 0/4] crypto: caam - add ecb mode support Iuliana Prodan
2019-02-08 13:50 ` [PATCH 1/4] crypto: caam - use mapped_{src,dst}_nents for job descriptor Iuliana Prodan
2019-02-08 13:50 ` [PATCH 2/4] crypto: export arc4 defines Iuliana Prodan
2019-02-08 13:50 ` [PATCH 3/4] crypto: caam - add ecb(*) support Iuliana Prodan
2019-02-08 13:50 ` [PATCH 4/4] crypto: caam - weak key checking for cbc des, 3des Iuliana Prodan
2019-02-09 21:52 ` [PATCH 0/4] crypto: caam - add ecb mode support Eric Biggers
2019-02-13 18:45 ` Horia Geanta
2019-02-13 18:51 ` Eric Biggers
2019-02-15 5:24 ` Herbert Xu
2019-02-15 5:54 ` Eric Biggers
2019-02-15 6:16 ` Herbert Xu
2019-02-14 20:57 ` Horia Geanta
2019-02-15 5:24 ` Herbert Xu
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).