From 35e6ea3bdc2741c1818337e75756b45d6a2a6122 Mon Sep 17 00:00:00 2001 From: Shane Lontis Date: Thu, 10 Sep 2020 14:01:30 +1000 Subject: keygen: add FIPS error state management to conditional self tests Reviewed-by: Matt Caswell Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/12801) --- include/openssl/fips_names.h | 7 +++++++ include/openssl/self_test.h | 1 + 2 files changed, 8 insertions(+) (limited to 'include') diff --git a/include/openssl/fips_names.h b/include/openssl/fips_names.h index 493ddb046d..7dec75fcea 100644 --- a/include/openssl/fips_names.h +++ b/include/openssl/fips_names.h @@ -39,6 +39,13 @@ extern "C" { */ # define OSSL_PROV_FIPS_PARAM_INSTALL_STATUS "install-status" +/* + * A boolean that determines if the FIPS conditional test errors result in + * the module entering an error state. + * Type: OSSL_PARAM_UTF8_STRING + */ +# define OSSL_PROV_FIPS_PARAM_CONDITIONAL_ERRORS "conditional-errors" + # ifdef __cplusplus } # endif diff --git a/include/openssl/self_test.h b/include/openssl/self_test.h index ff6e1b8e08..aa153581fa 100644 --- a/include/openssl/self_test.h +++ b/include/openssl/self_test.h @@ -27,6 +27,7 @@ extern "C" { # define OSSL_SELF_TEST_TYPE_NONE "None" # define OSSL_SELF_TEST_TYPE_MODULE_INTEGRITY "Module_Integrity" # define OSSL_SELF_TEST_TYPE_INSTALL_INTEGRITY "Install_Integrity" +# define OSSL_SELF_TEST_TYPE_CRNG "Continuous_RNG_Test" # define OSSL_SELF_TEST_TYPE_PCT "Pairwise_Consistency_Test" # define OSSL_SELF_TEST_TYPE_KAT_CIPHER "KAT_Cipher" # define OSSL_SELF_TEST_TYPE_KAT_DIGEST "KAT_Digest" -- cgit v1.2.3