Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto update from Herbert Xu:
 "API:
   - Add support for AEAD in simd
   - Add fuzz testing to testmgr
   - Add panic_on_fail module parameter to testmgr
   - Use per-CPU struct instead multiple variables in scompress
   - Change verify API for akcipher

  Algorithms:
   - Convert x86 AEAD algorithms over to simd
   - Forbid 2-key 3DES in FIPS mode
   - Add EC-RDSA (GOST 34.10) algorithm

  Drivers:
   - Set output IV with ctr-aes in crypto4xx
   - Set output IV in rockchip
   - Fix potential length overflow with hashing in sun4i-ss
   - Fix computation error with ctr in vmx
   - Add SM4 protected keys support in ccree
   - Remove long-broken mxc-scc driver
   - Add rfc4106(gcm(aes)) cipher support in cavium/nitrox"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (179 commits)
  crypto: ccree - use a proper le32 type for le32 val
  crypto: ccree - remove set but not used variable 'du_size'
  crypto: ccree - Make cc_sec_disable static
  crypto: ccree - fix spelling mistake "protedcted" -> "protected"
  crypto: caam/qi2 - generate hash keys in-place
  crypto: caam/qi2 - fix DMA mapping of stack memory
  crypto: caam/qi2 - fix zero-length buffer DMA mapping
  crypto: stm32/cryp - update to return iv_out
  crypto: stm32/cryp - remove request mutex protection
  crypto: stm32/cryp - add weak key check for DES
  crypto: atmel - remove set but not used variable 'alg_name'
  crypto: picoxcell - Use dev_get_drvdata()
  crypto: crypto4xx - get rid of redundant using_sd variable
  crypto: crypto4xx - use sync skcipher for fallback
  crypto: crypto4xx - fix cfb and ofb "overran dst buffer" issues
  crypto: crypto4xx - fix ctr-aes missing output IV
  crypto: ecrdsa - select ASN1 and OID_REGISTRY for EC-RDSA
  crypto: ux500 - use ccflags-y instead of CFLAGS_<basename>.o
  crypto: ccree - handle tee fips error during power management resume
  crypto: ccree - add function to handle cryptocell tee fips error
  ...

1 files changed, 24 insertions, 5 deletions

diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c
index 1ba2633e90d6..3d82d18ff810 100644
--- a/drivers/crypto/omap-des.c
+++ b/drivers/crypto/omap-des.c
@@ -656,9 +656,6 @@ static int omap_des_setkey(struct crypto_ablkcipher *cipher, const u8 *key,
         struct omap_des_ctx *ctx = crypto_ablkcipher_ctx(cipher);
         struct crypto_tfm *tfm = crypto_ablkcipher_tfm(cipher);
 
-        if (keylen != DES_KEY_SIZE && keylen != (3*DES_KEY_SIZE))
-                return -EINVAL;
-
         pr_debug("enter, keylen: %d\n", keylen);
 
         /* Do we need to test against weak key? */
@@ -678,6 +675,28 @@ static int omap_des_setkey(struct crypto_ablkcipher *cipher, const u8 *key,
         return 0;
 }
 
+static int omap_des3_setkey(struct crypto_ablkcipher *cipher, const u8 *key,
+                           unsigned int keylen)
+{
+        struct omap_des_ctx *ctx = crypto_ablkcipher_ctx(cipher);
+        u32 flags;
+        int err;
+
+        pr_debug("enter, keylen: %d\n", keylen);
+
+        flags = crypto_ablkcipher_get_flags(cipher);
+        err = __des3_verify_key(&flags, key);
+        if (unlikely(err)) {
+                crypto_ablkcipher_set_flags(cipher, flags);
+                return err;
+        }
+
+        memcpy(ctx->key, key, keylen);
+        ctx->keylen = keylen;
+
+        return 0;
+}
+
 static int omap_des_ecb_encrypt(struct ablkcipher_request *req)
 {
         return omap_des_crypt(req, FLAGS_ENCRYPT);
@@ -788,7 +807,7 @@ static struct crypto_alg algs_ecb_cbc[] = {
         .cra_u.ablkcipher = {
                 .min_keysize    = 3*DES_KEY_SIZE,
                 .max_keysize    = 3*DES_KEY_SIZE,
-                .setkey         = omap_des_setkey,
+                .setkey         = omap_des3_setkey,
                 .encrypt        = omap_des_ecb_encrypt,
                 .decrypt        = omap_des_ecb_decrypt,
         }
@@ -811,7 +830,7 @@ static struct crypto_alg algs_ecb_cbc[] = {
                 .min_keysize    = 3*DES_KEY_SIZE,
                 .max_keysize    = 3*DES_KEY_SIZE,
                 .ivsize         = DES_BLOCK_SIZE,
-                .setkey         = omap_des_setkey,
+                .setkey         = omap_des3_setkey,
                 .encrypt        = omap_des_cbc_encrypt,
                 .decrypt        = omap_des_cbc_decrypt,
         }