From cb65c83cbaccdc052f92a2a48ed9ee74de03d063 Mon Sep 17 00:00:00 2001 From: deraadt <> Date: Fri, 18 Apr 2014 14:37:41 +0000 Subject: Put the final pieces from e_os.h in the required places, and remove it. "dance on it's grave" says beck ok guenther beck --- src/lib/libcrypto/bio/b_sock.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'src/lib/libcrypto/bio/b_sock.c') 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) union { struct sockaddr sa; struct sockaddr_in sa_in; -#if OPENSSL_USE_IPV6 struct sockaddr_in6 sa_in6; -#endif } server, client; int s = -1, cs, addrlen; unsigned char ip[4]; @@ -338,11 +336,7 @@ BIO_get_accept_socket(char *host, int bind_mode) if (strchr(h, ':')) { if (h[1] == '\0') h = NULL; -#if OPENSSL_USE_IPV6 hint.ai_family = AF_INET6; -#else - h = NULL; -#endif } else if (h[0] == '*' && h[1] == '\0') { hint.ai_family = AF_INET; h = NULL; @@ -405,13 +399,10 @@ again: (err_num == EADDRINUSE)) { client = server; if (h == NULL || strcmp(h, "*") == 0) { -#if OPENSSL_USE_IPV6 if (client.sa.sa_family == AF_INET6) { memset(&client.sa_in6.sin6_addr, 0, sizeof(client.sa_in6.sin6_addr)); client.sa_in6.sin6_addr.s6_addr[15] = 1; - } else -#endif - if (client.sa.sa_family == AF_INET) { + } else if (client.sa.sa_family == AF_INET) { client.sa_in.sin_addr.s_addr = htonl(0x7F000001); } else goto err; @@ -490,9 +481,7 @@ BIO_accept(int sock, char **addr) union { struct sockaddr sa; struct sockaddr_in sa_in; -#if OPENSSL_USE_IPV6 struct sockaddr_in6 sa_in6; -#endif } from; } sa; -- cgit v1.2.3-55-g6feb