crypto: caam - weak key checking for cbc des, 3des
authorIuliana Prodan <iuliana.prodan@nxp.com>
Fri, 8 Feb 2019 13:50:10 +0000 (15:50 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 15 Feb 2019 05:21:55 +0000 (13:21 +0800)
Modify setkey callback for cbc des and 3des to check for weak keys.

Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/caam/caamalg.c

index 90d83ae..9eac509 100644 (file)
@@ -1858,7 +1858,7 @@ static struct caam_skcipher_alg driver_algs[] = {
                                .cra_driver_name = "cbc-3des-caam",
                                .cra_blocksize = DES3_EDE_BLOCK_SIZE,
                        },
-                       .setkey = skcipher_setkey,
+                       .setkey = des_skcipher_setkey,
                        .encrypt = skcipher_encrypt,
                        .decrypt = skcipher_decrypt,
                        .min_keysize = DES3_EDE_KEY_SIZE,
@@ -1874,7 +1874,7 @@ static struct caam_skcipher_alg driver_algs[] = {
                                .cra_driver_name = "cbc-des-caam",
                                .cra_blocksize = DES_BLOCK_SIZE,
                        },
-                       .setkey = skcipher_setkey,
+                       .setkey = des_skcipher_setkey,
                        .encrypt = skcipher_encrypt,
                        .decrypt = skcipher_decrypt,
                        .min_keysize = DES_KEY_SIZE,