Skip to content

Commit 284a0f6

Browse files
jchaxherbertx
authored andcommitted
crypto: testmgr - Disable fips-allowed for authenc() and des() ciphers
No authenc() ciphers are FIPS approved, nor is ecb(des). After the end of 2015, ansi_cprng will also be non-approved. Signed-off-by: John Haxby <[email protected]> Acked-by: Stephan Mueller <[email protected]> Signed-off-by: Herbert Xu <[email protected]>
1 parent 640eec5 commit 284a0f6

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

crypto/testmgr.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2080,7 +2080,6 @@ static const struct alg_test_desc alg_test_descs[] = {
20802080
}, {
20812081
.alg = "authenc(hmac(md5),ecb(cipher_null))",
20822082
.test = alg_test_aead,
2083-
.fips_allowed = 1,
20842083
.suite = {
20852084
.aead = {
20862085
.enc = {
@@ -2096,7 +2095,6 @@ static const struct alg_test_desc alg_test_descs[] = {
20962095
}, {
20972096
.alg = "authenc(hmac(sha1),cbc(aes))",
20982097
.test = alg_test_aead,
2099-
.fips_allowed = 1,
21002098
.suite = {
21012099
.aead = {
21022100
.enc = {
@@ -2110,7 +2108,6 @@ static const struct alg_test_desc alg_test_descs[] = {
21102108
}, {
21112109
.alg = "authenc(hmac(sha1),cbc(des))",
21122110
.test = alg_test_aead,
2113-
.fips_allowed = 1,
21142111
.suite = {
21152112
.aead = {
21162113
.enc = {
@@ -2124,7 +2121,6 @@ static const struct alg_test_desc alg_test_descs[] = {
21242121
}, {
21252122
.alg = "authenc(hmac(sha1),cbc(des3_ede))",
21262123
.test = alg_test_aead,
2127-
.fips_allowed = 1,
21282124
.suite = {
21292125
.aead = {
21302126
.enc = {
@@ -2138,7 +2134,6 @@ static const struct alg_test_desc alg_test_descs[] = {
21382134
}, {
21392135
.alg = "authenc(hmac(sha1),ecb(cipher_null))",
21402136
.test = alg_test_aead,
2141-
.fips_allowed = 1,
21422137
.suite = {
21432138
.aead = {
21442139
.enc = {
@@ -2158,7 +2153,6 @@ static const struct alg_test_desc alg_test_descs[] = {
21582153
}, {
21592154
.alg = "authenc(hmac(sha224),cbc(des))",
21602155
.test = alg_test_aead,
2161-
.fips_allowed = 1,
21622156
.suite = {
21632157
.aead = {
21642158
.enc = {
@@ -2172,7 +2166,6 @@ static const struct alg_test_desc alg_test_descs[] = {
21722166
}, {
21732167
.alg = "authenc(hmac(sha224),cbc(des3_ede))",
21742168
.test = alg_test_aead,
2175-
.fips_allowed = 1,
21762169
.suite = {
21772170
.aead = {
21782171
.enc = {
@@ -2186,7 +2179,6 @@ static const struct alg_test_desc alg_test_descs[] = {
21862179
}, {
21872180
.alg = "authenc(hmac(sha256),cbc(aes))",
21882181
.test = alg_test_aead,
2189-
.fips_allowed = 1,
21902182
.suite = {
21912183
.aead = {
21922184
.enc = {
@@ -2200,7 +2192,6 @@ static const struct alg_test_desc alg_test_descs[] = {
22002192
}, {
22012193
.alg = "authenc(hmac(sha256),cbc(des))",
22022194
.test = alg_test_aead,
2203-
.fips_allowed = 1,
22042195
.suite = {
22052196
.aead = {
22062197
.enc = {
@@ -2214,7 +2205,6 @@ static const struct alg_test_desc alg_test_descs[] = {
22142205
}, {
22152206
.alg = "authenc(hmac(sha256),cbc(des3_ede))",
22162207
.test = alg_test_aead,
2217-
.fips_allowed = 1,
22182208
.suite = {
22192209
.aead = {
22202210
.enc = {
@@ -2228,7 +2218,6 @@ static const struct alg_test_desc alg_test_descs[] = {
22282218
}, {
22292219
.alg = "authenc(hmac(sha384),cbc(des))",
22302220
.test = alg_test_aead,
2231-
.fips_allowed = 1,
22322221
.suite = {
22332222
.aead = {
22342223
.enc = {
@@ -2242,7 +2231,6 @@ static const struct alg_test_desc alg_test_descs[] = {
22422231
}, {
22432232
.alg = "authenc(hmac(sha384),cbc(des3_ede))",
22442233
.test = alg_test_aead,
2245-
.fips_allowed = 1,
22462234
.suite = {
22472235
.aead = {
22482236
.enc = {
@@ -2256,7 +2244,6 @@ static const struct alg_test_desc alg_test_descs[] = {
22562244
}, {
22572245
.alg = "authenc(hmac(sha512),cbc(aes))",
22582246
.test = alg_test_aead,
2259-
.fips_allowed = 1,
22602247
.suite = {
22612248
.aead = {
22622249
.enc = {
@@ -2270,7 +2257,6 @@ static const struct alg_test_desc alg_test_descs[] = {
22702257
}, {
22712258
.alg = "authenc(hmac(sha512),cbc(des))",
22722259
.test = alg_test_aead,
2273-
.fips_allowed = 1,
22742260
.suite = {
22752261
.aead = {
22762262
.enc = {
@@ -2284,7 +2270,6 @@ static const struct alg_test_desc alg_test_descs[] = {
22842270
}, {
22852271
.alg = "authenc(hmac(sha512),cbc(des3_ede))",
22862272
.test = alg_test_aead,
2287-
.fips_allowed = 1,
22882273
.suite = {
22892274
.aead = {
22902275
.enc = {
@@ -3011,7 +2996,6 @@ static const struct alg_test_desc alg_test_descs[] = {
30112996
}, {
30122997
.alg = "ecb(des)",
30132998
.test = alg_test_skcipher,
3014-
.fips_allowed = 1,
30152999
.suite = {
30163000
.cipher = {
30173001
.enc = {

0 commit comments

Comments
 (0)