diff options
| author | Tim Hudson <tjh@cryptsoft.com> | 2020-06-01 19:52:23 +1000 |
|---|---|---|
| committer | Tim Hudson <tjh@openssl.org> | 2020-06-01 19:52:23 +1000 |
| commit | c7f837cfcc5b2e5cd8eeeff82e0245323f206d02 (patch) | |
| tree | 73b6c9945e8fbc9e7874973820ed25365822cdf4 /doc | |
| parent | dc18e4ddfbd55b738dd7ccd9347accf6c5b342f6 (diff) | |
undeprecate SSL_CTX_load_verify_locations and X509_STORE_load_locations
The underlying functions remain and these are widely used.
This undoes the deprecation part of PR8442
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12001)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/man3/SSL_CTX_load_verify_locations.pod | 14 | ||||
| -rw-r--r-- | doc/man3/X509_STORE_add_cert.pod | 2 |
2 files changed, 5 insertions, 11 deletions
diff --git a/doc/man3/SSL_CTX_load_verify_locations.pod b/doc/man3/SSL_CTX_load_verify_locations.pod index d28ec4c867..ecc75b72e0 100644 --- a/doc/man3/SSL_CTX_load_verify_locations.pod +++ b/doc/man3/SSL_CTX_load_verify_locations.pod @@ -22,20 +22,16 @@ SSL_CTX_set_default_verify_store, SSL_CTX_load_verify_locations int SSL_CTX_set_default_verify_file(SSL_CTX *ctx); int SSL_CTX_set_default_verify_store(SSL_CTX *ctx); -Deprecated since OpenSSL 3.0, can be hidden entirely by defining -B<OPENSSL_API_COMPAT> with a suitable version value, see -L<openssl_user_macros(7)>: - int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile, const char *CApath); =head1 DESCRIPTION -SSL_CTX_load_verify_dir(), SSL_CTX_load_verify_file(), -SSL_CTX_load_verify_store() specifies the locations for B<ctx>, at -which CA certificates for verification purposes are located. The -certificates available via B<CAfile>, B<CApath> and B<CAstore> are -trusted. +SSL_CTX_load_verify_locations(), SSL_CTX_load_verify_dir(), +SSL_CTX_load_verify_file(), SSL_CTX_load_verify_store() specifies the +locations for B<ctx>, at which CA certificates for verification purposes +are located. The certificates available via B<CAfile>, B<CApath> and +B<CAstore> are trusted. SSL_CTX_set_default_verify_paths() specifies that the default locations from which CA certificates are loaded should be used. There is one default directory, diff --git a/doc/man3/X509_STORE_add_cert.pod b/doc/man3/X509_STORE_add_cert.pod index d41f2ae5a6..ce50e368e7 100644 --- a/doc/man3/X509_STORE_add_cert.pod +++ b/doc/man3/X509_STORE_add_cert.pod @@ -32,8 +32,6 @@ X509_STORE_load_locations int X509_STORE_load_path(X509_STORE *ctx, const char *dir); int X509_STORE_load_store(X509_STORE *ctx, const char *uri); -Deprecated: - int X509_STORE_load_locations(X509_STORE *ctx, const char *file, const char *dir); |