diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-11-23 09:12:47 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-11-25 06:09:23 +0100 |
| commit | 403ef8cea73e9b4924dce39e3706778618507cd6 (patch) | |
| tree | cca7da2d4c51732adc2023916a58d16b1c7e2296 /apps/lib | |
| parent | ee8252847d1ccf39a48ab382971f8f18ac3f4089 (diff) | |
APPS: Guard use of IPv6 functions and constants with a check of AF_INET6
Fixes #13482
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13484)
Diffstat (limited to 'apps/lib')
| -rw-r--r-- | apps/lib/s_socket.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/lib/s_socket.c b/apps/lib/s_socket.c index 890bd39414..65d56c0991 100644 --- a/apps/lib/s_socket.c +++ b/apps/lib/s_socket.c @@ -166,7 +166,9 @@ int init_client(int *sock, const char *host, const char *port, if (*sock == INVALID_SOCKET) { if (bindaddr != NULL && !found) { BIO_printf(bio_err, "Can't bind %saddress for %s%s%s\n", +#ifdef AF_INET6 BIO_ADDRINFO_family(res) == AF_INET6 ? "IPv6 " : +#endif BIO_ADDRINFO_family(res) == AF_INET ? "IPv4 " : BIO_ADDRINFO_family(res) == AF_UNIX ? "unix " : "", bindhost != NULL ? bindhost : "", @@ -243,6 +245,7 @@ int do_server(int *accept_sock, const char *host, const char *port, sock_protocol = BIO_ADDRINFO_protocol(res); sock_address = BIO_ADDRINFO_address(res); next = BIO_ADDRINFO_next(res); +#ifdef AF_INET6 if (sock_family == AF_INET6) sock_options |= BIO_SOCK_V6_ONLY; if (next != NULL @@ -257,6 +260,7 @@ int do_server(int *accept_sock, const char *host, const char *port, sock_options &= ~BIO_SOCK_V6_ONLY; } } +#endif asock = BIO_socket(sock_family, sock_type, sock_protocol, 0); if (asock == INVALID_SOCKET |