Merge tag 'dlm-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

[deliverable/linux.git] / crypto / testmgr.c

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 6e41a938786e0d2fac23be0fe6c4157d206f0bfa..b86883aedca11a617ad2e19bafe646bfecac583a 100644 (file)
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -2092,6 +2092,10 @@ static const struct alg_test_desc alg_test_descs[] = {
                                }
                        }
                }
+       }, {
+               .alg = "authenc(hmac(sha1),rfc3686(ctr(aes)))",
+               .test = alg_test_null,
+               .fips_allowed = 1,
        }, {
                .alg = "authenc(hmac(sha224),cbc(des))",
                .test = alg_test_aead,
@@ -2164,6 +2168,10 @@ static const struct alg_test_desc alg_test_descs[] = {
                .alg = "authenc(hmac(sha256),ctr(aes))",
                .test = alg_test_null,
                .fips_allowed = 1,
+       }, {
+               .alg = "authenc(hmac(sha256),rfc3686(ctr(aes)))",
+               .test = alg_test_null,
+               .fips_allowed = 1,
        }, {
                .alg = "authenc(hmac(sha384),cbc(des))",
                .test = alg_test_aead,
@@ -2195,6 +2203,10 @@ static const struct alg_test_desc alg_test_descs[] = {
                .alg = "authenc(hmac(sha384),ctr(aes))",
                .test = alg_test_null,
                .fips_allowed = 1,
+       }, {
+               .alg = "authenc(hmac(sha384),rfc3686(ctr(aes)))",
+               .test = alg_test_null,
+               .fips_allowed = 1,
        }, {
                .alg = "authenc(hmac(sha512),cbc(aes))",
                .fips_allowed = 1,
@@ -2240,6 +2252,10 @@ static const struct alg_test_desc alg_test_descs[] = {
                .alg = "authenc(hmac(sha512),ctr(aes))",
                .test = alg_test_null,
                .fips_allowed = 1,
+       }, {
+               .alg = "authenc(hmac(sha512),rfc3686(ctr(aes)))",
+               .test = alg_test_null,
+               .fips_allowed = 1,
        }, {
                .alg = "cbc(aes)",
                .test = alg_test_skcipher,