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 /crypto | |
| 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 'crypto')
| -rw-r--r-- | crypto/x509/x509_d2.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/crypto/x509/x509_d2.c b/crypto/x509/x509_d2.c index cb0f84a7e8..dec5f9d077 100644 --- a/crypto/x509/x509_d2.c +++ b/crypto/x509/x509_d2.c @@ -73,8 +73,6 @@ int X509_STORE_load_store(X509_STORE *ctx, const char *uri) return 1; } -/* Deprecated */ -#ifndef OPENSSL_NO_DEPRECATED_3_0 int X509_STORE_load_locations(X509_STORE *ctx, const char *file, const char *path) { @@ -86,4 +84,3 @@ int X509_STORE_load_locations(X509_STORE *ctx, const char *file, return 0; return 1; } -#endif |