12 files changed, 3 insertions, 49 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)
         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;
 
diff --git a/src/lib/libcrypto/bio/bss_bio.c b/src/lib/libcrypto/bio/bss_bio.c
index 27faaa211c..d31e59872e 100644
--- a/src/lib/libcrypto/bio/bss_bio.c
+++ b/src/lib/libcrypto/bio/bss_bio.c
@@ -83,8 +83,6 @@
 #include <openssl/err.h>
 #include <openssl/crypto.h>
 
-#include "e_os.h"
-
 static int bio_new(BIO *bio);
 static int bio_free(BIO *bio);
 static int bio_read(BIO *bio, char *buf, int size);
diff --git a/src/lib/libcrypto/bio/bss_dgram.c b/src/lib/libcrypto/bio/bss_dgram.c
index e950528a42..79a6c2aa67 100644
--- a/src/lib/libcrypto/bio/bss_dgram.c
+++ b/src/lib/libcrypto/bio/bss_dgram.c
@@ -147,9 +147,7 @@ typedef struct bio_dgram_data_st {
         union {
                 struct sockaddr sa;
                 struct sockaddr_in sa_in;
-#if OPENSSL_USE_IPV6
                 struct sockaddr_in6 sa_in6;
-#endif
         } peer;
         unsigned int connected;
         unsigned int _errno;
@@ -169,9 +167,7 @@ typedef struct bio_dgram_sctp_data_st {
         union {
                 struct sockaddr sa;
                 struct sockaddr_in sa_in;
-#if OPENSSL_USE_IPV6
                 struct sockaddr_in6 sa_in6;
-#endif
         } peer;
         unsigned int connected;
         unsigned int _errno;
@@ -346,9 +342,7 @@ dgram_read(BIO *b, char *out, int outl)
                 union   {
                         struct sockaddr sa;
                         struct sockaddr_in sa_in;
-#if OPENSSL_USE_IPV6
                         struct sockaddr_in6 sa_in6;
-#endif
                 } peer;
         } sa;
 
@@ -395,10 +389,8 @@ dgram_write(BIO *b, const char *in, int inl)
 
                 if (data->peer.sa.sa_family == AF_INET)
                         peerlen = sizeof(data->peer.sa_in);
-#if OPENSSL_USE_IPV6
                 else if (data->peer.sa.sa_family == AF_INET6)
                         peerlen = sizeof(data->peer.sa_in6);
-#endif
                 ret = sendto(b->num, in, inl, 0, &data->peer.sa, peerlen);
         }
 
@@ -432,9 +424,7 @@ dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
         union   {
                 struct sockaddr sa;
                 struct sockaddr_in s4;
-#if OPENSSL_USE_IPV6
                 struct sockaddr_in6 s6;
-#endif
         } addr;
 #endif
 
@@ -485,11 +475,9 @@ dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
                 case AF_INET:
                         memcpy(&data->peer, to, sizeof(data->peer.sa_in));
                         break;
-#if OPENSSL_USE_IPV6
                 case AF_INET6:
                         memcpy(&data->peer, to, sizeof(data->peer.sa_in6));
                         break;
-#endif
                 default:
                         memcpy(&data->peer, to, sizeof(data->peer.sa));
                         break;
@@ -512,7 +500,7 @@ dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
                             sizeof(sockopt_val))) < 0)
                                 perror("setsockopt");
                         break;
-#if OPENSSL_USE_IPV6 && defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO)
+#if defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO)
                 case AF_INET6:
                         sockopt_val = IPV6_PMTUDISC_DO;
                         if ((ret = setsockopt(b->num, IPPROTO_IPV6,
@@ -552,7 +540,7 @@ dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
                                 ret = data->mtu;
                         }
                         break;
-#if OPENSSL_USE_IPV6 && defined(IPV6_MTU)
+#if defined(IPV6_MTU)
                 case AF_INET6:
                         if ((ret = getsockopt(b->num, IPPROTO_IPV6, IPV6_MTU,
                             (void *)&sockopt_val, &sockopt_len)) < 0 ||
@@ -580,7 +568,6 @@ default:
                 case AF_INET:
                         ret = 576 - 20 - 8;
                         break;
-#if OPENSSL_USE_IPV6
                 case AF_INET6:
 #ifdef IN6_IS_ADDR_V4MAPPED
                         if (IN6_IS_ADDR_V4MAPPED(&data->peer.sa_in6.sin6_addr))
@@ -589,7 +576,6 @@ default:
 #endif
                                 ret = 1280 - 40 - 8;
                         break;
-#endif
                 default:
                         ret = 576 - 20 - 8;
                         break;
@@ -611,11 +597,9 @@ default:
                         case AF_INET:
                                 memcpy(&data->peer, to, sizeof(data->peer.sa_in));
                                 break;
-#if OPENSSL_USE_IPV6
                         case AF_INET6:
                                 memcpy(&data->peer, to, sizeof(data->peer.sa_in6));
                                 break;
-#endif
                         default:
                                 memcpy(&data->peer, to, sizeof(data->peer.sa));
                                 break;
@@ -630,11 +614,9 @@ default:
                 case AF_INET:
                         ret = sizeof(data->peer.sa_in);
                         break;
-#if OPENSSL_USE_IPV6
                 case AF_INET6:
                         ret = sizeof(data->peer.sa_in6);
                         break;
-#endif
                 default:
                         ret = sizeof(data->peer.sa);
                         break;
@@ -649,11 +631,9 @@ default:
                 case AF_INET:
                         memcpy(&data->peer, to, sizeof(data->peer.sa_in));
                         break;
-#if OPENSSL_USE_IPV6
                 case AF_INET6:
                         memcpy(&data->peer, to, sizeof(data->peer.sa_in6));
                         break;
-#endif
                 default:
                         memcpy(&data->peer, to, sizeof(data->peer.sa));
                         break;
diff --git a/src/lib/libcrypto/cast/cast_lcl.h b/src/lib/libcrypto/cast/cast_lcl.h
index cf0ca9e607..ec14804fbb 100644
--- a/src/lib/libcrypto/cast/cast_lcl.h
+++ b/src/lib/libcrypto/cast/cast_lcl.h
@@ -56,9 +56,6 @@
  * [including the GNU Public Licence.]
  */
 
-
-#include "e_os.h"
-
 #ifdef OPENSSL_SYS_WIN32
 #include <stdlib.h>
 #endif
diff --git a/src/lib/libcrypto/conf/conf_api.c b/src/lib/libcrypto/conf/conf_api.c
index dc6eb579bf..f484000d0c 100644
--- a/src/lib/libcrypto/conf/conf_api.c
+++ b/src/lib/libcrypto/conf/conf_api.c
@@ -68,7 +68,6 @@
 #include <string.h>
 #include <openssl/conf.h>
 #include <openssl/conf_api.h>
-#include "e_os.h"
 
 static void value_free_hash_doall_arg(CONF_VALUE *a,
                                       LHASH_OF(CONF_VALUE) *conf);
diff --git a/src/lib/libcrypto/cryptlib.h b/src/lib/libcrypto/cryptlib.h
index e8ec91f9c1..a785024159 100644
--- a/src/lib/libcrypto/cryptlib.h
+++ b/src/lib/libcrypto/cryptlib.h
@@ -64,8 +64,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "e_os.h"
-
 #include <openssl/crypto.h>
 #include <openssl/buffer.h> 
 #include <openssl/bio.h> 
diff --git a/src/lib/libcrypto/des/cfb64ede.c b/src/lib/libcrypto/des/cfb64ede.c
index de34ecceb9..453b078d30 100644
--- a/src/lib/libcrypto/des/cfb64ede.c
+++ b/src/lib/libcrypto/des/cfb64ede.c
@@ -57,7 +57,6 @@
  */
 
 #include "des_locl.h"
-#include "e_os.h"
 
 /* The input and output encrypted as though 64bit cfb mode is being
  * used.  The extra state information to record how much of the
diff --git a/src/lib/libcrypto/des/cfb_enc.c b/src/lib/libcrypto/des/cfb_enc.c
index 720f29a28e..dd5237a86d 100644
--- a/src/lib/libcrypto/des/cfb_enc.c
+++ b/src/lib/libcrypto/des/cfb_enc.c
@@ -56,7 +56,6 @@
  * [including the GNU Public Licence.]
  */
 
-#include "e_os.h"
 #include "des_locl.h"
 #include <assert.h>
 
diff --git a/src/lib/libcrypto/o_str.c b/src/lib/libcrypto/o_str.c
index a22b6d7d09..6d56673b44 100644
--- a/src/lib/libcrypto/o_str.c
+++ b/src/lib/libcrypto/o_str.c
@@ -3,7 +3,6 @@
  */
 
 #include <ctype.h>
-#include <e_os.h>
 #include <string.h>
 
 int OPENSSL_strcasecmp(const char *str1, const char *str2);
diff --git a/src/lib/libcrypto/ocsp/ocsp_ht.c b/src/lib/libcrypto/ocsp/ocsp_ht.c
index db20759d3b..4bb6fce83c 100644
--- a/src/lib/libcrypto/ocsp/ocsp_ht.c
+++ b/src/lib/libcrypto/ocsp/ocsp_ht.c
@@ -60,7 +60,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
-#include "e_os.h"
 #include <openssl/asn1.h>
 #include <openssl/ocsp.h>
 #include <openssl/err.h>
diff --git a/src/lib/libcrypto/rand/randfile.c b/src/lib/libcrypto/rand/randfile.c
index 23efa17388..2525804668 100644
--- a/src/lib/libcrypto/rand/randfile.c
+++ b/src/lib/libcrypto/rand/randfile.c
@@ -61,7 +61,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "e_os.h"
 #include <openssl/crypto.h>
 #include <openssl/rand.h>
 #include <openssl/buffer.h>
diff --git a/src/lib/libcrypto/rc5/rc5test.c b/src/lib/libcrypto/rc5/rc5test.c
index ce3d0cc16f..1a0260ee1d 100644
--- a/src/lib/libcrypto/rc5/rc5test.c
+++ b/src/lib/libcrypto/rc5/rc5test.c
@@ -63,8 +63,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "../e_os.h"
-
 #ifdef OPENSSL_NO_RC5
 int main(int argc, char *argv[])
 {