summaryrefslogtreecommitdiffstats
path: root/crypto/testmgr.c
diff options
context:
space:
mode:
authorMarcus Meissner <meissner@suse.de>2016-02-19 07:34:28 -0500
committerHerbert Xu <herbert@gondor.apana.org.au>2016-02-27 14:26:31 -0500
commit8888690ef5f764b01955817aafd6605ac6a29fcc (patch)
treea8c5922e42f136fc1de42a592ad7ee478851145b /crypto/testmgr.c
parentf93a8b25d2ae1ff8ecbb915495539f4e02d1b417 (diff)
crypto: testmgr - allow rfc3686 aes-ctr variants in fips mode.
RFC 3686 CTR in various authenc methods. rfc3686(ctr(aes)) is already marked fips compliant, so these should be fine. Signed-off-by: Marcus Meissner <meissner@suse.de> Acked-by: Stephan Mueller <smueller@chronox.de> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/testmgr.c')
-rw-r--r--crypto/testmgr.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 6e41a938786e..b86883aedca1 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -2093,6 +2093,10 @@ static const struct alg_test_desc alg_test_descs[] = {
2093 } 2093 }
2094 } 2094 }
2095 }, { 2095 }, {
2096 .alg = "authenc(hmac(sha1),rfc3686(ctr(aes)))",
2097 .test = alg_test_null,
2098 .fips_allowed = 1,
2099 }, {
2096 .alg = "authenc(hmac(sha224),cbc(des))", 2100 .alg = "authenc(hmac(sha224),cbc(des))",
2097 .test = alg_test_aead, 2101 .test = alg_test_aead,
2098 .suite = { 2102 .suite = {
@@ -2165,6 +2169,10 @@ static const struct alg_test_desc alg_test_descs[] = {
2165 .test = alg_test_null, 2169 .test = alg_test_null,
2166 .fips_allowed = 1, 2170 .fips_allowed = 1,
2167 }, { 2171 }, {
2172 .alg = "authenc(hmac(sha256),rfc3686(ctr(aes)))",
2173 .test = alg_test_null,
2174 .fips_allowed = 1,
2175 }, {
2168 .alg = "authenc(hmac(sha384),cbc(des))", 2176 .alg = "authenc(hmac(sha384),cbc(des))",
2169 .test = alg_test_aead, 2177 .test = alg_test_aead,
2170 .suite = { 2178 .suite = {
@@ -2196,6 +2204,10 @@ static const struct alg_test_desc alg_test_descs[] = {
2196 .test = alg_test_null, 2204 .test = alg_test_null,
2197 .fips_allowed = 1, 2205 .fips_allowed = 1,
2198 }, { 2206 }, {
2207 .alg = "authenc(hmac(sha384),rfc3686(ctr(aes)))",
2208 .test = alg_test_null,
2209 .fips_allowed = 1,
2210 }, {
2199 .alg = "authenc(hmac(sha512),cbc(aes))", 2211 .alg = "authenc(hmac(sha512),cbc(aes))",
2200 .fips_allowed = 1, 2212 .fips_allowed = 1,
2201 .test = alg_test_aead, 2213 .test = alg_test_aead,
@@ -2241,6 +2253,10 @@ static const struct alg_test_desc alg_test_descs[] = {
2241 .test = alg_test_null, 2253 .test = alg_test_null,
2242 .fips_allowed = 1, 2254 .fips_allowed = 1,
2243 }, { 2255 }, {
2256 .alg = "authenc(hmac(sha512),rfc3686(ctr(aes)))",
2257 .test = alg_test_null,
2258 .fips_allowed = 1,
2259 }, {
2244 .alg = "cbc(aes)", 2260 .alg = "cbc(aes)",
2245 .test = alg_test_skcipher, 2261 .test = alg_test_skcipher,
2246 .fips_allowed = 1, 2262 .fips_allowed = 1,