diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-02-21 21:41:56 +0100 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-02-21 21:41:56 +0100 |
| commit | e8d0819d52b2741fcb4ddb79ced4d824c3056918 (patch) | |
| tree | 751519d69bc54c407c7431f1a0efd1d1017a177a /util | |
| parent | 745fc918e7eeb86b2ac541325a8ae5c6e374ee56 (diff) | |
Don't exclude quite so much in a no-sock build
We were excluding more code than we needed to in the OCSP/HTTP code in
the event of no-sock. We should also not assume that a BIO passed to our
API is socket based.
This fixes the no-sock build
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/11134)
Diffstat (limited to 'util')
| -rw-r--r-- | util/libcrypto.num | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index 48a356dfaf..db4532f0e4 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -615,7 +615,7 @@ UI_get0_result_string 629 3_0_0 EXIST::FUNCTION: TS_RESP_CTX_add_policy 630 3_0_0 EXIST::FUNCTION:TS X509_REQ_dup 631 3_0_0 EXIST::FUNCTION: d2i_DSA_PUBKEY_fp 633 3_0_0 EXIST::FUNCTION:DSA,STDIO -OCSP_REQ_CTX_nbio_d2i 634 3_0_0 EXIST::FUNCTION:SOCK +OCSP_REQ_CTX_nbio_d2i 634 3_0_0 EXIST::FUNCTION: d2i_X509_REQ_fp 635 3_0_0 EXIST::FUNCTION:STDIO DH_OpenSSL 636 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,DH BN_get_rfc3526_prime_8192 637 3_0_0 EXIST::FUNCTION:DH @@ -3615,7 +3615,7 @@ EVP_CIPHER_CTX_encrypting 3694 3_0_0 EXIST::FUNCTION: EC_KEY_can_sign 3695 3_0_0 EXIST::FUNCTION:EC PEM_write_bio_RSAPublicKey 3696 3_0_0 EXIST::FUNCTION:RSA X509_CRL_set1_lastUpdate 3697 3_0_0 EXIST::FUNCTION: -OCSP_sendreq_nbio 3698 3_0_0 EXIST::FUNCTION:OCSP,SOCK +OCSP_sendreq_nbio 3698 3_0_0 EXIST::FUNCTION:OCSP PKCS8_encrypt 3699 3_0_0 EXIST::FUNCTION: i2d_PKCS7_fp 3700 3_0_0 EXIST::FUNCTION:STDIO i2d_X509_REQ 3701 3_0_0 EXIST::FUNCTION: @@ -4919,15 +4919,15 @@ EVP_PKEY_pairwise_check ? 3_0_0 EXIST::FUNCTION: ASN1_item_verify_ctx ? 3_0_0 EXIST::FUNCTION: RAND_DRBG_set_callback_data ? 3_0_0 EXIST::FUNCTION: RAND_DRBG_get_callback_data ? 3_0_0 EXIST::FUNCTION: -BIO_wait ? 3_0_0 EXIST::FUNCTION:SOCK BIO_socket_wait ? 3_0_0 EXIST::FUNCTION:SOCK -BIO_connect_retry ? 3_0_0 EXIST::FUNCTION:SOCK +BIO_wait ? 3_0_0 EXIST::FUNCTION: +BIO_connect_retry ? 3_0_0 EXIST::FUNCTION: ERR_load_HTTP_strings ? 3_0_0 EXIST::FUNCTION: -OSSL_HTTP_get ? 3_0_0 EXIST::FUNCTION:SOCK -OSSL_HTTP_get_asn1 ? 3_0_0 EXIST::FUNCTION:SOCK -OSSL_HTTP_post_asn1 ? 3_0_0 EXIST::FUNCTION:SOCK -OSSL_HTTP_transfer ? 3_0_0 EXIST::FUNCTION:SOCK -OSSL_HTTP_proxy_connect ? 3_0_0 EXIST::FUNCTION:SOCK +OSSL_HTTP_get ? 3_0_0 EXIST::FUNCTION: +OSSL_HTTP_get_asn1 ? 3_0_0 EXIST::FUNCTION: +OSSL_HTTP_post_asn1 ? 3_0_0 EXIST::FUNCTION: +OSSL_HTTP_transfer ? 3_0_0 EXIST::FUNCTION: +OSSL_HTTP_proxy_connect ? 3_0_0 EXIST::FUNCTION: ERR_add_error_txt ? 3_0_0 EXIST::FUNCTION: ERR_add_error_mem_bio ? 3_0_0 EXIST::FUNCTION: X509_STORE_CTX_print_verify_cb ? 3_0_0 EXIST::FUNCTION: |