diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-09-10 14:01:30 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-09-12 16:46:51 +1000 |
| commit | 35e6ea3bdc2741c1818337e75756b45d6a2a6122 (patch) | |
| tree | 5e3220d285fb8cbc899c7e7565475c832c00943e /include | |
| parent | 801ed9edbad11b3f0646b396c672dbae33353de2 (diff) | |
keygen: add FIPS error state management to conditional self tests
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12801)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/fips_names.h | 7 | ||||
| -rw-r--r-- | include/openssl/self_test.h | 1 |
2 files changed, 8 insertions, 0 deletions
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" |