target/linux/omap/patches-3.12/602-crypto-omap-des-Add-triple-DES-des3_ede-support-to-driver.patch

   1 From patchwork Thu Aug 29 23:27:53 2013
   2 Content-Type: text/plain; charset="utf-8"
   3 MIME-Version: 1.0
   4 Content-Transfer-Encoding: 7bit
   5 Subject: [3/3] crypto: omap-des: Add triple DES (des3_ede) support to driver
   6 From: Joel Fernandes <joelf@ti.com>
   7 X-Patchwork-Id: 2851679
   8 Message-Id: <1377818873-21174-4-git-send-email-joelf@ti.com>
   9 To: Herbert Xu <herbert@gondor.hengli.com.au>, "David S. Miller"
  10         <davem@davemloft.net>, Mark Greer <mgreer@animalcreek.com>, Tony Lindgren
  11         <tony@atomide.com>, Lokesh Vutla <lokeshvutla@ti.com>
  12 Cc: Joel Fernandes <joelf@ti.com>,
  13         Linux OMAP List <linux-omap@vger.kernel.org>,
  14         Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
  15         Linux ARM Kernel List <linux-arm-kernel@lists.infradead.org>,
  16         Linux Crypto Mailing List <linux-crypto@vger.kernel.org>
  17 Date: Thu, 29 Aug 2013 18:27:53 -0500
  18
  19 OMAP DES module supports 3DES operation where 3 64-bit keys are used to
  20 perform a DES encrypt-decrypt-encrypt (ede) operation on a buffer.
  21
  22 Signed-off-by: Joel Fernandes <joelf@ti.com>
  23
  24 ---
  25 drivers/crypto/omap-des.c | 53 ++++++++++++++++++++++++++++++++++++++++++++---
  26  1 file changed, 50 insertions(+), 3 deletions(-)
  27
  28 diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c
  29 index 6a9a25f..0df60cb 100644
  30 --- a/drivers/crypto/omap-des.c
  31 +++ b/drivers/crypto/omap-des.c
  32 @@ -83,7 +83,7 @@ struct omap_des_ctx {
  33         struct omap_des_dev *dd;
  34
  35         int             keylen;
  36 -       u32             key[DES_KEY_SIZE / sizeof(u32)];
  37 +       u32             key[(3 * DES_KEY_SIZE) / sizeof(u32)];
  38         unsigned long   flags;
  39  };
  40
  41 @@ -265,8 +265,10 @@ static int omap_des_write_ctrl(struct omap_des_dev *dd)
  42                 val |= DES_REG_CTRL_CBC;
  43         if (dd->flags & FLAGS_ENCRYPT)
  44                 val |= DES_REG_CTRL_DIRECTION;
  45 +       if (key32 == 6)
  46 +               val |= DES_REG_CTRL_TDES;
  47
  48 -       mask |= DES_REG_CTRL_CBC | DES_REG_CTRL_DIRECTION;
  49 +       mask |= DES_REG_CTRL_CBC | DES_REG_CTRL_DIRECTION | DES_REG_CTRL_TDES;
  50
  51         omap_des_write_mask(dd, DES_REG_CTRL(dd), val, mask);
  52
  53 @@ -725,7 +727,7 @@ static int omap_des_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
  54  {
  55         struct omap_des_ctx *ctx = crypto_ablkcipher_ctx(tfm);
  56
  57 -       if (keylen != DES_KEY_SIZE)
  58 +       if (keylen != DES_KEY_SIZE && keylen != (3*DES_KEY_SIZE))
  59                 return -EINVAL;
  60
  61         pr_debug("enter, keylen: %d\n", keylen);
  62 @@ -817,6 +819,51 @@ static struct crypto_alg algs_ecb_cbc[] = {
  63                 .encrypt        = omap_des_cbc_encrypt,
  64                 .decrypt        = omap_des_cbc_decrypt,
  65         }
  66 +},
  67 +{
  68 +       .cra_name               = "ecb(des3_ede)",
  69 +       .cra_driver_name        = "ecb-des3-omap",
  70 +       .cra_priority           = 100,
  71 +       .cra_flags              = CRYPTO_ALG_TYPE_ABLKCIPHER |
  72 +                                 CRYPTO_ALG_KERN_DRIVER_ONLY |
  73 +                                 CRYPTO_ALG_ASYNC,
  74 +       .cra_blocksize          = DES_BLOCK_SIZE,
  75 +       .cra_ctxsize            = sizeof(struct omap_des_ctx),
  76 +       .cra_alignmask          = 0,
  77 +       .cra_type               = &crypto_ablkcipher_type,
  78 +       .cra_module             = THIS_MODULE,
  79 +       .cra_init               = omap_des_cra_init,
  80 +       .cra_exit               = omap_des_cra_exit,
  81 +       .cra_u.ablkcipher = {
  82 +               .min_keysize    = 3*DES_KEY_SIZE,
  83 +               .max_keysize    = 3*DES_KEY_SIZE,
  84 +               .setkey         = omap_des_setkey,
  85 +               .encrypt        = omap_des_ecb_encrypt,
  86 +               .decrypt        = omap_des_ecb_decrypt,
  87 +       }
  88 +},
  89 +{
  90 +       .cra_name               = "cbc(des3_ede)",
  91 +       .cra_driver_name        = "cbc-des3-omap",
  92 +       .cra_priority           = 100,
  93 +       .cra_flags              = CRYPTO_ALG_TYPE_ABLKCIPHER |
  94 +                                 CRYPTO_ALG_KERN_DRIVER_ONLY |
  95 +                                 CRYPTO_ALG_ASYNC,
  96 +       .cra_blocksize          = DES_BLOCK_SIZE,
  97 +       .cra_ctxsize            = sizeof(struct omap_des_ctx),
  98 +       .cra_alignmask          = 0,
  99 +       .cra_type               = &crypto_ablkcipher_type,
 100 +       .cra_module             = THIS_MODULE,
 101 +       .cra_init               = omap_des_cra_init,
 102 +       .cra_exit               = omap_des_cra_exit,
 103 +       .cra_u.ablkcipher = {
 104 +               .min_keysize    = 3*DES_KEY_SIZE,
 105 +               .max_keysize    = 3*DES_KEY_SIZE,
 106 +               .ivsize         = DES_BLOCK_SIZE,
 107 +               .setkey         = omap_des_setkey,
 108 +               .encrypt        = omap_des_cbc_encrypt,
 109 +               .decrypt        = omap_des_cbc_decrypt,
 110 +       }
 111  }
 112  };
 113