crypto: testmgr - add aead cbc des, des3_ede tests

Test vectors were taken from existing test for
CBC(DES3_EDE). Associated data has been added to test vectors.
HMAC computed with Crypto++ has been used. Following algos have
been covered.

        (a) "authenc(hmac(sha1),cbc(des))"
        (b) "authenc(hmac(sha1),cbc(des3_ede))"
        (c) "authenc(hmac(sha224),cbc(des))"
        (d) "authenc(hmac(sha224),cbc(des3_ede))"
        (e) "authenc(hmac(sha256),cbc(des))"
        (f) "authenc(hmac(sha256),cbc(des3_ede))"
        (g) "authenc(hmac(sha384),cbc(des))"
        (h) "authenc(hmac(sha384),cbc(des3_ede))"
        (i) "authenc(hmac(sha512),cbc(des))"
        (j) "authenc(hmac(sha512),cbc(des3_ede))"

Signed-off-by: Vakul Garg <vakul@freescale.com>
[NiteshNarayanLal@freescale.com: added hooks for the missing algorithms test and tested the patch]
Signed-off-by: Nitesh Lal <NiteshNarayanLal@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

1 files changed, 162 insertions, 12 deletions

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 75c78e6b1a26..498649ac1953 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -1834,8 +1834,38 @@ static const struct alg_test_desc alg_test_descs[] = {
                 .suite = {
                         .aead = {
                                 .enc = {
-                                        .vecs = hmac_sha1_aes_cbc_enc_tv_template,
-                                        .count = HMAC_SHA1_AES_CBC_ENC_TEST_VECTORS
+                                        .vecs =
+                                        hmac_sha1_aes_cbc_enc_tv_temp,
+                                        .count =
+                                        HMAC_SHA1_AES_CBC_ENC_TEST_VEC
+                                }
+                        }
+                }
+        }, {
+                .alg = "authenc(hmac(sha1),cbc(des))",
+                .test = alg_test_aead,
+                .fips_allowed = 1,
+                .suite = {
+                        .aead = {
+                                .enc = {
+                                        .vecs =
+                                        hmac_sha1_des_cbc_enc_tv_temp,
+                                        .count =
+                                        HMAC_SHA1_DES_CBC_ENC_TEST_VEC
+                                }
+                        }
+                }
+        }, {
+                .alg = "authenc(hmac(sha1),cbc(des3_ede))",
+                .test = alg_test_aead,
+                .fips_allowed = 1,
+                .suite = {
+                        .aead = {
+                                .enc = {
+                                        .vecs =
+                                        hmac_sha1_des3_ede_cbc_enc_tv_temp,
+                                        .count =
+                                        HMAC_SHA1_DES3_EDE_CBC_ENC_TEST_VEC
                                 }
                         }
                 }
@@ -1846,12 +1876,44 @@ static const struct alg_test_desc alg_test_descs[] = {
                 .suite = {
                         .aead = {
                                 .enc = {
-                                        .vecs = hmac_sha1_ecb_cipher_null_enc_tv_template,
-                                        .count = HMAC_SHA1_ECB_CIPHER_NULL_ENC_TEST_VECTORS
+                                        .vecs =
+                                        hmac_sha1_ecb_cipher_null_enc_tv_temp,
+                                        .count =
+                                        HMAC_SHA1_ECB_CIPHER_NULL_ENC_TEST_VEC
                                 },
                                 .dec = {
-                                        .vecs = hmac_sha1_ecb_cipher_null_dec_tv_template,
-                                        .count = HMAC_SHA1_ECB_CIPHER_NULL_DEC_TEST_VECTORS
+                                        .vecs =
+                                        hmac_sha1_ecb_cipher_null_dec_tv_temp,
+                                        .count =
+                                        HMAC_SHA1_ECB_CIPHER_NULL_DEC_TEST_VEC
+                                }
+                        }
+                }
+        }, {
+                .alg = "authenc(hmac(sha224),cbc(des))",
+                .test = alg_test_aead,
+                .fips_allowed = 1,
+                .suite = {
+                        .aead = {
+                                .enc = {
+                                        .vecs =
+                                        hmac_sha224_des_cbc_enc_tv_temp,
+                                        .count =
+                                        HMAC_SHA224_DES_CBC_ENC_TEST_VEC
+                                }
+                        }
+                }
+        }, {
+                .alg = "authenc(hmac(sha224),cbc(des3_ede))",
+                .test = alg_test_aead,
+                .fips_allowed = 1,
+                .suite = {
+                        .aead = {
+                                .enc = {
+                                        .vecs =
+                                        hmac_sha224_des3_ede_cbc_enc_tv_temp,
+                                        .count =
+                                        HMAC_SHA224_DES3_EDE_CBC_ENC_TEST_VEC
                                 }
                         }
                 }
@@ -1862,8 +1924,66 @@ static const struct alg_test_desc alg_test_descs[] = {
                 .suite = {
                         .aead = {
                                 .enc = {
-                                        .vecs = hmac_sha256_aes_cbc_enc_tv_template,
-                                        .count = HMAC_SHA256_AES_CBC_ENC_TEST_VECTORS
+                                        .vecs =
+                                        hmac_sha256_aes_cbc_enc_tv_temp,
+                                        .count =
+                                        HMAC_SHA256_AES_CBC_ENC_TEST_VEC
+                                }
+                        }
+                }
+        }, {
+                .alg = "authenc(hmac(sha256),cbc(des))",
+                .test = alg_test_aead,
+                .fips_allowed = 1,
+                .suite = {
+                        .aead = {
+                                .enc = {
+                                        .vecs =
+                                        hmac_sha256_des_cbc_enc_tv_temp,
+                                        .count =
+                                        HMAC_SHA256_DES_CBC_ENC_TEST_VEC
+                                }
+                        }
+                }
+        }, {
+                .alg = "authenc(hmac(sha256),cbc(des3_ede))",
+                .test = alg_test_aead,
+                .fips_allowed = 1,
+                .suite = {
+                        .aead = {
+                                .enc = {
+                                        .vecs =
+                                        hmac_sha256_des3_ede_cbc_enc_tv_temp,
+                                        .count =
+                                        HMAC_SHA256_DES3_EDE_CBC_ENC_TEST_VEC
+                                }
+                        }
+                }
+        }, {
+                .alg = "authenc(hmac(sha384),cbc(des))",
+                .test = alg_test_aead,
+                .fips_allowed = 1,
+                .suite = {
+                        .aead = {
+                                .enc = {
+                                        .vecs =
+                                        hmac_sha384_des_cbc_enc_tv_temp,
+                                        .count =
+                                        HMAC_SHA384_DES_CBC_ENC_TEST_VEC
+                                }
+                        }
+                }
+        }, {
+                .alg = "authenc(hmac(sha384),cbc(des3_ede))",
+                .test = alg_test_aead,
+                .fips_allowed = 1,
+                .suite = {
+                        .aead = {
+                                .enc = {
+                                        .vecs =
+                                        hmac_sha384_des3_ede_cbc_enc_tv_temp,
+                                        .count =
+                                        HMAC_SHA384_DES3_EDE_CBC_ENC_TEST_VEC
                                 }
                         }
                 }
@@ -1874,8 +1994,38 @@ static const struct alg_test_desc alg_test_descs[] = {
                 .suite = {
                         .aead = {
                                 .enc = {
-                                        .vecs = hmac_sha512_aes_cbc_enc_tv_template,
-                                        .count = HMAC_SHA512_AES_CBC_ENC_TEST_VECTORS
+                                        .vecs =
+                                        hmac_sha512_aes_cbc_enc_tv_temp,
+                                        .count =
+                                        HMAC_SHA512_AES_CBC_ENC_TEST_VEC
+                                }
+                        }
+                }
+        }, {
+                .alg = "authenc(hmac(sha512),cbc(des))",
+                .test = alg_test_aead,
+                .fips_allowed = 1,
+                .suite = {
+                        .aead = {
+                                .enc = {
+                                        .vecs =
+                                        hmac_sha512_des_cbc_enc_tv_temp,
+                                        .count =
+                                        HMAC_SHA512_DES_CBC_ENC_TEST_VEC
+                                }
+                        }
+                }
+        }, {
+                .alg = "authenc(hmac(sha512),cbc(des3_ede))",
+                .test = alg_test_aead,
+                .fips_allowed = 1,
+                .suite = {
+                        .aead = {
+                                .enc = {
+                                        .vecs =
+                                        hmac_sha512_des3_ede_cbc_enc_tv_temp,
+                                        .count =
+                                        HMAC_SHA512_DES3_EDE_CBC_ENC_TEST_VEC
                                 }
                         }
                 }
@@ -3276,8 +3426,8 @@ test_done:
                 panic("%s: %s alg self test failed in fips mode!\n", driver, alg);
 
         if (fips_enabled && !rc)
-                printk(KERN_INFO "alg: self-tests for %s (%s) passed\n",
-                       driver, alg);
+                pr_info(KERN_INFO "alg: self-tests for %s (%s) passed\n",
+                        driver, alg);
 
         return rc;