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 /ssl | |
| 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 'ssl')
| -rw-r--r-- | ssl/ssl_lib.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index dafec3d5c7..cb02129d9d 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -4339,7 +4339,6 @@ int SSL_CTX_load_verify_store(SSL_CTX *ctx, const char *CAstore) return X509_STORE_load_store(ctx->cert_store, CAstore); } -#ifndef OPENSSL_NO_DEPRECATED_3_0 int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile, const char *CApath) { @@ -4351,7 +4350,6 @@ int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile, return 0; return 1; } -#endif void SSL_set_info_callback(SSL *ssl, void (*cb) (const SSL *ssl, int type, int val)) |