summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/bio/b_sock.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/bio/b_sock.c')
-rw-r--r--src/lib/libcrypto/bio/b_sock.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c
index cd8216b7e2..0baece8cdb 100644
--- a/src/lib/libcrypto/bio/b_sock.c
+++ b/src/lib/libcrypto/bio/b_sock.c
@@ -273,9 +273,7 @@ BIO_get_accept_socket(char *host, int bind_mode)
273 union { 273 union {
274 struct sockaddr sa; 274 struct sockaddr sa;
275 struct sockaddr_in sa_in; 275 struct sockaddr_in sa_in;
276#if OPENSSL_USE_IPV6
277 struct sockaddr_in6 sa_in6; 276 struct sockaddr_in6 sa_in6;
278#endif
279 } server, client; 277 } server, client;
280 int s = -1, cs, addrlen; 278 int s = -1, cs, addrlen;
281 unsigned char ip[4]; 279 unsigned char ip[4];
@@ -338,11 +336,7 @@ BIO_get_accept_socket(char *host, int bind_mode)
338 if (strchr(h, ':')) { 336 if (strchr(h, ':')) {
339 if (h[1] == '\0') 337 if (h[1] == '\0')
340 h = NULL; 338 h = NULL;
341#if OPENSSL_USE_IPV6
342 hint.ai_family = AF_INET6; 339 hint.ai_family = AF_INET6;
343#else
344 h = NULL;
345#endif
346 } else if (h[0] == '*' && h[1] == '\0') { 340 } else if (h[0] == '*' && h[1] == '\0') {
347 hint.ai_family = AF_INET; 341 hint.ai_family = AF_INET;
348 h = NULL; 342 h = NULL;
@@ -405,13 +399,10 @@ again:
405 (err_num == EADDRINUSE)) { 399 (err_num == EADDRINUSE)) {
406 client = server; 400 client = server;
407 if (h == NULL || strcmp(h, "*") == 0) { 401 if (h == NULL || strcmp(h, "*") == 0) {
408#if OPENSSL_USE_IPV6
409 if (client.sa.sa_family == AF_INET6) { 402 if (client.sa.sa_family == AF_INET6) {
410 memset(&client.sa_in6.sin6_addr, 0, sizeof(client.sa_in6.sin6_addr)); 403 memset(&client.sa_in6.sin6_addr, 0, sizeof(client.sa_in6.sin6_addr));
411 client.sa_in6.sin6_addr.s6_addr[15] = 1; 404 client.sa_in6.sin6_addr.s6_addr[15] = 1;
412 } else 405 } else if (client.sa.sa_family == AF_INET) {
413#endif
414 if (client.sa.sa_family == AF_INET) {
415 client.sa_in.sin_addr.s_addr = htonl(0x7F000001); 406 client.sa_in.sin_addr.s_addr = htonl(0x7F000001);
416 } else 407 } else
417 goto err; 408 goto err;
@@ -490,9 +481,7 @@ BIO_accept(int sock, char **addr)
490 union { 481 union {
491 struct sockaddr sa; 482 struct sockaddr sa;
492 struct sockaddr_in sa_in; 483 struct sockaddr_in sa_in;
493#if OPENSSL_USE_IPV6
494 struct sockaddr_in6 sa_in6; 484 struct sockaddr_in6 sa_in6;
495#endif
496 } from; 485 } from;
497 } sa; 486 } sa;
498 487