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 /util | |
| 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 'util')
| -rw-r--r-- | util/libcrypto.num | 2 | ||||
| -rw-r--r-- | util/libssl.num | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index cc11651b76..1a51132387 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -2123,7 +2123,7 @@ X509_EXTENSION_create_by_NID 2168 3_0_0 EXIST::FUNCTION: i2d_RSAPrivateKey 2169 3_0_0 EXIST::FUNCTION:RSA d2i_CERTIFICATEPOLICIES 2170 3_0_0 EXIST::FUNCTION: CMAC_CTX_get0_cipher_ctx 2171 3_0_0 EXIST::FUNCTION:CMAC,DEPRECATEDIN_3_0 -X509_STORE_load_locations 2172 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0 +X509_STORE_load_locations 2172 3_0_0 EXIST::FUNCTION: OBJ_find_sigid_algs 2173 3_0_0 EXIST::FUNCTION: TS_RESP_CTX_set_accuracy 2174 3_0_0 EXIST::FUNCTION:TS NETSCAPE_SPKI_get_pubkey 2175 3_0_0 EXIST::FUNCTION: diff --git a/util/libssl.num b/util/libssl.num index b8e0982daa..d638088dde 100644 --- a/util/libssl.num +++ b/util/libssl.num @@ -354,7 +354,7 @@ SSL_set_session_id_context 354 3_0_0 EXIST::FUNCTION: SSL_new 355 3_0_0 EXIST::FUNCTION: TLSv1_1_method 356 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_1_1_0,TLS1_1_METHOD SSL_CTX_get_cert_store 357 3_0_0 EXIST::FUNCTION: -SSL_CTX_load_verify_locations 358 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0 +SSL_CTX_load_verify_locations 358 3_0_0 EXIST::FUNCTION: SSL_SESSION_print_fp 359 3_0_0 EXIST::FUNCTION:STDIO SSL_get0_dane_tlsa 360 3_0_0 EXIST::FUNCTION: SSL_CTX_set_generate_session_id 361 3_0_0 EXIST::FUNCTION: |