summaryrefslogtreecommitdiffstats
path: root/test/tls-provider.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2020-08-05 15:46:48 +0200
committerMatt Caswell <matt@openssl.org>2020-08-17 12:27:51 +0200
commitbfa6aaab45c30ced2da851ee92f8ac5942f08078 (patch)
treeffdb18915c6a46038a36918c093aeb4cdf33ab16 /test/tls-provider.c
parentLoad the default config file before working with default properties (diff)
downloadopenssl-bfa6aaab45c30ced2da851ee92f8ac5942f08078.tar.xz
openssl-bfa6aaab45c30ced2da851ee92f8ac5942f08078.zip
Test that EVP_default_properties_is_fips_enabled() works early
We check that EVP_default_properties_is_fips_enabled() is working even before other function calls have auto-loaded the config file. Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/12567)
Diffstat (limited to 'test/tls-provider.c')
-rw-r--r--test/tls-provider.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/test/tls-provider.c b/test/tls-provider.c
index 496ba7ead9..924ede501b 100644
--- a/test/tls-provider.c
+++ b/test/tls-provider.c
@@ -180,7 +180,11 @@ static const OSSL_DISPATCH xor_keyexch_functions[] = {
};
static const OSSL_ALGORITHM tls_prov_keyexch[] = {
- { "XOR", "provider=tls-provider", xor_keyexch_functions },
+ /*
+ * Obviously this is not FIPS approved, but in order to test in conjuction
+ * with the FIPS provider we pretend that it is.
+ */
+ { "XOR", "provider=tls-provider,fips=yes", xor_keyexch_functions },
{ NULL, NULL, NULL }
};
@@ -414,7 +418,11 @@ static const OSSL_DISPATCH xor_keymgmt_functions[] = {
};
static const OSSL_ALGORITHM tls_prov_keymgmt[] = {
- { "XOR", "provider=tls-provider", xor_keymgmt_functions },
+ /*
+ * Obviously this is not FIPS approved, but in order to test in conjuction
+ * with the FIPS provider we pretend that it is.
+ */
+ { "XOR", "provider=tls-provider,fips=yes", xor_keymgmt_functions },
{ NULL, NULL, NULL }
};