aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-04-20 12:56:37 +0100
committerMatt Caswell <matt@openssl.org>2016-04-20 14:52:46 +0100
commitf863ad0c59374ee8cc91dcae71ef60ceabc969f1 (patch)
tree51b28ea959d38ec7f49c7efd457e58a7c7c5f117
parent2469e76b30d64d9374e06523f3c8a7d669986523 (diff)
downloadopenssl-f863ad0c59374ee8cc91dcae71ef60ceabc969f1.tar.gz
Fix no-sock on Windows
Link errors were occurring on Windows because the header files were not correctly guarding some functions with OPENSSL_NO_SOCK Reviewed-by: Rich Salz <rsalz@openssl.org>
-rw-r--r--apps/ocsp.c15
-rw-r--r--include/openssl/bio.h90
-rw-r--r--util/libcrypto.num84
3 files changed, 102 insertions, 87 deletions
diff --git a/apps/ocsp.c b/apps/ocsp.c
index ca293a9709..c1679f0292 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -1027,13 +1027,13 @@ static char **lookup_serial(CA_DB *db, ASN1_INTEGER *ser)
static BIO *init_responder(const char *port)
{
- BIO *acbio = NULL, *bufbio = NULL;
-
# ifdef OPENSSL_NO_SOCK
BIO_printf(bio_err,
"Error setting up accept BIO - sockets not supported.\n");
return NULL;
-# endif
+# else
+ BIO *acbio = NULL, *bufbio = NULL;
+
bufbio = BIO_new(BIO_f_buffer());
if (bufbio == NULL)
goto err;
@@ -1060,9 +1060,10 @@ static BIO *init_responder(const char *port)
BIO_free_all(acbio);
BIO_free(bufbio);
return NULL;
+# endif
}
-
+# ifndef OPENSSL_NO_SOCK
/*
* Decode %xx URL-decoding in-place. Ignores mal-formed sequences.
*/
@@ -1086,9 +1087,13 @@ static int urldecode(char *p)
*out = '\0';
return (int)(out - save);
}
+# endif
static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio)
{
+# ifdef OPENSSL_NO_SOCK
+ return 0;
+# else
int len;
OCSP_REQUEST *req = NULL;
char inbuf[2048], reqbuf[2048];
@@ -1169,7 +1174,7 @@ static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio)
*preq = req;
return 1;
-
+# endif
}
static int send_ocsp_response(BIO *cbio, OCSP_RESPONSE *resp)
diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index 210bc10d2b..6da37c00ad 100644
--- a/include/openssl/bio.h
+++ b/include/openssl/bio.h
@@ -400,48 +400,51 @@ struct bio_dgram_sctp_prinfo {
# define BIO_set_app_data(s,arg) BIO_set_ex_data(s,0,arg)
# define BIO_get_app_data(s) BIO_get_ex_data(s,0)
+# define BIO_set_nbio(b,n) BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL)
+
+# ifndef OPENSSL_NO_SOCK
/* IP families we support, for BIO_s_connect() and BIO_s_accept() */
/* Note: the underlying operating system may not support some of them */
-# define BIO_FAMILY_IPV4 4
-# define BIO_FAMILY_IPV6 6
-# define BIO_FAMILY_IPANY 256
+# define BIO_FAMILY_IPV4 4
+# define BIO_FAMILY_IPV6 6
+# define BIO_FAMILY_IPANY 256
/* BIO_s_connect() */
-# define BIO_set_conn_hostname(b,name) BIO_ctrl(b,BIO_C_SET_CONNECT,0,(char *)name)
-# define BIO_set_conn_port(b,port) BIO_ctrl(b,BIO_C_SET_CONNECT,1,(char *)port)
-# define BIO_set_conn_address(b,addr) BIO_ctrl(b,BIO_C_SET_CONNECT,2,(char *)addr)
-# define BIO_set_conn_ip_family(b,f) BIO_int_ctrl(b,BIO_C_SET_CONNECT,3,f)
-# define BIO_get_conn_hostname(b) ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0,NULL))
-# define BIO_get_conn_port(b) ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1,NULL))
-# define BIO_get_conn_address(b) ((const BIO_ADDR *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2,NULL))
-# define BIO_get_conn_ip_family(b) BIO_ctrl(b,BIO_C_GET_CONNECT,3,NULL)
-# define BIO_set_conn_mode(b,n) BIO_ctrl(b,BIO_C_SET_CONNECT_MODE,(n),NULL)
-
-# define BIO_set_nbio(b,n) BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL)
+# define BIO_set_conn_hostname(b,name) BIO_ctrl(b,BIO_C_SET_CONNECT,0,(char *)name)
+# define BIO_set_conn_port(b,port) BIO_ctrl(b,BIO_C_SET_CONNECT,1,(char *)port)
+# define BIO_set_conn_address(b,addr) BIO_ctrl(b,BIO_C_SET_CONNECT,2,(char *)addr)
+# define BIO_set_conn_ip_family(b,f) BIO_int_ctrl(b,BIO_C_SET_CONNECT,3,f)
+# define BIO_get_conn_hostname(b) ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0,NULL))
+# define BIO_get_conn_port(b) ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1,NULL))
+# define BIO_get_conn_address(b) ((const BIO_ADDR *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2,NULL))
+# define BIO_get_conn_ip_family(b) BIO_ctrl(b,BIO_C_GET_CONNECT,3,NULL)
+# define BIO_set_conn_mode(b,n) BIO_ctrl(b,BIO_C_SET_CONNECT_MODE,(n),NULL)
/* BIO_s_accept() */
-# define BIO_set_accept_name(b,name) BIO_ctrl(b,BIO_C_SET_ACCEPT,0,(char *)name)
-# define BIO_set_accept_port(b,port) BIO_ctrl(b,BIO_C_SET_ACCEPT,1,(char *)port)
-# define BIO_get_accept_name(b) ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,0))
-# define BIO_get_accept_port(b) ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,1))
-# define BIO_get_peer_name(b) ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,2))
-# define BIO_get_peer_port(b) ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,3))
+# define BIO_set_accept_name(b,name) BIO_ctrl(b,BIO_C_SET_ACCEPT,0,(char *)name)
+# define BIO_set_accept_port(b,port) BIO_ctrl(b,BIO_C_SET_ACCEPT,1,(char *)port)
+# define BIO_get_accept_name(b) ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,0))
+# define BIO_get_accept_port(b) ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,1))
+# define BIO_get_peer_name(b) ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,2))
+# define BIO_get_peer_port(b) ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,3))
/* #define BIO_set_nbio(b,n) BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL) */
-# define BIO_set_nbio_accept(b,n) BIO_ctrl(b,BIO_C_SET_ACCEPT,2,(n)?(void *)"a":NULL)
-# define BIO_set_accept_bios(b,bio) BIO_ctrl(b,BIO_C_SET_ACCEPT,3,(char *)bio)
-# define BIO_set_accept_ip_family(b,f) BIO_int_ctrl(b,BIO_C_SET_ACCEPT,4,f)
-# define BIO_get_accept_ip_family(b) BIO_ctrl(b,BIO_C_GET_ACCEPT,4,NULL)
+# define BIO_set_nbio_accept(b,n) BIO_ctrl(b,BIO_C_SET_ACCEPT,2,(n)?(void *)"a":NULL)
+# define BIO_set_accept_bios(b,bio) BIO_ctrl(b,BIO_C_SET_ACCEPT,3,(char *)bio)
+# define BIO_set_accept_ip_family(b,f) BIO_int_ctrl(b,BIO_C_SET_ACCEPT,4,f)
+# define BIO_get_accept_ip_family(b) BIO_ctrl(b,BIO_C_GET_ACCEPT,4,NULL)
/* Aliases kept for backward compatibility */
-# define BIO_BIND_NORMAL 0
-# define BIO_BIND_REUSEADDR BIO_SOCK_REUSEADDR
-# define BIO_BIND_REUSEADDR_IF_UNUSED BIO_SOCK_REUSEADDR
-# define BIO_set_bind_mode(b,mode) BIO_ctrl(b,BIO_C_SET_BIND_MODE,mode,NULL)
-# define BIO_get_bind_mode(b) BIO_ctrl(b,BIO_C_GET_BIND_MODE,0,NULL)
+# define BIO_BIND_NORMAL 0
+# define BIO_BIND_REUSEADDR BIO_SOCK_REUSEADDR
+# define BIO_BIND_REUSEADDR_IF_UNUSED BIO_SOCK_REUSEADDR
+# define BIO_set_bind_mode(b,mode) BIO_ctrl(b,BIO_C_SET_BIND_MODE,mode,NULL)
+# define BIO_get_bind_mode(b) BIO_ctrl(b,BIO_C_GET_BIND_MODE,0,NULL)
/* BIO_s_accept() and BIO_s_connect() */
-# define BIO_do_connect(b) BIO_do_handshake(b)
-# define BIO_do_accept(b) BIO_do_handshake(b)
+# define BIO_do_connect(b) BIO_do_handshake(b)
+# define BIO_do_accept(b) BIO_do_handshake(b)
+# endif /* OPENSSL_NO_SOCK */
+
# define BIO_do_handshake(b) BIO_ctrl(b,BIO_C_DO_STATE_MACHINE,0,NULL)
/* BIO_s_datagram(), BIO_s_fd(), BIO_s_socket(), BIO_s_accept() and BIO_s_connect() */
@@ -624,9 +627,11 @@ long BIO_debug_callback(BIO *bio, int cmd, const char *argp, int argi,
const BIO_METHOD *BIO_s_mem(void);
const BIO_METHOD *BIO_s_secmem(void);
BIO *BIO_new_mem_buf(const void *buf, int len);
+# ifndef OPENSSL_NO_SOCK
const BIO_METHOD *BIO_s_socket(void);
const BIO_METHOD *BIO_s_connect(void);
const BIO_METHOD *BIO_s_accept(void);
+# endif
const BIO_METHOD *BIO_s_fd(void);
const BIO_METHOD *BIO_s_log(void);
const BIO_METHOD *BIO_s_bio(void);
@@ -653,8 +658,10 @@ int BIO_dgram_sctp_msg_waiting(BIO *b);
# endif
# endif
+# ifndef OPENSSL_NO_SOCK
int BIO_sock_should_retry(int i);
int BIO_sock_non_fatal_error(int error);
+# endif
int BIO_fd_should_retry(int i);
int BIO_fd_non_fatal_error(int error);
@@ -671,6 +678,7 @@ int BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent);
int BIO_hex_string(BIO *out, int indent, int width, unsigned char *data,
int datalen);
+# ifndef OPENSSL_NO_SOCK
BIO_ADDR *BIO_ADDR_new(void);
int BIO_ADDR_rawmake(BIO_ADDR *ap, int family,
const void *where, size_t wherelen, unsigned short port);
@@ -705,9 +713,9 @@ int BIO_sock_error(int sock);
int BIO_socket_ioctl(int fd, long type, void *arg);
int BIO_socket_nbio(int fd, int mode);
int BIO_sock_init(void);
-#if OPENSSL_API_COMPAT < 0x10100000L
-# define BIO_sock_cleanup() while(0) continue
-#endif
+# if OPENSSL_API_COMPAT < 0x10100000L
+# define BIO_sock_cleanup() while(0) continue
+# endif
int BIO_set_tcp_ndelay(int sock, int turn_on);
DEPRECATEDIN_1_1_0(struct hostent *BIO_gethostbyname(const char *name))
@@ -725,11 +733,11 @@ enum BIO_sock_info_type {
int BIO_sock_info(int sock,
enum BIO_sock_info_type type, union BIO_sock_info_u *info);
-# define BIO_SOCK_REUSEADDR 0x01
-# define BIO_SOCK_V6_ONLY 0x02
-# define BIO_SOCK_KEEPALIVE 0x04
-# define BIO_SOCK_NONBLOCK 0x08
-# define BIO_SOCK_NODELAY 0x10
+# define BIO_SOCK_REUSEADDR 0x01
+# define BIO_SOCK_V6_ONLY 0x02
+# define BIO_SOCK_KEEPALIVE 0x04
+# define BIO_SOCK_NONBLOCK 0x08
+# define BIO_SOCK_NODELAY 0x10
int BIO_socket(int domain, int socktype, int protocol, int options);
int BIO_connect(int sock, const BIO_ADDR *addr, int options);
@@ -738,9 +746,11 @@ int BIO_accept_ex(int accept_sock, BIO_ADDR *addr, int options);
int BIO_closesocket(int sock);
BIO *BIO_new_socket(int sock, int close_flag);
-BIO *BIO_new_fd(int fd, int close_flag);
BIO *BIO_new_connect(const char *host_port);
BIO *BIO_new_accept(const char *host_port);
+# endif /* OPENSSL_NO_SOCK*/
+
+BIO *BIO_new_fd(int fd, int close_flag);
int BIO_new_bio_pair(BIO **bio1, size_t writebuf1,
BIO **bio2, size_t writebuf2);
diff --git a/util/libcrypto.num b/util/libcrypto.num
index 3dde7557fa..6c0553bb9c 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -95,7 +95,7 @@ OCSP_archive_cutoff_new 92 1_1_0 EXIST::FUNCTION:
DSA_size 93 1_1_0 EXIST::FUNCTION:DSA
IPAddressRange_free 94 1_1_0 EXIST::FUNCTION:RFC3779
CMS_ContentInfo_free 95 1_1_0 EXIST::FUNCTION:CMS
-BIO_accept 96 1_1_0 EXIST::FUNCTION:DEPRECATEDIN_1_1_0
+BIO_accept 96 1_1_0 EXIST::FUNCTION:DEPRECATEDIN_1_1_0,SOCK
X509_VERIFY_PARAM_set1_policies 97 1_1_0 EXIST::FUNCTION:
SCT_set0_extensions 98 1_1_0 EXIST::FUNCTION:CT
PKCS5_pbe2_set_scrypt 99 1_1_0 EXIST::FUNCTION:SCRYPT
@@ -106,7 +106,7 @@ d2i_DHparams 103 1_1_0 EXIST::FUNCTION:DH
i2d_PKCS7_ENC_CONTENT 104 1_1_0 EXIST::FUNCTION:
DH_generate_key 105 1_1_0 EXIST::FUNCTION:DH
ENGINE_add_conf_module 106 1_1_0 EXIST::FUNCTION:ENGINE
-BIO_new_socket 107 1_1_0 EXIST::FUNCTION:
+BIO_new_socket 107 1_1_0 EXIST::FUNCTION:SOCK
ASN1_OBJECT_free 108 1_1_0 EXIST::FUNCTION:
X509_REQ_get_extensions 109 1_1_0 EXIST::FUNCTION:
X509_get_version 110 1_1_0 EXIST::FUNCTION:
@@ -116,7 +116,7 @@ i2d_TS_MSG_IMPRINT 113 1_1_0 EXIST::FUNCTION:TS
EC_POINT_mul 114 1_1_0 EXIST::FUNCTION:EC
WHIRLPOOL_Final 115 1_1_0 EXIST::FUNCTION:WHIRLPOOL
CMS_get1_ReceiptRequest 116 1_1_0 EXIST::FUNCTION:CMS
-BIO_sock_non_fatal_error 117 1_1_0 EXIST::FUNCTION:
+BIO_sock_non_fatal_error 117 1_1_0 EXIST::FUNCTION:SOCK
HMAC_Update 118 1_1_0 EXIST::FUNCTION:
i2d_PKCS12 119 1_1_0 EXIST::FUNCTION:
EVP_BytesToKey 120 1_1_0 EXIST::FUNCTION:
@@ -147,7 +147,7 @@ ASIdentifierChoice_new 144 1_1_0 EXIST::FUNCTION:RFC3779
EVP_PKEY_asn1_set_public 145 1_1_0 EXIST::FUNCTION:
IDEA_set_decrypt_key 146 1_1_0 EXIST::FUNCTION:IDEA
X509_STORE_CTX_set_flags 147 1_1_0 EXIST::FUNCTION:
-BIO_ADDR_rawmake 148 1_1_0 EXIST::FUNCTION:
+BIO_ADDR_rawmake 148 1_1_0 EXIST::FUNCTION:SOCK
EVP_PKEY_asn1_set_ctrl 149 1_1_0 EXIST::FUNCTION:
EC_POINTs_mul 150 1_1_0 EXIST::FUNCTION:EC
ASN1_get_object 151 1_1_0 EXIST::FUNCTION:
@@ -324,7 +324,7 @@ X509_get_subject_name 319 1_1_0 EXIST::FUNCTION:
DH_get_1024_160 320 1_1_0 EXIST::FUNCTION:DH
i2d_ASN1_UNIVERSALSTRING 321 1_1_0 EXIST::FUNCTION:
d2i_OCSP_RESPID 322 1_1_0 EXIST::FUNCTION:
-BIO_s_accept 323 1_1_0 EXIST::FUNCTION:
+BIO_s_accept 323 1_1_0 EXIST::FUNCTION:SOCK
EVP_whirlpool 324 1_1_0 EXIST::FUNCTION:WHIRLPOOL
OCSP_ONEREQ_get1_ext_d2i 325 1_1_0 EXIST::FUNCTION:
d2i_ESS_SIGNING_CERT 326 1_1_0 EXIST::FUNCTION:TS
@@ -341,7 +341,7 @@ EVP_EncryptUpdate 336 1_1_0 EXIST::FUNCTION:
SRP_create_verifier 337 1_1_0 EXIST::FUNCTION:SRP
TS_TST_INFO_print_bio 338 1_1_0 EXIST::FUNCTION:TS
X509_NAME_get_index_by_OBJ 339 1_1_0 EXIST::FUNCTION:
-BIO_get_host_ip 340 1_1_0 EXIST::FUNCTION:DEPRECATEDIN_1_1_0
+BIO_get_host_ip 340 1_1_0 EXIST::FUNCTION:DEPRECATEDIN_1_1_0,SOCK
PKCS7_add_certificate 341 1_1_0 EXIST::FUNCTION:
TS_REQ_get_ext 342 1_1_0 EXIST::FUNCTION:TS
X509_NAME_cmp 343 1_1_0 EXIST::FUNCTION:
@@ -393,7 +393,7 @@ DSO_get_filename 385 1_1_0 EXIST::FUNCTION:
CRYPTO_set_id_callback 386 1_1_0 NOEXIST::FUNCTION:
i2d_ASN1_SEQUENCE_ANY 387 1_1_0 EXIST::FUNCTION:
OPENSSL_strlcpy 388 1_1_0 EXIST::FUNCTION:
-BIO_get_port 389 1_1_0 EXIST::FUNCTION:DEPRECATEDIN_1_1_0
+BIO_get_port 389 1_1_0 EXIST::FUNCTION:DEPRECATEDIN_1_1_0,SOCK
DISPLAYTEXT_free 390 1_1_0 EXIST::FUNCTION:
BN_div 391 1_1_0 EXIST::FUNCTION:
RIPEMD160_Update 392 1_1_0 EXIST::FUNCTION:RMD160
@@ -402,7 +402,7 @@ ASN1_OBJECT_new 394 1_1_0 EXIST::FUNCTION:
EVP_des_ede3_cfb8 395 1_1_0 EXIST::FUNCTION:DES
BIO_dump_indent_fp 396 1_1_0 EXIST::FUNCTION:STDIO
X509_NAME_ENTRY_get_data 397 1_1_0 EXIST::FUNCTION:
-BIO_socket 398 1_1_0 EXIST::FUNCTION:
+BIO_socket 398 1_1_0 EXIST::FUNCTION:SOCK
EVP_PKEY_meth_get_derive 399 1_1_0 EXIST::FUNCTION:
ASN1_STRING_clear_free 400 1_1_0 EXIST::FUNCTION:
d2i_OCSP_REVOKEDINFO 401 1_1_0 EXIST::FUNCTION:
@@ -458,7 +458,7 @@ OCSP_resp_get0 450 1_1_0 EXIST::FUNCTION:
CRYPTO_get_new_lockid 451 1_1_0 NOEXIST::FUNCTION:
RSA_X931_generate_key_ex 452 1_1_0 EXIST::FUNCTION:RSA
X509_get_serialNumber 453 1_1_0 EXIST::FUNCTION:
-BIO_sock_should_retry 454 1_1_0 EXIST::FUNCTION:
+BIO_sock_should_retry 454 1_1_0 EXIST::FUNCTION:SOCK
ENGINE_get_digests 455 1_1_0 EXIST::FUNCTION:ENGINE
TS_MSG_IMPRINT_get_algo 456 1_1_0 EXIST::FUNCTION:TS
DH_new_method 457 1_1_0 EXIST::FUNCTION:DH
@@ -516,7 +516,7 @@ PKCS7_cert_from_signer_info 505 1_1_0 EXIST::FUNCTION:
X509_TRUST_get_trust 506 1_1_0 EXIST::FUNCTION:
DES_string_to_key 507 1_1_0 EXIST::FUNCTION:DES
ERR_error_string 508 1_1_0 EXIST::FUNCTION:
-BIO_new_connect 509 1_1_0 EXIST::FUNCTION:
+BIO_new_connect 509 1_1_0 EXIST::FUNCTION:SOCK
CRYPTO_get_lock_name 510 1_1_0 NOEXIST::FUNCTION:
DSA_new_method 511 1_1_0 EXIST::FUNCTION:DSA
OCSP_CERTID_new 512 1_1_0 EXIST::FUNCTION:
@@ -547,7 +547,7 @@ EC_KEY_get_flags 536 1_1_0 EXIST::FUNCTION:EC
ASN1_TYPE_cmp 537 1_1_0 EXIST::FUNCTION:
i2d_RSAPublicKey 538 1_1_0 EXIST::FUNCTION:RSA
EC_GROUP_get_trinomial_basis 539 1_1_0 EXIST::FUNCTION:EC,EC2M
-BIO_ADDRINFO_protocol 540 1_1_0 EXIST::FUNCTION:
+BIO_ADDRINFO_protocol 540 1_1_0 EXIST::FUNCTION:SOCK
i2d_PBKDF2PARAM 541 1_1_0 EXIST::FUNCTION:
ENGINE_unregister_RAND 542 1_1_0 EXIST::FUNCTION:ENGINE
PEM_write_bio_RSAPrivateKey 543 1_1_0 EXIST::FUNCTION:RSA
@@ -787,7 +787,7 @@ BIO_fd_should_retry 768 1_1_0 EXIST::FUNCTION:
ASN1_STRING_new 769 1_1_0 EXIST::FUNCTION:
ENGINE_init 770 1_1_0 EXIST::FUNCTION:ENGINE
TS_RESP_CTX_add_flags 771 1_1_0 EXIST::FUNCTION:TS
-BIO_gethostbyname 772 1_1_0 EXIST::FUNCTION:DEPRECATEDIN_1_1_0
+BIO_gethostbyname 772 1_1_0 EXIST::FUNCTION:DEPRECATEDIN_1_1_0,SOCK
X509V3_EXT_add 773 1_1_0 EXIST::FUNCTION:
UI_add_verify_string 774 1_1_0 EXIST::FUNCTION:
EVP_rc5_32_12_16_cfb64 775 1_1_0 EXIST::FUNCTION:RC5
@@ -842,10 +842,10 @@ TS_REQ_delete_ext 823 1_1_0 EXIST::FUNCTION:TS
PKCS7_DIGEST_free 824 1_1_0 EXIST::FUNCTION:
OBJ_nid2ln 825 1_1_0 EXIST::FUNCTION:
COMP_CTX_new 826 1_1_0 EXIST::FUNCTION:COMP
-BIO_ADDR_family 827 1_1_0 EXIST::FUNCTION:
+BIO_ADDR_family 827 1_1_0 EXIST::FUNCTION:SOCK
OCSP_RESPONSE_it 828 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
OCSP_RESPONSE_it 828 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-BIO_ADDRINFO_socktype 829 1_1_0 EXIST::FUNCTION:
+BIO_ADDRINFO_socktype 829 1_1_0 EXIST::FUNCTION:SOCK
d2i_X509_REQ_bio 830 1_1_0 EXIST::FUNCTION:
EVP_PBE_cleanup 831 1_1_0 EXIST::FUNCTION:
X509_STORE_CTX_get0_current_crl 832 1_1_0 EXIST::FUNCTION:
@@ -886,7 +886,7 @@ OCSP_BASICRESP_it 864 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:F
X509_VERIFY_PARAM_get0_name 865 1_1_0 EXIST::FUNCTION:
TS_RESP_CTX_set_signer_digest 866 1_1_0 EXIST::FUNCTION:TS
X509_VERIFY_PARAM_set1_email 867 1_1_0 EXIST::FUNCTION:
-BIO_sock_error 868 1_1_0 EXIST::FUNCTION:
+BIO_sock_error 868 1_1_0 EXIST::FUNCTION:SOCK
RSA_set_default_method 869 1_1_0 EXIST::FUNCTION:RSA
BN_GF2m_mod_sqrt_arr 870 1_1_0 EXIST::FUNCTION:EC2M
X509_get0_extensions 871 1_1_0 EXIST::FUNCTION:
@@ -977,7 +977,7 @@ ASN1_PRINTABLE_it 951 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:F
EVP_VerifyFinal 952 1_1_0 EXIST::FUNCTION:
TS_ASN1_INTEGER_print_bio 953 1_1_0 EXIST::FUNCTION:TS
X509_NAME_ENTRY_set_object 954 1_1_0 EXIST::FUNCTION:
-BIO_s_socket 955 1_1_0 EXIST::FUNCTION:
+BIO_s_socket 955 1_1_0 EXIST::FUNCTION:SOCK
EVP_rc5_32_12_16_ecb 956 1_1_0 EXIST::FUNCTION:RC5
i2d_PKCS8_bio 957 1_1_0 EXIST::FUNCTION:
v2i_ASN1_BIT_STRING 958 1_1_0 EXIST::FUNCTION:
@@ -1211,7 +1211,7 @@ SHA256 1175 1_1_0 EXIST::FUNCTION:
X509_LOOKUP_hash_dir 1176 1_1_0 EXIST::FUNCTION:
ASN1_BIT_STRING_check 1177 1_1_0 EXIST::FUNCTION:
ENGINE_set_default_RAND 1178 1_1_0 EXIST::FUNCTION:ENGINE
-BIO_connect 1179 1_1_0 EXIST::FUNCTION:
+BIO_connect 1179 1_1_0 EXIST::FUNCTION:SOCK
TS_TST_INFO_add_ext 1180 1_1_0 EXIST::FUNCTION:TS
EVP_aes_192_ccm 1181 1_1_0 EXIST::FUNCTION:
X509V3_add_value 1182 1_1_0 EXIST::FUNCTION:
@@ -1427,7 +1427,7 @@ i2d_PKCS12_BAGS 1383 1_1_0 EXIST::FUNCTION:
RSA_memory_lock 1384 1_1_0 EXIST::FUNCTION:RSA
CERTIFICATEPOLICIES_free 1385 1_1_0 EXIST::FUNCTION:
X509V3_get_section 1386 1_1_0 EXIST::FUNCTION:
-BIO_parse_hostserv 1387 1_1_0 EXIST::FUNCTION:
+BIO_parse_hostserv 1387 1_1_0 EXIST::FUNCTION:SOCK
EVP_PKEY_meth_set_cleanup 1388 1_1_0 EXIST::FUNCTION:
PROXY_CERT_INFO_EXTENSION_free 1389 1_1_0 EXIST::FUNCTION:
X509_dup 1390 1_1_0 EXIST::FUNCTION:
@@ -1500,7 +1500,7 @@ BIO_new_dgram 1454 1_1_0 EXIST::FUNCTION:DGRAM
CMS_RecipientInfo_kari_get0_reks 1455 1_1_0 EXIST::FUNCTION:CMS
BASIC_CONSTRAINTS_new 1456 1_1_0 EXIST::FUNCTION:
PEM_read_bio_X509_REQ 1457 1_1_0 EXIST::FUNCTION:
-BIO_sock_init 1458 1_1_0 EXIST::FUNCTION:
+BIO_sock_init 1458 1_1_0 EXIST::FUNCTION:SOCK
BN_nist_mod_192 1459 1_1_0 EXIST::FUNCTION:
i2d_PKCS7_ISSUER_AND_SERIAL 1460 1_1_0 EXIST::FUNCTION:
X509V3_EXT_nconf 1461 1_1_0 EXIST::FUNCTION:
@@ -1526,7 +1526,7 @@ BN_MONT_CTX_free 1480 1_1_0 EXIST::FUNCTION:
BN_GF2m_mod_solve_quad_arr 1481 1_1_0 EXIST::FUNCTION:EC2M
UI_add_input_string 1482 1_1_0 EXIST::FUNCTION:
TS_TST_INFO_get_version 1483 1_1_0 EXIST::FUNCTION:TS
-BIO_accept_ex 1484 1_1_0 EXIST::FUNCTION:
+BIO_accept_ex 1484 1_1_0 EXIST::FUNCTION:SOCK
CRYPTO_get_mem_functions 1485 1_1_0 EXIST::FUNCTION:
PEM_read_bio 1486 1_1_0 EXIST::FUNCTION:
OCSP_BASICRESP_get_ext_by_critical 1487 1_1_0 EXIST::FUNCTION:
@@ -1541,7 +1541,7 @@ i2d_TS_REQ_bio 1494 1_1_0 EXIST::FUNCTION:TS
EVP_PKEY_CTX_get_operation 1495 1_1_0 EXIST::FUNCTION:
EVP_MD_meth_set_ctrl 1496 1_1_0 EXIST::FUNCTION:
X509_EXTENSION_set_critical 1497 1_1_0 EXIST::FUNCTION:
-BIO_ADDR_clear 1498 1_1_0 EXIST::FUNCTION:
+BIO_ADDR_clear 1498 1_1_0 EXIST::FUNCTION:SOCK
ENGINE_get_DSA 1499 1_1_0 EXIST::FUNCTION:ENGINE
ASYNC_get_wait_ctx 1500 1_1_0 EXIST::FUNCTION:
ENGINE_set_load_privkey_function 1501 1_1_0 EXIST::FUNCTION:ENGINE
@@ -1596,7 +1596,7 @@ X509_PUBKEY_get 1549 1_1_0 EXIST::FUNCTION:
EC_KEY_free 1550 1_1_0 EXIST::FUNCTION:EC
BIO_read 1551 1_1_0 EXIST::FUNCTION:
EVP_PKEY_get_attr_by_NID 1552 1_1_0 EXIST::FUNCTION:
-BIO_get_accept_socket 1553 1_1_0 EXIST::FUNCTION:DEPRECATEDIN_1_1_0
+BIO_get_accept_socket 1553 1_1_0 EXIST::FUNCTION:DEPRECATEDIN_1_1_0,SOCK
CMS_SignerInfo_sign 1554 1_1_0 EXIST::FUNCTION:CMS
ASN1_item_i2d_bio 1555 1_1_0 EXIST::FUNCTION:
EVP_CIPHER_CTX_block_size 1556 1_1_0 EXIST::FUNCTION:
@@ -1657,7 +1657,7 @@ X509_get0_pubkey_bitstr 1609 1_1_0 EXIST::FUNCTION:
ENGINE_register_all_RAND 1610 1_1_0 EXIST::FUNCTION:ENGINE
BN_BLINDING_thread_id 1611 1_1_0 NOEXIST::FUNCTION:
EVP_MD_meth_get_result_size 1612 1_1_0 EXIST::FUNCTION:
-BIO_ADDRINFO_address 1613 1_1_0 EXIST::FUNCTION:
+BIO_ADDRINFO_address 1613 1_1_0 EXIST::FUNCTION:SOCK
ASN1_STRING_print_ex 1614 1_1_0 EXIST::FUNCTION:
i2d_CMS_ReceiptRequest 1615 1_1_0 EXIST::FUNCTION:CMS
d2i_TS_REQ_fp 1616 1_1_0 EXIST::FUNCTION:STDIO,TS
@@ -1868,7 +1868,7 @@ X509v3_addr_get_range 1814 1_1_0 EXIST::FUNCTION:RFC3779
X509_EXTENSION_get_data 1815 1_1_0 EXIST::FUNCTION:
RC5_32_encrypt 1816 1_1_0 EXIST::FUNCTION:RC5
DIST_POINT_set_dpname 1817 1_1_0 EXIST::FUNCTION:
-BIO_sock_info 1818 1_1_0 EXIST::FUNCTION:
+BIO_sock_info 1818 1_1_0 EXIST::FUNCTION:SOCK
OPENSSL_hexstr2buf 1819 1_1_0 EXIST::FUNCTION:
EVP_add_cipher 1820 1_1_0 EXIST::FUNCTION:
X509V3_EXT_add_list 1821 1_1_0 EXIST::FUNCTION:
@@ -1931,7 +1931,7 @@ CRYPTO_dup_ex_data 1872 1_1_0 EXIST::FUNCTION:
OCSP_single_get0_status 1873 1_1_0 EXIST::FUNCTION:
d2i_AUTHORITY_INFO_ACCESS 1874 1_1_0 EXIST::FUNCTION:
PEM_read_RSAPrivateKey 1875 1_1_0 EXIST::FUNCTION:RSA
-BIO_closesocket 1876 1_1_0 EXIST::FUNCTION:
+BIO_closesocket 1876 1_1_0 EXIST::FUNCTION:SOCK
RSA_verify_ASN1_OCTET_STRING 1877 1_1_0 EXIST::FUNCTION:RSA
SCT_set_log_entry_type 1878 1_1_0 EXIST::FUNCTION:CT
BN_new 1879 1_1_0 EXIST::FUNCTION:
@@ -1942,7 +1942,7 @@ OCSP_REQUEST_print 1883 1_1_0 EXIST::FUNCTION:
CMS_add1_crl 1884 1_1_0 EXIST::FUNCTION:CMS
d2i_EDIPARTYNAME 1885 1_1_0 EXIST::FUNCTION:
X509_STORE_CTX_set0_trusted_stack 1886 1_1_0 EXIST::FUNCTION:
-BIO_ADDR_service_string 1887 1_1_0 EXIST::FUNCTION:
+BIO_ADDR_service_string 1887 1_1_0 EXIST::FUNCTION:SOCK
ASN1_BOOLEAN_it 1888 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
ASN1_BOOLEAN_it 1888 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
TS_RESP_CTX_set_time_cb 1889 1_1_0 EXIST::FUNCTION:TS
@@ -2444,7 +2444,7 @@ DH_check 2367 1_1_0 EXIST::FUNCTION:DH
Camellia_set_key 2368 1_1_0 EXIST::FUNCTION:CAMELLIA
X509_LOOKUP_by_issuer_serial 2369 1_1_0 EXIST::FUNCTION:
ASN1_BMPSTRING_free 2370 1_1_0 EXIST::FUNCTION:
-BIO_new_accept 2371 1_1_0 EXIST::FUNCTION:
+BIO_new_accept 2371 1_1_0 EXIST::FUNCTION:SOCK
GENERAL_NAME_new 2372 1_1_0 EXIST::FUNCTION:
DES_encrypt3 2373 1_1_0 EXIST::FUNCTION:DES
PKCS7_get_signer_info 2374 1_1_0 EXIST::FUNCTION:
@@ -2455,7 +2455,7 @@ ASN1_UTF8STRING_it 2377 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:
ASN1_SCTX_set_app_data 2378 1_1_0 EXIST::FUNCTION:
CMS_add0_cert 2379 1_1_0 EXIST::FUNCTION:CMS
i2d_GENERAL_NAME 2380 1_1_0 EXIST::FUNCTION:
-BIO_ADDR_new 2381 1_1_0 EXIST::FUNCTION:
+BIO_ADDR_new 2381 1_1_0 EXIST::FUNCTION:SOCK
ENGINE_get_pkey_asn1_meth_engine 2382 1_1_0 EXIST::FUNCTION:ENGINE
d2i_ASN1_BMPSTRING 2383 1_1_0 EXIST::FUNCTION:
PKCS12_SAFEBAG_create0_p8inf 2384 1_1_0 EXIST::FUNCTION:
@@ -2959,7 +2959,7 @@ TS_MSG_IMPRINT_get_msg 2859 1_1_0 EXIST::FUNCTION:TS
PKCS8_add_keyusage 2860 1_1_0 EXIST::FUNCTION:
X509_EXTENSION_dup 2861 1_1_0 EXIST::FUNCTION:
EVP_PKEY_asn1_new 2862 1_1_0 EXIST::FUNCTION:
-BIO_socket_nbio 2863 1_1_0 EXIST::FUNCTION:
+BIO_socket_nbio 2863 1_1_0 EXIST::FUNCTION:SOCK
EVP_CIPHER_set_asn1_iv 2864 1_1_0 EXIST::FUNCTION:
EC_GFp_nistp224_method 2865 1_1_0 EXIST:!WIN32:FUNCTION:EC,EC_NISTP_64_GCC_128
BN_swap 2866 1_1_0 EXIST::FUNCTION:
@@ -2983,8 +2983,8 @@ DES_crypt 2882 1_1_0 EXIST::FUNCTION:DES
BN_BLINDING_create_param 2883 1_1_0 EXIST::FUNCTION:
OCSP_SERVICELOC_free 2884 1_1_0 EXIST::FUNCTION:
DIST_POINT_NAME_free 2885 1_1_0 EXIST::FUNCTION:
-BIO_listen 2886 1_1_0 EXIST::FUNCTION:
-BIO_ADDR_path_string 2887 1_1_0 EXIST::FUNCTION:
+BIO_listen 2886 1_1_0 EXIST::FUNCTION:SOCK
+BIO_ADDR_path_string 2887 1_1_0 EXIST::FUNCTION:SOCK
POLICY_CONSTRAINTS_it 2888 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
POLICY_CONSTRAINTS_it 2888 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
NCONF_free_data 2889 1_1_0 EXIST::FUNCTION:
@@ -3140,7 +3140,7 @@ PKCS7_it 3034 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION
PKCS7_it 3034 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
CMS_unsigned_get_attr_by_OBJ 3035 1_1_0 EXIST::FUNCTION:CMS
BN_clear 3036 1_1_0 EXIST::FUNCTION:
-BIO_socket_ioctl 3037 1_1_0 EXIST::FUNCTION:
+BIO_socket_ioctl 3037 1_1_0 EXIST::FUNCTION:SOCK
GENERAL_NAME_cmp 3038 1_1_0 EXIST::FUNCTION:
X509_STORE_CTX_set_purpose 3039 1_1_0 EXIST::FUNCTION:
X509_REVOKED_get_ext_d2i 3040 1_1_0 EXIST::FUNCTION:
@@ -3202,12 +3202,12 @@ d2i_ECPrivateKey_bio 3094 1_1_0 EXIST::FUNCTION:EC
BIO_s_secmem 3095 1_1_0 EXIST::FUNCTION:
ENGINE_get_default_EC 3096 1_1_0 EXIST::FUNCTION:ENGINE
TS_RESP_create_response 3097 1_1_0 EXIST::FUNCTION:TS
-BIO_ADDR_rawaddress 3098 1_1_0 EXIST::FUNCTION:
+BIO_ADDR_rawaddress 3098 1_1_0 EXIST::FUNCTION:SOCK
PKCS7_ENCRYPT_new 3099 1_1_0 EXIST::FUNCTION:
i2d_PKCS8PrivateKey_fp 3100 1_1_0 EXIST::FUNCTION:STDIO
SRP_user_pwd_free 3101 1_1_0 EXIST::FUNCTION:SRP
Camellia_encrypt 3102 1_1_0 EXIST::FUNCTION:CAMELLIA
-BIO_ADDR_hostname_string 3103 1_1_0 EXIST::FUNCTION:
+BIO_ADDR_hostname_string 3103 1_1_0 EXIST::FUNCTION:SOCK
USERNOTICE_new 3104 1_1_0 EXIST::FUNCTION:
POLICY_MAPPING_new 3105 1_1_0 EXIST::FUNCTION:
CRYPTO_gcm128_release 3106 1_1_0 EXIST::FUNCTION:
@@ -3378,7 +3378,7 @@ CMS_RecipientInfo_decrypt 3268 1_1_0 EXIST::FUNCTION:CMS
RSA_generate_key 3269 1_1_0 EXIST::FUNCTION:DEPRECATEDIN_0_9_8,RSA
PKCS7_set0_type_other 3270 1_1_0 EXIST::FUNCTION:
OCSP_REQUEST_new 3271 1_1_0 EXIST::FUNCTION:
-BIO_lookup 3272 1_1_0 EXIST::FUNCTION:
+BIO_lookup 3272 1_1_0 EXIST::FUNCTION:SOCK
EC_GROUP_get0_cofactor 3273 1_1_0 EXIST::FUNCTION:EC
CRYPTO_THREADID_set_numeric 3274 1_1_0 NOEXIST::FUNCTION:
SCT_print 3275 1_1_0 EXIST::FUNCTION:CT
@@ -3548,7 +3548,7 @@ UI_method_get_writer 3434 1_1_0 EXIST::FUNCTION:
BN_secure_new 3435 1_1_0 EXIST::FUNCTION:
CTLOG_new_null 3436 1_1_0 EXIST::FUNCTION:CT
SHA1_Update 3437 1_1_0 EXIST::FUNCTION:
-BIO_s_connect 3438 1_1_0 EXIST::FUNCTION:
+BIO_s_connect 3438 1_1_0 EXIST::FUNCTION:SOCK
EVP_MD_meth_get_init 3439 1_1_0 EXIST::FUNCTION:
ASN1_BIT_STRING_free 3440 1_1_0 EXIST::FUNCTION:
i2d_PROXY_CERT_INFO_EXTENSION 3441 1_1_0 EXIST::FUNCTION:
@@ -3613,7 +3613,7 @@ BIO_ptr_ctrl 3499 1_1_0 EXIST::FUNCTION:
EVP_rc4_hmac_md5 3500 1_1_0 EXIST::FUNCTION:MD5,RC4
OPENSSL_strlcat 3501 1_1_0 EXIST::FUNCTION:
X509_VERIFY_PARAM_new 3502 1_1_0 EXIST::FUNCTION:
-BIO_ADDR_rawport 3503 1_1_0 EXIST::FUNCTION:
+BIO_ADDR_rawport 3503 1_1_0 EXIST::FUNCTION:SOCK
BUF_MEM_grow_clean 3504 1_1_0 EXIST::FUNCTION:
X509_NAME_print_ex_fp 3505 1_1_0 EXIST::FUNCTION:STDIO
X509_check_host 3506 1_1_0 EXIST::FUNCTION:
@@ -3786,7 +3786,7 @@ ESS_CERT_ID_new 3669 1_1_0 EXIST::FUNCTION:TS
EC_POINT_invert 3670 1_1_0 EXIST::FUNCTION:EC
CAST_set_key 3671 1_1_0 EXIST::FUNCTION:CAST
ENGINE_get_pkey_meth 3672 1_1_0 EXIST::FUNCTION:ENGINE
-BIO_ADDRINFO_free 3673 1_1_0 EXIST::FUNCTION:
+BIO_ADDRINFO_free 3673 1_1_0 EXIST::FUNCTION:SOCK
DES_ede3_cbc_encrypt 3674 1_1_0 EXIST::FUNCTION:DES
X509v3_asid_canonize 3675 1_1_0 EXIST::FUNCTION:RFC3779
i2d_ASIdOrRange 3676 1_1_0 EXIST::FUNCTION:RFC3779
@@ -3796,7 +3796,7 @@ ASN1_verify 3679 1_1_0 EXIST::FUNCTION:
DSA_generate_parameters_ex 3680 1_1_0 EXIST::FUNCTION:DSA
X509_sign 3681 1_1_0 EXIST::FUNCTION:
SHA256_Transform 3682 1_1_0 EXIST::FUNCTION:
-BIO_ADDR_free 3683 1_1_0 EXIST::FUNCTION:
+BIO_ADDR_free 3683 1_1_0 EXIST::FUNCTION:SOCK
ASN1_STRING_free 3684 1_1_0 EXIST::FUNCTION:
X509_VERIFY_PARAM_inherit 3685 1_1_0 EXIST::FUNCTION:
EC_GROUP_get_curve_name 3686 1_1_0 EXIST::FUNCTION:EC
@@ -3819,7 +3819,7 @@ OCSP_CRLID_it 3702 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION
OCSP_CRLID_it 3702 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
PEM_ASN1_write_bio 3703 1_1_0 EXIST::FUNCTION:
X509_get0_reject_objects 3704 1_1_0 EXIST::FUNCTION:
-BIO_set_tcp_ndelay 3705 1_1_0 EXIST::FUNCTION:
+BIO_set_tcp_ndelay 3705 1_1_0 EXIST::FUNCTION:SOCK
CMS_add0_CertificateChoices 3706 1_1_0 EXIST::FUNCTION:CMS
POLICYINFO_new 3707 1_1_0 EXIST::FUNCTION:
X509_CRL_get0_by_serial 3708 1_1_0 EXIST::FUNCTION:
@@ -3881,7 +3881,7 @@ ECDH_compute_key 3762 1_1_0 EXIST::FUNCTION:EC
ASN1_TIME_print 3763 1_1_0 EXIST::FUNCTION:
EVP_PKEY_CTX_get0_peerkey 3764 1_1_0 EXIST::FUNCTION:
BN_mod_lshift1 3765 1_1_0 EXIST::FUNCTION:
-BIO_ADDRINFO_family 3766 1_1_0 EXIST::FUNCTION:
+BIO_ADDRINFO_family 3766 1_1_0 EXIST::FUNCTION:SOCK
PEM_write_DHxparams 3767 1_1_0 EXIST::FUNCTION:DH
BN_mod_exp2_mont 3768 1_1_0 EXIST::FUNCTION:
ASN1_PRINTABLE_free 3769 1_1_0 EXIST::FUNCTION:
@@ -3891,7 +3891,7 @@ PKCS7_ATTR_SIGN_it 3771 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:
EVP_MD_CTX_copy 3772 1_1_0 EXIST::FUNCTION:
ENGINE_set_ctrl_function 3773 1_1_0 EXIST::FUNCTION:ENGINE
OCSP_id_get0_info 3774 1_1_0 EXIST::FUNCTION:
-BIO_ADDRINFO_next 3775 1_1_0 EXIST::FUNCTION:
+BIO_ADDRINFO_next 3775 1_1_0 EXIST::FUNCTION:SOCK
OCSP_RESPBYTES_free 3776 1_1_0 EXIST::FUNCTION:
EC_KEY_METHOD_set_init 3777 1_1_0 EXIST::FUNCTION:EC
EVP_PKEY_asn1_copy 3778 1_1_0 EXIST::FUNCTION: