From 968d1a23726dbca82ac694a508efe8ea37d0a95e Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Wed, 10 Feb 2016 20:54:48 +0100
Subject: [PATCH] Use the protocol we know rather than
BIO_ADDRINFO_protocol(res)
Because some platforms won't will in any value in ai_protocol, there's
no point using it if we already know what it should be.
Reviewed-by: Rich Salz <rsalz@openssl.org>
---
apps/s_socket.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/s_socket.c b/apps/s_socket.c
index e345913b0d..20c662664d 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -179,7 +179,7 @@ int init_client(int *sock, const char *host, const char *port,
&& (type == 0 || type == BIO_ADDRINFO_socktype(res)));
*sock = BIO_socket(BIO_ADDRINFO_family(ai), BIO_ADDRINFO_socktype(ai),
- BIO_ADDRINFO_protocol(ai), 0);
+ protocol, 0);
if (*sock == INVALID_SOCKET) {
/* Maybe the kernel doesn't support the socket family, even if
* BIO_lookup() added it in the returned result...
@@ -257,7 +257,7 @@ int do_server(int *accept_sock, const char *host, const char *port,
&& (type == 0 || type == BIO_ADDRINFO_socktype(res)));
asock = BIO_socket(BIO_ADDRINFO_family(res), BIO_ADDRINFO_socktype(res),
- BIO_ADDRINFO_protocol(res), 0);
+ protocol, 0);
if (asock == INVALID_SOCKET
|| !BIO_listen(asock, BIO_ADDRINFO_address(res), BIO_SOCK_REUSEADDR)) {
BIO_ADDRINFO_free(res);
--
2.40.0