diff options
author | Shane Lontis <shane.lontis@oracle.com> | 2020-03-20 20:25:39 +1000 |
---|---|---|
committer | Shane Lontis <shane.lontis@oracle.com> | 2020-03-20 20:25:39 +1000 |
commit | 22e27978b29b2cdc1db79659ed653d6cf31834ab (patch) | |
tree | f156d63b1f889794d723167e59108d088fbe5907 /doc/man5 | |
parent | 0f2deef59d13e852a4bde0e853e9b49bab51a108 (diff) |
Add support for passing the libctx to the config loader
The self tests for the fips module are triggered on startup and they need to know the
core's libctx in order to function correctly. As the provider can be autoloaded via configuration
it then needs to propagate the callers libctx down to the provider via the config load.
Note that OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, ..) is still called, but will only load the default
configuration if the OPENSSL_CONF environment variable is set.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11240)
Diffstat (limited to 'doc/man5')
-rw-r--r-- | doc/man5/config.pod | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/man5/config.pod b/doc/man5/config.pod index b9ad06b124..98b8cd3317 100644 --- a/doc/man5/config.pod +++ b/doc/man5/config.pod @@ -455,7 +455,7 @@ priority and B</tmp> used if neither is defined: Simple OpenSSL library configuration example to enter FIPS mode: # Default appname: should match "appname" parameter (if any) - # supplied to CONF_modules_load_file et al. + # supplied to CONF_modules_load_file_with_libctx et al. openssl_conf = openssl_conf_section [openssl_conf_section] @@ -488,7 +488,7 @@ minimum TLS version: More complex OpenSSL library configuration. Add OID and don't enter FIPS mode: # Default appname: should match "appname" parameter (if any) - # supplied to CONF_modules_load_file et al. + # supplied to CONF_modules_load_file_with_libctx et al. openssl_conf = openssl_conf_section [openssl_conf_section] @@ -576,7 +576,7 @@ L<openssl-x509(1)>, L<openssl-req(1)>, L<openssl-ca(1)>, L<fips_config(5)> =head1 COPYRIGHT -Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved. Licensed under the Apache License 2.0 (the "License"). You may not use this file except in compliance with the License. You can obtain a copy |