diff options
author | Marcus Meissner <meissner@suse.de> | 2016-02-06 05:53:07 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-02-16 15:07:40 -0500 |
commit | fb16abc2e9deedf075cfe2a01584b092ab5440e0 (patch) | |
tree | fa8833176fb27871a2e8442abbcd76d43ae6110d /crypto/testmgr.c | |
parent | f75516a81548074be331b3e41d2e3f448d1f8b8d (diff) |
crypto: testmgr - mark authenticated ctr(aes) also as FIPS able
(2nd try that adds missing , to build.)
Signed-off-by: Marcus Meissner <meissner@suse.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/testmgr.c')
-rw-r--r-- | crypto/testmgr.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/crypto/testmgr.c b/crypto/testmgr.c index 93f3527962ec..6e41a938786e 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c | |||
@@ -2070,6 +2070,10 @@ static const struct alg_test_desc alg_test_descs[] = { | |||
2070 | } | 2070 | } |
2071 | } | 2071 | } |
2072 | }, { | 2072 | }, { |
2073 | .alg = "authenc(hmac(sha1),ctr(aes))", | ||
2074 | .test = alg_test_null, | ||
2075 | .fips_allowed = 1, | ||
2076 | }, { | ||
2073 | .alg = "authenc(hmac(sha1),ecb(cipher_null))", | 2077 | .alg = "authenc(hmac(sha1),ecb(cipher_null))", |
2074 | .test = alg_test_aead, | 2078 | .test = alg_test_aead, |
2075 | .suite = { | 2079 | .suite = { |
@@ -2157,6 +2161,10 @@ static const struct alg_test_desc alg_test_descs[] = { | |||
2157 | } | 2161 | } |
2158 | } | 2162 | } |
2159 | }, { | 2163 | }, { |
2164 | .alg = "authenc(hmac(sha256),ctr(aes))", | ||
2165 | .test = alg_test_null, | ||
2166 | .fips_allowed = 1, | ||
2167 | }, { | ||
2160 | .alg = "authenc(hmac(sha384),cbc(des))", | 2168 | .alg = "authenc(hmac(sha384),cbc(des))", |
2161 | .test = alg_test_aead, | 2169 | .test = alg_test_aead, |
2162 | .suite = { | 2170 | .suite = { |
@@ -2184,6 +2192,10 @@ static const struct alg_test_desc alg_test_descs[] = { | |||
2184 | } | 2192 | } |
2185 | } | 2193 | } |
2186 | }, { | 2194 | }, { |
2195 | .alg = "authenc(hmac(sha384),ctr(aes))", | ||
2196 | .test = alg_test_null, | ||
2197 | .fips_allowed = 1, | ||
2198 | }, { | ||
2187 | .alg = "authenc(hmac(sha512),cbc(aes))", | 2199 | .alg = "authenc(hmac(sha512),cbc(aes))", |
2188 | .fips_allowed = 1, | 2200 | .fips_allowed = 1, |
2189 | .test = alg_test_aead, | 2201 | .test = alg_test_aead, |
@@ -2225,6 +2237,10 @@ static const struct alg_test_desc alg_test_descs[] = { | |||
2225 | } | 2237 | } |
2226 | } | 2238 | } |
2227 | }, { | 2239 | }, { |
2240 | .alg = "authenc(hmac(sha512),ctr(aes))", | ||
2241 | .test = alg_test_null, | ||
2242 | .fips_allowed = 1, | ||
2243 | }, { | ||
2228 | .alg = "cbc(aes)", | 2244 | .alg = "cbc(aes)", |
2229 | .test = alg_test_skcipher, | 2245 | .test = alg_test_skcipher, |
2230 | .fips_allowed = 1, | 2246 | .fips_allowed = 1, |