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

16 files changed, 6 insertions, 155 deletions

diff --git a/src/lib/libssl/src/apps/apps.h b/src/lib/libssl/src/apps/apps.h
index 9c32447606..077d766a49 100644
--- a/src/lib/libssl/src/apps/apps.h
+++ b/src/lib/libssl/src/apps/apps.h
@@ -112,8 +112,7 @@
 #ifndef HEADER_APPS_H
 #define HEADER_APPS_H
 
-#include "e_os.h"
-
+#include <openssl/e_os2.h>
 #include <openssl/bio.h>
 #include <openssl/x509.h>
 #include <openssl/lhash.h>
@@ -133,9 +132,7 @@ int app_RAND_write_file(const char *file, BIO *bio_e);
  * `bio_e' is for error messages. */
 void app_RAND_allow_write_file(void);
 long app_RAND_load_files(char *file); /* `file' is a list of files to read,
-                                       * separated by LIST_SEPARATOR_CHAR
-                                       * (see e_os.h).  The string is
-                                       * destroyed! */
+                                       * separated by ':'. The string is destroyed! */
 
 extern CONF *config;
 extern char *default_config_file;
diff --git a/src/lib/libssl/src/apps/s_cb.c b/src/lib/libssl/src/apps/s_cb.c
index 1d1a2bd6df..38ea2714a8 100644
--- a/src/lib/libssl/src/apps/s_cb.c
+++ b/src/lib/libssl/src/apps/s_cb.c
@@ -725,9 +725,7 @@ generate_cookie_callback(SSL * ssl, unsigned char *cookie,
         union {
                 struct sockaddr sa;
                 struct sockaddr_in s4;
-#if OPENSSL_USE_IPV6
                 struct sockaddr_in6 s6;
-#endif
         } peer;
 
         /* Initialize a random secret */
@@ -749,12 +747,10 @@ generate_cookie_callback(SSL * ssl, unsigned char *cookie,
                 length += sizeof(struct in_addr);
                 length += sizeof(peer.s4.sin_port);
                 break;
-#if OPENSSL_USE_IPV6
         case AF_INET6:
                 length += sizeof(struct in6_addr);
                 length += sizeof(peer.s6.sin6_port);
                 break;
-#endif
         default:
                 OPENSSL_assert(0);
                 break;
@@ -771,13 +767,11 @@ generate_cookie_callback(SSL * ssl, unsigned char *cookie,
                 memcpy(buffer + sizeof(peer.s4.sin_port),
                     &peer.s4.sin_addr, sizeof(struct in_addr));
                 break;
-#if OPENSSL_USE_IPV6
         case AF_INET6:
                 memcpy(buffer, &peer.s6.sin6_port, sizeof(peer.s6.sin6_port));
                 memcpy(buffer + sizeof(peer.s6.sin6_port),
                     &peer.s6.sin6_addr, sizeof(struct in6_addr));
                 break;
-#endif
         default:
                 OPENSSL_assert(0);
                 break;
@@ -802,9 +796,7 @@ verify_cookie_callback(SSL * ssl, unsigned char *cookie, unsigned int cookie_len
         union {
                 struct sockaddr sa;
                 struct sockaddr_in s4;
-#if OPENSSL_USE_IPV6
                 struct sockaddr_in6 s6;
-#endif
         } peer;
 
         /* If secret isn't initialized yet, the cookie can't be valid */
@@ -821,12 +813,10 @@ verify_cookie_callback(SSL * ssl, unsigned char *cookie, unsigned int cookie_len
                 length += sizeof(struct in_addr);
                 length += sizeof(peer.s4.sin_port);
                 break;
-#if OPENSSL_USE_IPV6
         case AF_INET6:
                 length += sizeof(struct in6_addr);
                 length += sizeof(peer.s6.sin6_port);
                 break;
-#endif
         default:
                 OPENSSL_assert(0);
                 break;
@@ -843,13 +833,11 @@ verify_cookie_callback(SSL * ssl, unsigned char *cookie, unsigned int cookie_len
                 memcpy(buffer + sizeof(peer.s4.sin_port),
                     &peer.s4.sin_addr, sizeof(struct in_addr));
                 break;
-#if OPENSSL_USE_IPV6
         case AF_INET6:
                 memcpy(buffer, &peer.s6.sin6_port, sizeof(peer.s6.sin6_port));
                 memcpy(buffer + sizeof(peer.s6.sin6_port),
                     &peer.s6.sin6_addr, sizeof(struct in6_addr));
                 break;
-#endif
         default:
                 OPENSSL_assert(0);
                 break;
diff --git a/src/lib/libssl/src/apps/s_socket.c b/src/lib/libssl/src/apps/s_socket.c
index f3c66f623a..b801cf7796 100644
--- a/src/lib/libssl/src/apps/s_socket.c
+++ b/src/lib/libssl/src/apps/s_socket.c
@@ -66,11 +66,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#ifdef FLAT_INC
-#include "e_os2.h"
-#else
-#include "../e_os2.h"
-#endif
+#include <openssl/e_os2.h>
 
 #define NON_MAIN
 #include "apps.h"
@@ -78,12 +74,6 @@
 #include "s_apps.h"
 #include <openssl/ssl.h>
 
-#ifdef FLAT_INC
-#include "e_os.h"
-#else
-#include "../e_os.h"
-#endif
-
 #ifndef OPENSSL_NO_SOCK
 
 
diff --git a/src/lib/libssl/src/crypto/bio/b_sock.c b/src/lib/libssl/src/crypto/bio/b_sock.c
index cd8216b7e2..0baece8cdb 100644
--- a/src/lib/libssl/src/crypto/bio/b_sock.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bio/bss_bio.c b/src/lib/libssl/src/crypto/bio/bss_bio.c
index 27faaa211c..d31e59872e 100644
--- a/src/lib/libssl/src/crypto/bio/bss_bio.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/bio/bss_dgram.c b/src/lib/libssl/src/crypto/bio/bss_dgram.c
index e950528a42..79a6c2aa67 100644
--- a/src/lib/libssl/src/crypto/bio/bss_dgram.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/cast/cast_lcl.h b/src/lib/libssl/src/crypto/cast/cast_lcl.h
index cf0ca9e607..ec14804fbb 100644
--- a/src/lib/libssl/src/crypto/cast/cast_lcl.h
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/conf/conf_api.c b/src/lib/libssl/src/crypto/conf/conf_api.c
index dc6eb579bf..f484000d0c 100644
--- a/src/lib/libssl/src/crypto/conf/conf_api.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/cryptlib.h b/src/lib/libssl/src/crypto/cryptlib.h
index e8ec91f9c1..a785024159 100644
--- a/src/lib/libssl/src/crypto/cryptlib.h
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/cfb64ede.c b/src/lib/libssl/src/crypto/des/cfb64ede.c
index de34ecceb9..453b078d30 100644
--- a/src/lib/libssl/src/crypto/des/cfb64ede.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/des/cfb_enc.c b/src/lib/libssl/src/crypto/des/cfb_enc.c
index 720f29a28e..dd5237a86d 100644
--- a/src/lib/libssl/src/crypto/des/cfb_enc.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/o_str.c b/src/lib/libssl/src/crypto/o_str.c
index a22b6d7d09..6d56673b44 100644
--- a/src/lib/libssl/src/crypto/o_str.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/ocsp/ocsp_ht.c b/src/lib/libssl/src/crypto/ocsp/ocsp_ht.c
index db20759d3b..4bb6fce83c 100644
--- a/src/lib/libssl/src/crypto/ocsp/ocsp_ht.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/rand/randfile.c b/src/lib/libssl/src/crypto/rand/randfile.c
index 23efa17388..2525804668 100644
--- a/src/lib/libssl/src/crypto/rand/randfile.c
+++ b/src/lib/libssl/src/crypto/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/libssl/src/crypto/rc5/rc5test.c b/src/lib/libssl/src/crypto/rc5/rc5test.c
index ce3d0cc16f..1a0260ee1d 100644
--- a/src/lib/libssl/src/crypto/rc5/rc5test.c
+++ b/src/lib/libssl/src/crypto/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[])
 {
diff --git a/src/lib/libssl/src/e_os.h b/src/lib/libssl/src/e_os.h
deleted file mode 100644
index 7de4dc09b3..0000000000
--- a/src/lib/libssl/src/e_os.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* e_os.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_E_OS_H
-#define HEADER_E_OS_H
-
-#include <openssl/opensslconf.h>
-
-/*
- * <openssl/e_os2.h> contains what we can justify to make visible
- * to the outside
- * <openssl/e_os2.h> is not exported interface (except to the openssl
- * command)
- */
-
-#include <openssl/e_os2.h>
-
-#define OPENSSL_CONF    "openssl.cnf"
-
-#define OPENSSL_USE_IPV6 1
-
-#endif
-