[PATCH v2 05/30] crypto: bcm/des - switch to new verification routines

[Ard Biesheuvel]

Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
---
 drivers/crypto/bcm/cipher.c | 82 +++++---------------
 1 file changed, 20 insertions(+), 62 deletions(-)

diff --git a/drivers/crypto/bcm/cipher.c b/drivers/crypto/bcm/cipher.c
index d972ffac779d..02006781528a 100644
--- a/drivers/crypto/bcm/cipher.c
+++ b/drivers/crypto/bcm/cipher.c
@@ -35,7 +35,7 @@
 #include <crypto/aead.h>
 #include <crypto/internal/aead.h>
 #include <crypto/aes.h>
-#include <crypto/des.h>
+#include <crypto/internal/des.h>
 #include <crypto/hmac.h>
 #include <crypto/sha.h>
 #include <crypto/md5.h>
@@ -1813,24 +1813,13 @@ static int des_setkey(struct crypto_ablkcipher *cipher, 
const u8 *key,
                      unsigned int keylen)
 {
        struct iproc_ctx_s *ctx = crypto_ablkcipher_ctx(cipher);
-       u32 tmp[DES_EXPKEY_WORDS];
-
-       if (keylen == DES_KEY_SIZE) {
-               if (des_ekey(tmp, key) == 0) {
-                       if (crypto_ablkcipher_get_flags(cipher) &
-                           CRYPTO_TFM_REQ_FORBID_WEAK_KEYS) {
-                               u32 flags = CRYPTO_TFM_RES_WEAK_KEY;
+       int err;
 
-                               crypto_ablkcipher_set_flags(cipher, flags);
-                               return -EINVAL;
-                       }
-               }
+       err = crypto_des_verify_key(crypto_ablkcipher_tfm(cipher), key);
+       if (unlikely(err))
+               return err;
 
-               ctx->cipher_type = CIPHER_TYPE_DES;
-       } else {
-               crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);
-               return -EINVAL;
-       }
+       ctx->cipher_type = CIPHER_TYPE_DES;
        return 0;
 }
 
@@ -1838,23 +1827,13 @@ static int threedes_setkey(struct crypto_ablkcipher 
*cipher, const u8 *key,
                           unsigned int keylen)
 {
        struct iproc_ctx_s *ctx = crypto_ablkcipher_ctx(cipher);
+       int err;
 
-       if (keylen == (DES_KEY_SIZE * 3)) {
-               u32 flags;
-               int ret;
-
-               flags = crypto_ablkcipher_get_flags(cipher);
-               ret = __des3_verify_key(&flags, key);
-               if (unlikely(ret)) {
-                       crypto_ablkcipher_set_flags(cipher, flags);
-                       return ret;
-               }
+       err = crypto_des3_ede_verify_key(crypto_ablkcipher_tfm(cipher), key);
+       if (unlikely(err))
+               return err;
 
-               ctx->cipher_type = CIPHER_TYPE_3DES;
-       } else {
-               crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);
-               return -EINVAL;
-       }
+       ctx->cipher_type = CIPHER_TYPE_3DES;
        return 0;
 }
 
@@ -2866,40 +2845,19 @@ static int aead_authenc_setkey(struct crypto_aead 
*cipher,
 
        switch (ctx->alg->cipher_info.alg) {
        case CIPHER_ALG_DES:
-               if (ctx->enckeylen == DES_KEY_SIZE) {
-                       u32 tmp[DES_EXPKEY_WORDS];
-                       u32 flags = CRYPTO_TFM_RES_WEAK_KEY;
-
-                       if (des_ekey(tmp, keys.enckey) == 0) {
-                               if (crypto_aead_get_flags(cipher) &
-                                   CRYPTO_TFM_REQ_FORBID_WEAK_KEYS) {
-                                       crypto_aead_set_flags(cipher, flags);
-                                       return -EINVAL;
-                               }
-                       }
+               if (keys.enckeylen != DES_KEY_SIZE ||
+                   crypto_des_verify_key(crypto_aead_tfm(cipher), keys.enckey))
+                       return -EINVAL;
 
-                       ctx->cipher_type = CIPHER_TYPE_DES;
-               } else {
-                       goto badkey;
-               }
+               ctx->cipher_type = CIPHER_TYPE_DES;
                break;
        case CIPHER_ALG_3DES:
-               if (ctx->enckeylen == (DES_KEY_SIZE * 3)) {
-                       u32 flags;
-
-                       flags = crypto_aead_get_flags(cipher);
-                       ret = __des3_verify_key(&flags, keys.enckey);
-                       if (unlikely(ret)) {
-                               crypto_aead_set_flags(cipher, flags);
-                               return ret;
-                       }
-
-                       ctx->cipher_type = CIPHER_TYPE_3DES;
-               } else {
-                       crypto_aead_set_flags(cipher,
-                                             CRYPTO_TFM_RES_BAD_KEY_LEN);
+               if (keys.enckeylen != DES3_EDE_KEY_SIZE ||
+                   crypto_des3_ede_verify_key(crypto_aead_tfm(cipher),
+                                              keys.enckey))
                        return -EINVAL;
-               }
+
+               ctx->cipher_type = CIPHER_TYPE_3DES;
                break;
        case CIPHER_ALG_AES:
                switch (ctx->enckeylen) {
-- 
2.20.1