aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Meissner <meissner@suse.de>2016-02-05 08:23:33 -0500
committerHerbert Xu <herbert@gondor.apana.org.au>2016-02-06 02:43:20 -0500
commited1afac9145c4517a2c84f93e04a35046ea206e3 (patch)
treee22c658a81ff6fe65ae79f428bbb8d4184962fc5
parentabfa7f4357e3640fdee87dfc276fd0f379fb5ae6 (diff)
crypto: testmgr - mark more algorithms as FIPS compliant
Some more authenc() wrapped algorithms are FIPS compliant, tag them as such. 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>
-rw-r--r--crypto/testmgr.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 54681838da6c..93f3527962ec 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -2058,6 +2058,7 @@ static const struct alg_test_desc alg_test_descs[] = {
2058 }, { 2058 }, {
2059 .alg = "authenc(hmac(sha1),cbc(des3_ede))", 2059 .alg = "authenc(hmac(sha1),cbc(des3_ede))",
2060 .test = alg_test_aead, 2060 .test = alg_test_aead,
2061 .fips_allowed = 1,
2061 .suite = { 2062 .suite = {
2062 .aead = { 2063 .aead = {
2063 .enc = { 2064 .enc = {
@@ -2103,6 +2104,7 @@ static const struct alg_test_desc alg_test_descs[] = {
2103 }, { 2104 }, {
2104 .alg = "authenc(hmac(sha224),cbc(des3_ede))", 2105 .alg = "authenc(hmac(sha224),cbc(des3_ede))",
2105 .test = alg_test_aead, 2106 .test = alg_test_aead,
2107 .fips_allowed = 1,
2106 .suite = { 2108 .suite = {
2107 .aead = { 2109 .aead = {
2108 .enc = { 2110 .enc = {
@@ -2116,6 +2118,7 @@ static const struct alg_test_desc alg_test_descs[] = {
2116 }, { 2118 }, {
2117 .alg = "authenc(hmac(sha256),cbc(aes))", 2119 .alg = "authenc(hmac(sha256),cbc(aes))",
2118 .test = alg_test_aead, 2120 .test = alg_test_aead,
2121 .fips_allowed = 1,
2119 .suite = { 2122 .suite = {
2120 .aead = { 2123 .aead = {
2121 .enc = { 2124 .enc = {
@@ -2142,6 +2145,7 @@ static const struct alg_test_desc alg_test_descs[] = {
2142 }, { 2145 }, {
2143 .alg = "authenc(hmac(sha256),cbc(des3_ede))", 2146 .alg = "authenc(hmac(sha256),cbc(des3_ede))",
2144 .test = alg_test_aead, 2147 .test = alg_test_aead,
2148 .fips_allowed = 1,
2145 .suite = { 2149 .suite = {
2146 .aead = { 2150 .aead = {
2147 .enc = { 2151 .enc = {
@@ -2168,6 +2172,7 @@ static const struct alg_test_desc alg_test_descs[] = {
2168 }, { 2172 }, {
2169 .alg = "authenc(hmac(sha384),cbc(des3_ede))", 2173 .alg = "authenc(hmac(sha384),cbc(des3_ede))",
2170 .test = alg_test_aead, 2174 .test = alg_test_aead,
2175 .fips_allowed = 1,
2171 .suite = { 2176 .suite = {
2172 .aead = { 2177 .aead = {
2173 .enc = { 2178 .enc = {
@@ -2180,6 +2185,7 @@ static const struct alg_test_desc alg_test_descs[] = {
2180 } 2185 }
2181 }, { 2186 }, {
2182 .alg = "authenc(hmac(sha512),cbc(aes))", 2187 .alg = "authenc(hmac(sha512),cbc(aes))",
2188 .fips_allowed = 1,
2183 .test = alg_test_aead, 2189 .test = alg_test_aead,
2184 .suite = { 2190 .suite = {
2185 .aead = { 2191 .aead = {
@@ -2207,6 +2213,7 @@ static const struct alg_test_desc alg_test_descs[] = {
2207 }, { 2213 }, {
2208 .alg = "authenc(hmac(sha512),cbc(des3_ede))", 2214 .alg = "authenc(hmac(sha512),cbc(des3_ede))",
2209 .test = alg_test_aead, 2215 .test = alg_test_aead,
2216 .fips_allowed = 1,
2210 .suite = { 2217 .suite = {
2211 .aead = { 2218 .aead = {
2212 .enc = { 2219 .enc = {