1 files changed, 4 insertions, 20 deletions

diff --git a/drivers/crypto/ccree/cc_aead.c b/drivers/crypto/ccree/cc_aead.c
index a9779a212b18..d3e8faa03f15 100644
--- a/drivers/crypto/ccree/cc_aead.c
+++ b/drivers/crypto/ccree/cc_aead.c
@@ -6,7 +6,7 @@
 #include <crypto/algapi.h>
 #include <crypto/internal/aead.h>
 #include <crypto/authenc.h>
-#include <crypto/des.h>
+#include <crypto/internal/des.h>
 #include <linux/rtnetlink.h>
 #include "cc_driver.h"
 #include "cc_buffer_mgr.h"
@@ -649,33 +649,17 @@ static int cc_des3_aead_setkey(struct crypto_aead *aead, const u8 *key,
                                unsigned int keylen)
 {
         struct crypto_authenc_keys keys;
-        u32 flags;
         int err;
 
         err = crypto_authenc_extractkeys(&keys, key, keylen);
         if (unlikely(err))
-                goto badkey;
-
-        err = -EINVAL;
-        if (keys.enckeylen != DES3_EDE_KEY_SIZE)
-                goto badkey;
+                return err;
 
-        flags = crypto_aead_get_flags(aead);
-        err = __des3_verify_key(&flags, keys.enckey);
-        if (unlikely(err)) {
-                crypto_aead_set_flags(aead, flags);
-                goto out;
-        }
+        err = verify_aead_des3_key(aead, keys.enckey, keys.enckeylen) ?:
+              cc_aead_setkey(aead, key, keylen);
 
-        err = cc_aead_setkey(aead, key, keylen);
-
-out:
         memzero_explicit(&keys, sizeof(keys));
         return err;
-
-badkey:
-        crypto_aead_set_flags(aead, CRYPTO_TFM_RES_BAD_KEY_LEN);
-        goto out;
 }
 
 static int cc_rfc4309_ccm_setkey(struct crypto_aead *tfm, const u8 *key,