diff options
| author |   jsing <jsing@openbsd.org> | 2014-05-02 17:05:41 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-05-02 17:05:41 +0000 |
| commit | 640e48e745e125bb63038bf3a9da5e271f23a6e4 (patch) | |
| tree | 4925d0cf42d28159b29ec32237162317ed19196f /lib/libssl/src/apps | |
| parent | Sort and group includes. We also do not need to include openssl/evp.h more (diff) | |
| download | wireguard-openbsd-640e48e745e125bb63038bf3a9da5e271f23a6e4.tar.xz wireguard-openbsd-640e48e745e125bb63038bf3a9da5e271f23a6e4.zip | |
Nuke OPENSSL_NO_SOCK since any half sane operating system has sockets.
ok beck@
Diffstat (limited to 'lib/libssl/src/apps')
| -rw-r--r-- | lib/libssl/src/apps/ocsp.c | 9 | ||||
| -rw-r--r-- | lib/libssl/src/apps/progs.h | 8 | ||||
| -rw-r--r-- | lib/libssl/src/apps/s_socket.c | 2 |
3 files changed, 0 insertions, 19 deletions
diff --git a/lib/libssl/src/apps/ocsp.c b/lib/libssl/src/apps/ocsp.c index 5b296a96b71..461f21d6eb8 100644 --- a/lib/libssl/src/apps/ocsp.c +++ b/lib/libssl/src/apps/ocsp.c @@ -627,15 +627,10 @@ redo_accept: if (cbio) send_ocsp_response(cbio, resp); } else if (host) { -#ifndef OPENSSL_NO_SOCK resp = process_responder(bio_err, req, host, path, port, use_ssl, headers, req_timeout); if (!resp) goto end; -#else - BIO_printf(bio_err, "Error creating connect BIO - sockets not supported.\n"); - goto end; -#endif } else if (respin) { derbio = BIO_new_file(respin, "rb"); if (!derbio) { @@ -1019,11 +1014,7 @@ init_responder(char *port) bufbio = BIO_new(BIO_f_buffer()); if (!bufbio) goto err; -#ifndef OPENSSL_NO_SOCK acbio = BIO_new_accept(port); -#else - BIO_printf(bio_err, "Error setting up accept BIO - sockets not supported.\n"); -#endif if (!acbio) goto err; BIO_set_accept_bios(acbio, bufbio); diff --git a/lib/libssl/src/apps/progs.h b/lib/libssl/src/apps/progs.h index cbed562a4a0..59a7b787126 100644 --- a/lib/libssl/src/apps/progs.h +++ b/lib/libssl/src/apps/progs.h @@ -66,9 +66,7 @@ FUNCTION functions[] = { /* General functions. */ { FUNC_TYPE_GENERAL, "asn1parse", asn1parse_main }, { FUNC_TYPE_GENERAL, "ca", ca_main }, -#if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_SSL3) { FUNC_TYPE_GENERAL, "ciphers", ciphers_main }, -#endif #ifndef OPENSSL_NO_CMS { FUNC_TYPE_GENERAL, "cms", cms_main }, #endif @@ -97,15 +95,9 @@ FUNCTION functions[] = { { FUNC_TYPE_GENERAL, "prime", prime_main }, { FUNC_TYPE_GENERAL, "rand", rand_main }, { FUNC_TYPE_GENERAL, "req", req_main }, -#if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_SSL3) { FUNC_TYPE_GENERAL, "s_client", s_client_main }, -#endif -#if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_SSL3) { FUNC_TYPE_GENERAL, "s_server", s_server_main }, -#endif -#if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_SSL3) { FUNC_TYPE_GENERAL, "s_time", s_time_main }, -#endif { FUNC_TYPE_GENERAL, "sess_id", sess_id_main }, { FUNC_TYPE_GENERAL, "smime", smime_main }, #ifndef OPENSSL_NO_SPEED diff --git a/lib/libssl/src/apps/s_socket.c b/lib/libssl/src/apps/s_socket.c index a7336d60dcd..919ab40cd5b 100644 --- a/lib/libssl/src/apps/s_socket.c +++ b/lib/libssl/src/apps/s_socket.c @@ -72,7 +72,6 @@ #include "s_apps.h" #include <openssl/ssl.h> -#ifndef OPENSSL_NO_SOCK static int ssl_sock_init(void); @@ -348,4 +347,3 @@ extract_port(char *str, short *port_ptr) } return (1); } -#endif |