Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[linux.git] / crypto / testmgr.c

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 77955507f6f1f73a044554a7d738074c98f9829e..dc3cf3535ef034065752bb820fa6797628935c09 100644 (file)
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -1808,6 +1808,22 @@ static const struct alg_test_desc alg_test_descs[] = {
                                .count = ANSI_CPRNG_AES_TEST_VECTORS
                        }
                }
+       }, {
+               .alg = "authenc(hmac(md5),ecb(cipher_null))",
+               .test = alg_test_aead,
+               .fips_allowed = 1,
+               .suite = {
+                       .aead = {
+                               .enc = {
+                                       .vecs = hmac_md5_ecb_cipher_null_enc_tv_template,
+                                       .count = HMAC_MD5_ECB_CIPHER_NULL_ENC_TEST_VECTORS
+                               },
+                               .dec = {
+                                       .vecs = hmac_md5_ecb_cipher_null_dec_tv_template,
+                                       .count = HMAC_MD5_ECB_CIPHER_NULL_DEC_TEST_VECTORS
+                               }
+                       }
+               }
        }, {
                .alg = "authenc(hmac(sha1),cbc(aes))",
                .test = alg_test_aead,
@@ -1820,6 +1836,22 @@ static const struct alg_test_desc alg_test_descs[] = {
                                }
                        }
                }
+       }, {
+               .alg = "authenc(hmac(sha1),ecb(cipher_null))",
+               .test = alg_test_aead,
+               .fips_allowed = 1,
+               .suite = {
+                       .aead = {
+                               .enc = {
+                                       .vecs = hmac_sha1_ecb_cipher_null_enc_tv_template,
+                                       .count = HMAC_SHA1_ECB_CIPHER_NULL_ENC_TEST_VECTORS
+                               },
+                               .dec = {
+                                       .vecs = hmac_sha1_ecb_cipher_null_dec_tv_template,
+                                       .count = HMAC_SHA1_ECB_CIPHER_NULL_DEC_TEST_VECTORS
+                               }
+                       }
+               }
        }, {
                .alg = "authenc(hmac(sha256),cbc(aes))",
                .test = alg_test_aead,