diff options
| author | Tim Hudson <tjh@cryptsoft.com> | 2020-06-01 11:52:23 +0200 |
|---|---|---|
| committer | Tim Hudson <tjh@openssl.org> | 2020-06-01 11:52:23 +0200 |
| commit | c7f837cfcc5b2e5cd8eeeff82e0245323f206d02 (patch) | |
| tree | 73b6c9945e8fbc9e7874973820ed25365822cdf4 /include | |
| parent | Make BIO_do_connect() and friends handle multiple IP addresses (diff) | |
| download | openssl-c7f837cfcc5b2e5cd8eeeff82e0245323f206d02.tar.xz openssl-c7f837cfcc5b2e5cd8eeeff82e0245323f206d02.zip | |
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 'include')
| -rw-r--r-- | include/openssl/ssl.h | 4 | ||||
| -rw-r--r-- | include/openssl/x509_vfy.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index d1e9f7957d..0973f0688d 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -2025,9 +2025,9 @@ __owur int SSL_CTX_set_default_verify_store(SSL_CTX *ctx); __owur int SSL_CTX_load_verify_file(SSL_CTX *ctx, const char *CAfile); __owur int SSL_CTX_load_verify_dir(SSL_CTX *ctx, const char *CApath); __owur int SSL_CTX_load_verify_store(SSL_CTX *ctx, const char *CAstore); -DEPRECATEDIN_3_0(__owur int SSL_CTX_load_verify_locations(SSL_CTX *ctx, +__owur int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile, - const char *CApath)) + const char *CApath); # define SSL_get0_session SSL_get_session/* just peek at pointer */ __owur SSL_SESSION *SSL_get_session(const SSL *ssl); __owur SSL_SESSION *SSL_get1_session(SSL *ssl); /* obtain a reference count */ diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h index 92aed08380..fda13502c3 100644 --- a/include/openssl/x509_vfy.h +++ b/include/openssl/x509_vfy.h @@ -510,9 +510,9 @@ int X509_LOOKUP_shutdown(X509_LOOKUP *ctx); int X509_STORE_load_file(X509_STORE *ctx, const char *file); int X509_STORE_load_path(X509_STORE *ctx, const char *path); int X509_STORE_load_store(X509_STORE *ctx, const char *store); -DEPRECATEDIN_3_0(int X509_STORE_load_locations(X509_STORE *ctx, +int X509_STORE_load_locations(X509_STORE *ctx, const char *file, - const char *dir)) + const char *dir); int X509_STORE_set_default_paths(X509_STORE *ctx); #define X509_STORE_CTX_get_ex_new_index(l, p, newf, dupf, freef) \ |