diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-09-15 19:55:10 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-09-15 19:55:10 +1000 |
| commit | 7bb82f92d94375e7673fe02cb8186595b2c539f2 (patch) | |
| tree | 9ad368205615d359374430b91906e4c704135fae /doc | |
| parent | dd11c5f0fa809063b152cd2851c4c1e56fbd20c8 (diff) | |
Add fips module integrity check
Add environment variable for setting CONF .include path
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9769)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/man5/config.pod | 7 | ||||
| -rw-r--r-- | doc/man7/provider-base.pod | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/doc/man5/config.pod b/doc/man5/config.pod index deed6d9e16..5e950d740a 100644 --- a/doc/man5/config.pod +++ b/doc/man5/config.pod @@ -40,7 +40,8 @@ It is strongly recommended to use absolute paths with the B<.include> directive. Relative paths are evaluated based on the application current working directory so unless the configuration file containing the B<.include> directive is application specific the inclusion will not -work as expected. +work as expected. The environment variable B<OPENSSL_CONF_INCLUDE> can also be +used to specify the path to prepend to all .include paths. There can be optional B<=> character and whitespace characters between B<.include> directive and the path which can be useful in cases the @@ -487,6 +488,10 @@ Ignored in set-user-ID and set-group-ID programs. The path to the directory with OpenSSL modules, such as providers. Ignored in set-user-ID and set-group-ID programs. +=item B<OPENSSL_CONF_INCLUDE> + +The optional path to prepend to all .include paths. + =back =head1 BUGS diff --git a/doc/man7/provider-base.pod b/doc/man7/provider-base.pod index 6c43cdd59c..1b4b47d02a 100644 --- a/doc/man7/provider-base.pod +++ b/doc/man7/provider-base.pod @@ -110,7 +110,7 @@ provider): CRYPTO_secure_allocated OSSL_FUNC_CRYPTO_SECURE_ALLOCATED BIO_new_file OSSL_FUNC_BIO_NEW_FILE BIO_new_mem_buf OSSL_FUNC_BIO_NEW_MEMBUF - BIO_read OSSL_FUNC_BIO_READ + BIO_read_ex OSSL_FUNC_BIO_READ_EX BIO_free OSSL_FUNC_BIO_FREE OPENSSL_cleanse OSSL_FUNC_OPENSSL_CLEANSE OPENSSL_hexstr2buf OSSL_FUNC_OPENSSL_HEXSTR2BUF @@ -182,7 +182,7 @@ CRYPTO_strndup(), CRYPTO_free(), CRYPTO_clear_free(), CRYPTO_realloc(), CRYPTO_clear_realloc(), CRYPTO_secure_malloc(), CRYPTO_secure_zalloc(), CRYPTO_secure_free(), CRYPTO_secure_clear_free(), CRYPTO_secure_allocated(), -BIO_new_file(), BIO_new_mem_buf(), BIO_read(), BIO_free(), +BIO_new_file(), BIO_new_mem_buf(), BIO_read_ex(), BIO_free(), OPENSSL_cleanse(), and OPENSSL_hexstr2buf() correspond exactly to the public functions with the same name. As a matter of fact, the pointers in the B<OSSL_DISPATCH> array are |