crypto: marvell/cesa - add DES support

Add support for DES operations.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/marvell/cesa.c b/drivers/crypto/marvell/cesa.c
index 986f024d73faaf176633e6ab3176c03147bab543..212840e346d1fc162eaed9863c754e94813ede6b 100644 (file)
--- a/drivers/crypto/marvell/cesa.c
+++ b/drivers/crypto/marvell/cesa.c
@@ -169,6 +169,8 @@ static void mv_cesa_remove_algs(struct mv_cesa_dev *cesa)
 }
 
 static struct crypto_alg *armada_370_cipher_algs[] = {
+       &mv_cesa_ecb_des_alg,
+       &mv_cesa_cbc_des_alg,
        &mv_cesa_ecb_aes_alg,
        &mv_cesa_cbc_aes_alg,
 };

diff --git a/drivers/crypto/marvell/cesa.h b/drivers/crypto/marvell/cesa.h
index f8faf260b6d72fbd718a87076e3b58612f52b0bd..4b07209526bd7f65b1ceaaf51b122f921d4daa55 100644 (file)
--- a/drivers/crypto/marvell/cesa.h
+++ b/drivers/crypto/marvell/cesa.h
@@ -777,6 +777,8 @@ int mv_cesa_dma_add_op_transfers(struct mv_cesa_tdma_chain *chain,
 extern struct ahash_alg mv_sha1_alg;
 extern struct ahash_alg mv_ahmac_sha1_alg;
 
+extern struct crypto_alg mv_cesa_ecb_des_alg;
+extern struct crypto_alg mv_cesa_cbc_des_alg;
 extern struct crypto_alg mv_cesa_ecb_aes_alg;
 extern struct crypto_alg mv_cesa_cbc_aes_alg;
 

diff --git a/drivers/crypto/marvell/cipher.c b/drivers/crypto/marvell/cipher.c
index e21783b830468bdb47c271fda3d5b9276f32ecaf..e420ea6c0ec4dcd94a71223926ee1818b7ddce17 100644 (file)
--- a/drivers/crypto/marvell/cipher.c
+++ b/drivers/crypto/marvell/cipher.c
@@ -13,9 +13,15 @@
  */
 
 #include <crypto/aes.h>
+#include <crypto/des.h>
 
 #include "cesa.h"
 
+struct mv_cesa_des_ctx {
+       struct mv_cesa_ctx base;
+       u8 key[DES_KEY_SIZE];
+};
+
 struct mv_cesa_aes_ctx {
        struct mv_cesa_ctx base;
        struct crypto_aes_ctx aes;
@@ -238,6 +244,30 @@ static int mv_cesa_aes_setkey(struct crypto_ablkcipher *cipher, const u8 *key,
        return 0;
 }
 
+static int mv_cesa_des_setkey(struct crypto_ablkcipher *cipher, const u8 *key,
+                             unsigned int len)
+{
+       struct crypto_tfm *tfm = crypto_ablkcipher_tfm(cipher);
+       struct mv_cesa_des_ctx *ctx = crypto_tfm_ctx(tfm);
+       u32 tmp[DES_EXPKEY_WORDS];
+       int ret;
+
+       if (len != DES_KEY_SIZE) {
+               crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);
+               return -EINVAL;
+       }
+
+       ret = des_ekey(tmp, key);
+       if (!ret && (tfm->crt_flags & CRYPTO_TFM_REQ_WEAK_KEY)) {
+               tfm->crt_flags |= CRYPTO_TFM_RES_WEAK_KEY;
+               return -EINVAL;
+       }
+
+       memcpy(ctx->key, key, DES_KEY_SIZE);
+
+       return 0;
+}
+
 static int mv_cesa_ablkcipher_dma_req_init(struct ablkcipher_request *req,
                                const struct mv_cesa_op_ctx *op_templ)
 {
@@ -364,6 +394,126 @@ static int mv_cesa_ablkcipher_req_init(struct ablkcipher_request *req,
        return ret;
 }
 
+static int mv_cesa_des_op(struct ablkcipher_request *req,
+                         struct mv_cesa_op_ctx *tmpl)
+{
+       struct mv_cesa_des_ctx *ctx = crypto_tfm_ctx(req->base.tfm);
+       int ret;
+
+       mv_cesa_update_op_cfg(tmpl, CESA_SA_DESC_CFG_CRYPTM_DES,
+                             CESA_SA_DESC_CFG_CRYPTM_MSK);
+
+       memcpy(tmpl->ctx.blkcipher.key, ctx->key, DES_KEY_SIZE);
+
+       ret = mv_cesa_ablkcipher_req_init(req, tmpl);
+       if (ret)
+               return ret;
+
+       ret = mv_cesa_queue_req(&req->base);
+       if (ret && ret != -EINPROGRESS)
+               mv_cesa_ablkcipher_cleanup(req);
+
+       return ret;
+}
+
+static int mv_cesa_ecb_des_encrypt(struct ablkcipher_request *req)
+{
+       struct mv_cesa_op_ctx tmpl;
+
+       mv_cesa_set_op_cfg(&tmpl,
+                          CESA_SA_DESC_CFG_CRYPTCM_ECB |
+                          CESA_SA_DESC_CFG_DIR_ENC);
+
+       return mv_cesa_des_op(req, &tmpl);
+}
+
+static int mv_cesa_ecb_des_decrypt(struct ablkcipher_request *req)
+{
+       struct mv_cesa_op_ctx tmpl;
+
+       mv_cesa_set_op_cfg(&tmpl,
+                          CESA_SA_DESC_CFG_CRYPTCM_ECB |
+                          CESA_SA_DESC_CFG_DIR_DEC);
+
+       return mv_cesa_des_op(req, &tmpl);
+}
+
+struct crypto_alg mv_cesa_ecb_des_alg = {
+       .cra_name = "ecb(des)",
+       .cra_driver_name = "mv-ecb-des",
+       .cra_priority = 300,
+       .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                    CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC,
+       .cra_blocksize = DES_BLOCK_SIZE,
+       .cra_ctxsize = sizeof(struct mv_cesa_des_ctx),
+       .cra_alignmask = 0,
+       .cra_type = &crypto_ablkcipher_type,
+       .cra_module = THIS_MODULE,
+       .cra_init = mv_cesa_ablkcipher_cra_init,
+       .cra_u = {
+               .ablkcipher = {
+                       .min_keysize = DES_KEY_SIZE,
+                       .max_keysize = DES_KEY_SIZE,
+                       .setkey = mv_cesa_des_setkey,
+                       .encrypt = mv_cesa_ecb_des_encrypt,
+                       .decrypt = mv_cesa_ecb_des_decrypt,
+               },
+       },
+};
+
+static int mv_cesa_cbc_des_op(struct ablkcipher_request *req,
+                             struct mv_cesa_op_ctx *tmpl)
+{
+       mv_cesa_update_op_cfg(tmpl, CESA_SA_DESC_CFG_CRYPTCM_CBC,
+                             CESA_SA_DESC_CFG_CRYPTCM_MSK);
+
+       memcpy(tmpl->ctx.blkcipher.iv, req->info, DES_BLOCK_SIZE);
+
+       return mv_cesa_des_op(req, tmpl);
+}
+
+static int mv_cesa_cbc_des_encrypt(struct ablkcipher_request *req)
+{
+       struct mv_cesa_op_ctx tmpl;
+
+       mv_cesa_set_op_cfg(&tmpl, CESA_SA_DESC_CFG_DIR_ENC);
+
+       return mv_cesa_cbc_des_op(req, &tmpl);
+}
+
+static int mv_cesa_cbc_des_decrypt(struct ablkcipher_request *req)
+{
+       struct mv_cesa_op_ctx tmpl;
+
+       mv_cesa_set_op_cfg(&tmpl, CESA_SA_DESC_CFG_DIR_DEC);
+
+       return mv_cesa_cbc_des_op(req, &tmpl);
+}
+
+struct crypto_alg mv_cesa_cbc_des_alg = {
+       .cra_name = "cbc(des)",
+       .cra_driver_name = "mv-cbc-des",
+       .cra_priority = 300,
+       .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                    CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC,
+       .cra_blocksize = DES_BLOCK_SIZE,
+       .cra_ctxsize = sizeof(struct mv_cesa_des_ctx),
+       .cra_alignmask = 0,
+       .cra_type = &crypto_ablkcipher_type,
+       .cra_module = THIS_MODULE,
+       .cra_init = mv_cesa_ablkcipher_cra_init,
+       .cra_u = {
+               .ablkcipher = {
+                       .min_keysize = DES_KEY_SIZE,
+                       .max_keysize = DES_KEY_SIZE,
+                       .ivsize      = DES_BLOCK_SIZE,
+                       .setkey = mv_cesa_des_setkey,
+                       .encrypt = mv_cesa_cbc_des_encrypt,
+                       .decrypt = mv_cesa_cbc_des_decrypt,
+               },
+       },
+};
+
 static int mv_cesa_aes_op(struct ablkcipher_request *req,
                          struct mv_cesa_op_ctx *tmpl)
 {