diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-03-06 23:34:19 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-11-03 18:38:23 +0100 |
| commit | 6dcb100f89d0ef081771d533fed342412ac7a13f (patch) | |
| tree | 894398ff0852648209dcb6e92349fa11236ea5b6 /util | |
| parent | e3c4ad283bd1a52f3d53de22e4fc6053bade14d6 (diff) | |
| download | openssl-6dcb100f89d0ef081771d533fed342412ac7a13f.zip openssl-6dcb100f89d0ef081771d533fed342412ac7a13f.tar.gz openssl-6dcb100f89d0ef081771d533fed342412ac7a13f.tar.bz2 | |
X509_LOOKUP_store: new X509_LOOKUP_METHOD that works by OSSL_STORE URI
This is a wrapper around OSSL_STORE.
This also adds necessary support functions:
- X509_STORE_load_file
- X509_STORE_load_path
- X509_STORE_load_store
- SSL_add_store_cert_subjects_to_stack
- SSL_CTX_set_default_verify_store
- SSL_CTX_load_verify_file
- SSL_CTX_load_verify_dir
- SSL_CTX_load_verify_store
and deprecates X509_STORE_load_locations and SSL_CTX_load_verify_locations,
as they aren't extensible.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8442)
Diffstat (limited to 'util')
| -rw-r--r-- | util/libcrypto.num | 6 | ||||
| -rw-r--r-- | util/libssl.num | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index 41ab92a..8a88b6e 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -2122,7 +2122,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 -X509_STORE_load_locations 2172 3_0_0 EXIST::FUNCTION: +X509_STORE_load_locations 2172 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3 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: @@ -4853,3 +4853,7 @@ EVP_SIGNATURE_number 4969 3_0_0 EXIST::FUNCTION: OSSL_CMP_CTX_snprint_PKIStatus 4970 3_0_0 EXIST::FUNCTION:CMP OSSL_CMP_HDR_get0_transactionID 4971 3_0_0 EXIST::FUNCTION:CMP OSSL_CMP_HDR_get0_recipNonce 4972 3_0_0 EXIST::FUNCTION:CMP +X509_LOOKUP_store 4973 3_0_0 EXIST::FUNCTION: +X509_STORE_load_file 4974 3_0_0 EXIST::FUNCTION: +X509_STORE_load_path 4975 3_0_0 EXIST::FUNCTION: +X509_STORE_load_store 4976 3_0_0 EXIST::FUNCTION: diff --git a/util/libssl.num b/util/libssl.num index 25e12ab..c643acb 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: +SSL_CTX_load_verify_locations 358 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3 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: @@ -506,3 +506,8 @@ SSL_get_async_status 506 3_0_0 EXIST::FUNCTION: SSL_sendfile 507 3_0_0 EXIST::FUNCTION: OSSL_default_cipher_list 508 3_0_0 EXIST::FUNCTION: OSSL_default_ciphersuites 509 3_0_0 EXIST::FUNCTION: +SSL_add_store_cert_subjects_to_stack 510 3_0_0 EXIST::FUNCTION: +SSL_CTX_set_default_verify_store 511 3_0_0 EXIST::FUNCTION: +SSL_CTX_load_verify_file 512 3_0_0 EXIST::FUNCTION: +SSL_CTX_load_verify_dir 513 3_0_0 EXIST::FUNCTION: +SSL_CTX_load_verify_store 514 3_0_0 EXIST::FUNCTION: |