We'd like to distinguish between algorithms that are allowed by FIPS
due to being approved and algorithms that are allowed by FIPS due to
being non-cryptographic in nature (despite using the kernel's crypto
API).
Replace "1" with a named constant, FIPS_ALLOWED.
Signed-off-by: Vegard Nossum <vegard.nossum@xxxxxxxxxx>
---
crypto/testmgr.c | 218 ++++++++++++++++++++++++-----------------------
1 file changed, 112 insertions(+), 106 deletions(-)
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 47764fc879bb..4ca54cf6e244 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -142,12 +142,18 @@ struct kpp_test_suite {
unsigned int count;
};
+/*
+ * Allowed algorithms are those which can exist inside a
+ * cryptographic module without making the module non-compliant
+ */
+#define FIPS_ALLOWED 1
+
struct alg_test_desc {
const char *alg;
const char *generic_driver;
int (*test)(const struct alg_test_desc *desc, const char *driver,
u32 type, u32 mask);
- int fips_allowed; /* set if alg is allowed in fips mode */
+ int fips_allowed; /* see FIPS_* constants above */
union {
struct aead_test_suite aead;
@@ -4234,7 +4240,7 @@ static const struct alg_test_desc alg_test_descs[] = {
.alg = "authenc(hmac(sha256),cbc(aes))",
.generic_driver = "authenc(hmac-sha256-lib,cbc(aes-generic))",
.test = alg_test_aead,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.aead = __VECS(hmac_sha256_aes_cbc_tv_temp)
}
@@ -4255,7 +4261,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
.alg = "authenc(hmac(sha256),ctr(aes))",
.test = alg_test_null,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "authenc(hmac(sha256),cts(cbc(aes)))",
.generic_driver = "authenc(hmac-sha256-lib,cts(cbc(aes-generic)))",
@@ -4266,7 +4272,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
.alg = "authenc(hmac(sha256),rfc3686(ctr(aes)))",
.test = alg_test_null,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "authenc(hmac(sha384),cbc(des))",
.generic_driver = "authenc(hmac-sha384-lib,cbc(des-generic))",
@@ -4284,7 +4290,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
.alg = "authenc(hmac(sha384),ctr(aes))",
.test = alg_test_null,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "authenc(hmac(sha384),cts(cbc(aes)))",
.generic_driver = "authenc(hmac-sha384-lib,cts(cbc(aes-generic)))",
@@ -4295,11 +4301,11 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
.alg = "authenc(hmac(sha384),rfc3686(ctr(aes)))",
.test = alg_test_null,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "authenc(hmac(sha512),cbc(aes))",
.generic_driver = "authenc(hmac-sha512-lib,cbc(aes-generic))",
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.test = alg_test_aead,
.suite = {
.aead = __VECS(hmac_sha512_aes_cbc_tv_temp)
@@ -4321,11 +4327,11 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
.alg = "authenc(hmac(sha512),ctr(aes))",
.test = alg_test_null,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "authenc(hmac(sha512),rfc3686(ctr(aes)))",
.test = alg_test_null,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "blake2b-160",
.test = alg_test_hash,
@@ -4357,7 +4363,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
.alg = "cbc(aes)",
.test = alg_test_skcipher,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.cipher = __VECS(aes_cbc_tv_template)
},
@@ -4415,7 +4421,7 @@ static const struct alg_test_desc alg_test_descs[] = {
*/
.alg = "cbc(paes)",
.test = alg_test_null,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
}, {
/* Same as cbc(sm4) except the key is stored in
* hardware secure memory which we reference by index
@@ -4443,7 +4449,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
#if IS_ENABLED(CONFIG_CRYPTO_PAES_S390)
.alg = "cbc-paes-s390",
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.test = alg_test_skcipher,
.suite = {
.cipher = __VECS(aes_cbc_tv_template)
@@ -4465,7 +4471,7 @@ static const struct alg_test_desc alg_test_descs[] = {
.alg = "ccm(aes)",
.generic_driver = "ccm_base(ctr(aes-generic),cbcmac(aes-generic))",
.test = alg_test_aead,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.aead = {
____VECS(aes_ccm_tv_template),
@@ -4490,7 +4496,7 @@ static const struct alg_test_desc alg_test_descs[] = {
},
}, {
.alg = "cmac(aes)",
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.test = alg_test_hash,
.suite = {
.hash = __VECS(aes_cmac128_tv_template)
@@ -4517,7 +4523,7 @@ static const struct alg_test_desc alg_test_descs[] = {
.alg = "crc32",
.generic_driver = "crc32-lib",
.test = alg_test_hash,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.hash = __VECS(crc32_tv_template)
}
@@ -4525,14 +4531,14 @@ static const struct alg_test_desc alg_test_descs[] = {
.alg = "crc32c",
.generic_driver = "crc32c-lib",
.test = alg_test_hash,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.hash = __VECS(crc32c_tv_template)
}
}, {
.alg = "ctr(aes)",
.test = alg_test_skcipher,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.cipher = __VECS(aes_ctr_tv_template)
}
@@ -4584,7 +4590,7 @@ static const struct alg_test_desc alg_test_descs[] = {
*/
.alg = "ctr(paes)",
.test = alg_test_null,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
}, {
/* Same as ctr(sm4) except the key is stored in
@@ -4613,7 +4619,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
#if IS_ENABLED(CONFIG_CRYPTO_PAES_S390)
.alg = "ctr-paes-s390",
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.test = alg_test_skcipher,
.suite = {
.cipher = __VECS(aes_ctr_tv_template)
@@ -4622,7 +4628,7 @@ static const struct alg_test_desc alg_test_descs[] = {
#endif
.alg = "cts(cbc(aes))",
.test = alg_test_skcipher,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.cipher = __VECS(cts_mode_tv_template)
}
@@ -4632,7 +4638,7 @@ static const struct alg_test_desc alg_test_descs[] = {
*/
.alg = "cts(cbc(paes))",
.test = alg_test_null,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "cts(cbc(sm4))",
.test = alg_test_skcipher,
@@ -4648,7 +4654,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
.alg = "deflate",
.test = alg_test_comp,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.comp = {
.comp = __VECS(deflate_comp_tv_template),
@@ -4658,7 +4664,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
.alg = "deflate-iaa",
.test = alg_test_comp,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.comp = {
.comp = __VECS(deflate_comp_tv_template),
@@ -4677,28 +4683,28 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
.alg = "drbg_nopr_ctr_aes128",
.test = alg_test_drbg,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.drbg = __VECS(drbg_nopr_ctr_aes128_tv_template)
}
}, {
.alg = "drbg_nopr_ctr_aes192",
.test = alg_test_drbg,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.drbg = __VECS(drbg_nopr_ctr_aes192_tv_template)
}
}, {
.alg = "drbg_nopr_ctr_aes256",
.test = alg_test_drbg,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.drbg = __VECS(drbg_nopr_ctr_aes256_tv_template)
}
}, {
.alg = "drbg_nopr_hmac_sha256",
.test = alg_test_drbg,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.drbg = __VECS(drbg_nopr_hmac_sha256_tv_template)
}
@@ -4709,18 +4715,18 @@ static const struct alg_test_desc alg_test_descs[] = {
*/
.alg = "drbg_nopr_hmac_sha384",
.test = alg_test_null,
- .fips_allowed = 1
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "drbg_nopr_hmac_sha512",
.test = alg_test_drbg,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.drbg = __VECS(drbg_nopr_hmac_sha512_tv_template)
}
}, {
.alg = "drbg_nopr_sha256",
.test = alg_test_drbg,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.drbg = __VECS(drbg_nopr_sha256_tv_template)
}
@@ -4728,31 +4734,31 @@ static const struct alg_test_desc alg_test_descs[] = {
/* covered by drbg_nopr_sha256 test */
.alg = "drbg_nopr_sha384",
.test = alg_test_null,
- .fips_allowed = 1
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "drbg_nopr_sha512",
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.test = alg_test_null,
}, {
.alg = "drbg_pr_ctr_aes128",
.test = alg_test_drbg,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.drbg = __VECS(drbg_pr_ctr_aes128_tv_template)
}
}, {
/* covered by drbg_pr_ctr_aes128 test */
.alg = "drbg_pr_ctr_aes192",
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.test = alg_test_null,
}, {
.alg = "drbg_pr_ctr_aes256",
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.test = alg_test_null,
}, {
.alg = "drbg_pr_hmac_sha256",
.test = alg_test_drbg,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.drbg = __VECS(drbg_pr_hmac_sha256_tv_template)
}
@@ -4760,15 +4766,15 @@ static const struct alg_test_desc alg_test_descs[] = {
/* covered by drbg_pr_hmac_sha256 test */
.alg = "drbg_pr_hmac_sha384",
.test = alg_test_null,
- .fips_allowed = 1
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "drbg_pr_hmac_sha512",
.test = alg_test_null,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "drbg_pr_sha256",
.test = alg_test_drbg,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.drbg = __VECS(drbg_pr_sha256_tv_template)
}
@@ -4776,15 +4782,15 @@ static const struct alg_test_desc alg_test_descs[] = {
/* covered by drbg_pr_sha256 test */
.alg = "drbg_pr_sha384",
.test = alg_test_null,
- .fips_allowed = 1
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "drbg_pr_sha512",
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.test = alg_test_null,
}, {
.alg = "ecb(aes)",
.test = alg_test_skcipher,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.cipher = __VECS(aes_tv_template)
}
@@ -4834,7 +4840,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
.alg = "ecb(cipher_null)",
.test = alg_test_null,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "ecb(des)",
.test = alg_test_skcipher,
@@ -4868,7 +4874,7 @@ static const struct alg_test_desc alg_test_descs[] = {
*/
.alg = "ecb(paes)",
.test = alg_test_null,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "ecb(seed)",
.test = alg_test_skcipher,
@@ -4914,7 +4920,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
#if IS_ENABLED(CONFIG_CRYPTO_PAES_S390)
.alg = "ecb-paes-s390",
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.test = alg_test_skcipher,
.suite = {
.cipher = __VECS(aes_tv_template)
@@ -4929,14 +4935,14 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
.alg = "ecdh-nist-p256",
.test = alg_test_kpp,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.kpp = __VECS(ecdh_p256_tv_template)
}
}, {
.alg = "ecdh-nist-p384",
.test = alg_test_kpp,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.kpp = __VECS(ecdh_p384_tv_template)
}
@@ -4949,21 +4955,21 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
.alg = "ecdsa-nist-p256",
.test = alg_test_sig,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.sig = __VECS(ecdsa_nist_p256_tv_template)
}
}, {
.alg = "ecdsa-nist-p384",
.test = alg_test_sig,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.sig = __VECS(ecdsa_nist_p384_tv_template)
}
}, {
.alg = "ecdsa-nist-p521",
.test = alg_test_sig,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.sig = __VECS(ecdsa_nist_p521_tv_template)
}
@@ -4977,7 +4983,7 @@ static const struct alg_test_desc alg_test_descs[] = {
.alg = "essiv(authenc(hmac(sha256),cbc(aes)),sha256)",
.generic_driver = "essiv(authenc(hmac-sha256-lib,cbc(aes-generic)),sha256-lib)",
.test = alg_test_aead,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.aead = __VECS(essiv_hmac_sha256_aes_cbc_tv_temp)
}
@@ -4985,7 +4991,7 @@ static const struct alg_test_desc alg_test_descs[] = {
.alg = "essiv(cbc(aes),sha256)",
.generic_driver = "essiv(cbc(aes-generic),sha256-lib)",
.test = alg_test_skcipher,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.cipher = __VECS(essiv_aes_cbc_tv_template)
}
@@ -4993,35 +4999,35 @@ static const struct alg_test_desc alg_test_descs[] = {
#if IS_ENABLED(CONFIG_CRYPTO_DH_RFC7919_GROUPS)
.alg = "ffdhe2048(dh)",
.test = alg_test_kpp,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.kpp = __VECS(ffdhe2048_dh_tv_template)
}
}, {
.alg = "ffdhe3072(dh)",
.test = alg_test_kpp,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.kpp = __VECS(ffdhe3072_dh_tv_template)
}
}, {
.alg = "ffdhe4096(dh)",
.test = alg_test_kpp,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.kpp = __VECS(ffdhe4096_dh_tv_template)
}
}, {
.alg = "ffdhe6144(dh)",
.test = alg_test_kpp,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.kpp = __VECS(ffdhe6144_dh_tv_template)
}
}, {
.alg = "ffdhe8192(dh)",
.test = alg_test_kpp,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.kpp = __VECS(ffdhe8192_dh_tv_template)
}
@@ -5030,7 +5036,7 @@ static const struct alg_test_desc alg_test_descs[] = {
.alg = "gcm(aes)",
.generic_driver = "gcm_base(ctr(aes-generic),ghash-generic)",
.test = alg_test_aead,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.aead = __VECS(aes_gcm_tv_template)
}
@@ -5085,7 +5091,7 @@ static const struct alg_test_desc alg_test_descs[] = {
.alg = "hmac(sha224)",
.generic_driver = "hmac-sha224-lib",
.test = alg_test_hash,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.hash = __VECS(hmac_sha224_tv_template)
}
@@ -5093,35 +5099,35 @@ static const struct alg_test_desc alg_test_descs[] = {
.alg = "hmac(sha256)",
.generic_driver = "hmac-sha256-lib",
.test = alg_test_hash,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.hash = __VECS(hmac_sha256_tv_template)
}
}, {
.alg = "hmac(sha3-224)",
.test = alg_test_hash,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.hash = __VECS(hmac_sha3_224_tv_template)
}
}, {
.alg = "hmac(sha3-256)",
.test = alg_test_hash,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.hash = __VECS(hmac_sha3_256_tv_template)
}
}, {
.alg = "hmac(sha3-384)",
.test = alg_test_hash,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.hash = __VECS(hmac_sha3_384_tv_template)
}
}, {
.alg = "hmac(sha3-512)",
.test = alg_test_hash,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.hash = __VECS(hmac_sha3_512_tv_template)
}
@@ -5129,7 +5135,7 @@ static const struct alg_test_desc alg_test_descs[] = {
.alg = "hmac(sha384)",
.generic_driver = "hmac-sha384-lib",
.test = alg_test_hash,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.hash = __VECS(hmac_sha384_tv_template)
}
@@ -5137,7 +5143,7 @@ static const struct alg_test_desc alg_test_descs[] = {
.alg = "hmac(sha512)",
.generic_driver = "hmac-sha512-lib",
.test = alg_test_hash,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.hash = __VECS(hmac_sha512_tv_template)
}
@@ -5161,7 +5167,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}
}, {
.alg = "jitterentropy_rng",
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.test = alg_test_null,
}, {
.alg = "krb5enc(cmac(camellia),cts(cbc(camellia)))",
@@ -5205,7 +5211,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
.alg = "lz4",
.test = alg_test_comp,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.comp = {
.comp = __VECS(lz4_comp_tv_template),
@@ -5215,7 +5221,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
.alg = "lz4hc",
.test = alg_test_comp,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.comp = {
.comp = __VECS(lz4hc_comp_tv_template),
@@ -5225,7 +5231,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
.alg = "lzo",
.test = alg_test_comp,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.comp = {
.comp = __VECS(lzo_comp_tv_template),
@@ -5235,7 +5241,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
.alg = "lzo-rle",
.test = alg_test_comp,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.comp = {
.comp = __VECS(lzorle_comp_tv_template),
@@ -5272,18 +5278,18 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
.alg = "p1363(ecdsa-nist-p256)",
.test = alg_test_sig,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.sig = __VECS(p1363_ecdsa_nist_p256_tv_template)
}
}, {
.alg = "p1363(ecdsa-nist-p384)",
.test = alg_test_null,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "p1363(ecdsa-nist-p521)",
.test = alg_test_null,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "pcbc(fcrypt)",
.test = alg_test_skcipher,
@@ -5294,28 +5300,28 @@ static const struct alg_test_desc alg_test_descs[] = {
#if IS_ENABLED(CONFIG_CRYPTO_PHMAC_S390)
.alg = "phmac(sha224)",
.test = alg_test_hash,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.hash = __VECS(hmac_sha224_tv_template)
}
}, {
.alg = "phmac(sha256)",
.test = alg_test_hash,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.hash = __VECS(hmac_sha256_tv_template)
}
}, {
.alg = "phmac(sha384)",
.test = alg_test_hash,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.hash = __VECS(hmac_sha384_tv_template)
}
}, {
.alg = "phmac(sha512)",
.test = alg_test_hash,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.hash = __VECS(hmac_sha512_tv_template)
}
@@ -5329,38 +5335,38 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
.alg = "pkcs1(rsa,sha224)",
.test = alg_test_null,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "pkcs1(rsa,sha256)",
.test = alg_test_sig,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.sig = __VECS(pkcs1_rsa_tv_template)
}
}, {
.alg = "pkcs1(rsa,sha3-256)",
.test = alg_test_null,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "pkcs1(rsa,sha3-384)",
.test = alg_test_null,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "pkcs1(rsa,sha3-512)",
.test = alg_test_null,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "pkcs1(rsa,sha384)",
.test = alg_test_null,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "pkcs1(rsa,sha512)",
.test = alg_test_null,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "pkcs1pad(rsa)",
.test = alg_test_null,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "polyval",
.test = alg_test_hash,
@@ -5370,7 +5376,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
.alg = "rfc3686(ctr(aes))",
.test = alg_test_skcipher,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.cipher = __VECS(aes_ctr_rfc3686_tv_template)
}
@@ -5384,7 +5390,7 @@ static const struct alg_test_desc alg_test_descs[] = {
.alg = "rfc4106(gcm(aes))",
.generic_driver = "rfc4106(gcm_base(ctr(aes-generic),ghash-generic))",
.test = alg_test_aead,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.aead = {
____VECS(aes_gcm_rfc4106_tv_template),
@@ -5396,7 +5402,7 @@ static const struct alg_test_desc alg_test_descs[] = {
.alg = "rfc4309(ccm(aes))",
.generic_driver = "rfc4309(ccm_base(ctr(aes-generic),cbcmac(aes-generic)))",
.test = alg_test_aead,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.aead = {
____VECS(aes_ccm_rfc4309_tv_template),
@@ -5440,7 +5446,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
.alg = "rsa",
.test = alg_test_akcipher,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.akcipher = __VECS(rsa_tv_template)
}
@@ -5455,7 +5461,7 @@ static const struct alg_test_desc alg_test_descs[] = {
.alg = "sha224",
.generic_driver = "sha224-lib",
.test = alg_test_hash,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.hash = __VECS(sha224_tv_template)
}
@@ -5463,35 +5469,35 @@ static const struct alg_test_desc alg_test_descs[] = {
.alg = "sha256",
.generic_driver = "sha256-lib",
.test = alg_test_hash,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.hash = __VECS(sha256_tv_template)
}
}, {
.alg = "sha3-224",
.test = alg_test_hash,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.hash = __VECS(sha3_224_tv_template)
}
}, {
.alg = "sha3-256",
.test = alg_test_hash,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.hash = __VECS(sha3_256_tv_template)
}
}, {
.alg = "sha3-384",
.test = alg_test_hash,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.hash = __VECS(sha3_384_tv_template)
}
}, {
.alg = "sha3-512",
.test = alg_test_hash,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.hash = __VECS(sha3_512_tv_template)
}
@@ -5499,7 +5505,7 @@ static const struct alg_test_desc alg_test_descs[] = {
.alg = "sha384",
.generic_driver = "sha384-lib",
.test = alg_test_hash,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.hash = __VECS(sha384_tv_template)
}
@@ -5507,7 +5513,7 @@ static const struct alg_test_desc alg_test_descs[] = {
.alg = "sha512",
.generic_driver = "sha512-lib",
.test = alg_test_hash,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.hash = __VECS(sha512_tv_template)
}
@@ -5556,21 +5562,21 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
.alg = "x962(ecdsa-nist-p256)",
.test = alg_test_sig,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.sig = __VECS(x962_ecdsa_nist_p256_tv_template)
}
}, {
.alg = "x962(ecdsa-nist-p384)",
.test = alg_test_sig,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.sig = __VECS(x962_ecdsa_nist_p384_tv_template)
}
}, {
.alg = "x962(ecdsa-nist-p521)",
.test = alg_test_sig,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.sig = __VECS(x962_ecdsa_nist_p521_tv_template)
}
@@ -5608,7 +5614,7 @@ static const struct alg_test_desc alg_test_descs[] = {
.alg = "xts(aes)",
.generic_driver = "xts(ecb(aes-generic))",
.test = alg_test_skcipher,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.cipher = __VECS(aes_xts_tv_template)
}
@@ -5632,7 +5638,7 @@ static const struct alg_test_desc alg_test_descs[] = {
*/
.alg = "xts(paes)",
.test = alg_test_null,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
}, {
.alg = "xts(serpent)",
.generic_driver = "xts(ecb(serpent-generic))",
@@ -5657,7 +5663,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}, {
#if IS_ENABLED(CONFIG_CRYPTO_PAES_S390)
.alg = "xts-paes-s390",
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.test = alg_test_skcipher,
.suite = {
.cipher = __VECS(aes_xts_tv_template)
@@ -5666,14 +5672,14 @@ static const struct alg_test_desc alg_test_descs[] = {
#endif
.alg = "xxhash64",
.test = alg_test_hash,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.hash = __VECS(xxhash64_tv_template)
}
}, {
.alg = "zstd",
.test = alg_test_comp,
- .fips_allowed = 1,
+ .fips_allowed = FIPS_ALLOWED,
.suite = {
.comp = {
.comp = __VECS(zstd_comp_tv_template),
--
2.39.3
