crypto: ccp/des - switch to new verification routines

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/ccp/ccp-crypto-des3.c b/drivers/crypto/ccp/ccp-crypto-des3.c
index 5f05f834c7cd3b86bfaf524abf73c0202f6d60d4..d2c49b2f03232755d1556cfdb127e4cc0c554d16 100644 (file)
--- a/drivers/crypto/ccp/ccp-crypto-des3.c
+++ b/drivers/crypto/ccp/ccp-crypto-des3.c
@@ -14,7 +14,7 @@
 #include <linux/crypto.h>
 #include <crypto/algapi.h>
 #include <crypto/scatterwalk.h>
-#include <crypto/des.h>
+#include <crypto/internal/des.h>
 
 #include "ccp-crypto.h"
 
@@ -39,11 +39,10 @@ static int ccp_des3_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
        struct ccp_ctx *ctx = crypto_tfm_ctx(crypto_ablkcipher_tfm(tfm));
        struct ccp_crypto_ablkcipher_alg *alg =
                ccp_crypto_ablkcipher_alg(crypto_ablkcipher_tfm(tfm));
-       u32 *flags = &tfm->base.crt_flags;
        int err;
 
-       err = __des3_verify_key(flags, key);
-       if (unlikely(err))
+       err = verify_ablkcipher_des3_key(tfm, key);
+       if (err)
                return err;
 
        /* It's not clear that there is any support for a keysize of 112.