summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/lib/libcrypto/bio/b_sock.c13
-rw-r--r--src/lib/libcrypto/bio/bss_bio.c2
-rw-r--r--src/lib/libcrypto/bio/bss_dgram.c24
-rw-r--r--src/lib/libcrypto/cast/cast_lcl.h3
-rw-r--r--src/lib/libcrypto/conf/conf_api.c1
-rw-r--r--src/lib/libcrypto/cryptlib.h2
-rw-r--r--src/lib/libcrypto/des/cfb64ede.c1
-rw-r--r--src/lib/libcrypto/des/cfb_enc.c1
-rw-r--r--src/lib/libcrypto/o_str.c1
-rw-r--r--src/lib/libcrypto/ocsp/ocsp_ht.c1
-rw-r--r--src/lib/libcrypto/rand/randfile.c1
-rw-r--r--src/lib/libcrypto/rc5/rc5test.c2
-rw-r--r--src/lib/libssl/src/apps/apps.h7
-rw-r--r--src/lib/libssl/src/apps/s_cb.c12
-rw-r--r--src/lib/libssl/src/apps/s_socket.c12
-rw-r--r--src/lib/libssl/src/crypto/bio/b_sock.c13
-rw-r--r--src/lib/libssl/src/crypto/bio/bss_bio.c2
-rw-r--r--src/lib/libssl/src/crypto/bio/bss_dgram.c24
-rw-r--r--src/lib/libssl/src/crypto/cast/cast_lcl.h3
-rw-r--r--src/lib/libssl/src/crypto/conf/conf_api.c1
-rw-r--r--src/lib/libssl/src/crypto/cryptlib.h2
-rw-r--r--src/lib/libssl/src/crypto/des/cfb64ede.c1
-rw-r--r--src/lib/libssl/src/crypto/des/cfb_enc.c1
-rw-r--r--src/lib/libssl/src/crypto/o_str.c1
-rw-r--r--src/lib/libssl/src/crypto/ocsp/ocsp_ht.c1
-rw-r--r--src/lib/libssl/src/crypto/rand/randfile.c1
-rw-r--r--src/lib/libssl/src/crypto/rc5/rc5test.c2
-rw-r--r--src/lib/libssl/src/e_os.h78
28 files changed, 9 insertions, 204 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
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 @@
83#include <openssl/err.h> 83#include <openssl/err.h>
84#include <openssl/crypto.h> 84#include <openssl/crypto.h>
85 85
86#include "e_os.h"
87
88static int bio_new(BIO *bio); 86static int bio_new(BIO *bio);
89static int bio_free(BIO *bio); 87static int bio_free(BIO *bio);
90static int bio_read(BIO *bio, char *buf, int size); 88static 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 {
147 union { 147 union {
148 struct sockaddr sa; 148 struct sockaddr sa;
149 struct sockaddr_in sa_in; 149 struct sockaddr_in sa_in;
150#if OPENSSL_USE_IPV6
151 struct sockaddr_in6 sa_in6; 150 struct sockaddr_in6 sa_in6;
152#endif
153 } peer; 151 } peer;
154 unsigned int connected; 152 unsigned int connected;
155 unsigned int _errno; 153 unsigned int _errno;
@@ -169,9 +167,7 @@ typedef struct bio_dgram_sctp_data_st {
169 union { 167 union {
170 struct sockaddr sa; 168 struct sockaddr sa;
171 struct sockaddr_in sa_in; 169 struct sockaddr_in sa_in;
172#if OPENSSL_USE_IPV6
173 struct sockaddr_in6 sa_in6; 170 struct sockaddr_in6 sa_in6;
174#endif
175 } peer; 171 } peer;
176 unsigned int connected; 172 unsigned int connected;
177 unsigned int _errno; 173 unsigned int _errno;
@@ -346,9 +342,7 @@ dgram_read(BIO *b, char *out, int outl)
346 union { 342 union {
347 struct sockaddr sa; 343 struct sockaddr sa;
348 struct sockaddr_in sa_in; 344 struct sockaddr_in sa_in;
349#if OPENSSL_USE_IPV6
350 struct sockaddr_in6 sa_in6; 345 struct sockaddr_in6 sa_in6;
351#endif
352 } peer; 346 } peer;
353 } sa; 347 } sa;
354 348
@@ -395,10 +389,8 @@ dgram_write(BIO *b, const char *in, int inl)
395 389
396 if (data->peer.sa.sa_family == AF_INET) 390 if (data->peer.sa.sa_family == AF_INET)
397 peerlen = sizeof(data->peer.sa_in); 391 peerlen = sizeof(data->peer.sa_in);
398#if OPENSSL_USE_IPV6
399 else if (data->peer.sa.sa_family == AF_INET6) 392 else if (data->peer.sa.sa_family == AF_INET6)
400 peerlen = sizeof(data->peer.sa_in6); 393 peerlen = sizeof(data->peer.sa_in6);
401#endif
402 ret = sendto(b->num, in, inl, 0, &data->peer.sa, peerlen); 394 ret = sendto(b->num, in, inl, 0, &data->peer.sa, peerlen);
403 } 395 }
404 396
@@ -432,9 +424,7 @@ dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
432 union { 424 union {
433 struct sockaddr sa; 425 struct sockaddr sa;
434 struct sockaddr_in s4; 426 struct sockaddr_in s4;
435#if OPENSSL_USE_IPV6
436 struct sockaddr_in6 s6; 427 struct sockaddr_in6 s6;
437#endif
438 } addr; 428 } addr;
439#endif 429#endif
440 430
@@ -485,11 +475,9 @@ dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
485 case AF_INET: 475 case AF_INET:
486 memcpy(&data->peer, to, sizeof(data->peer.sa_in)); 476 memcpy(&data->peer, to, sizeof(data->peer.sa_in));
487 break; 477 break;
488#if OPENSSL_USE_IPV6
489 case AF_INET6: 478 case AF_INET6:
490 memcpy(&data->peer, to, sizeof(data->peer.sa_in6)); 479 memcpy(&data->peer, to, sizeof(data->peer.sa_in6));
491 break; 480 break;
492#endif
493 default: 481 default:
494 memcpy(&data->peer, to, sizeof(data->peer.sa)); 482 memcpy(&data->peer, to, sizeof(data->peer.sa));
495 break; 483 break;
@@ -512,7 +500,7 @@ dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
512 sizeof(sockopt_val))) < 0) 500 sizeof(sockopt_val))) < 0)
513 perror("setsockopt"); 501 perror("setsockopt");
514 break; 502 break;
515#if OPENSSL_USE_IPV6 && defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO) 503#if defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO)
516 case AF_INET6: 504 case AF_INET6:
517 sockopt_val = IPV6_PMTUDISC_DO; 505 sockopt_val = IPV6_PMTUDISC_DO;
518 if ((ret = setsockopt(b->num, IPPROTO_IPV6, 506 if ((ret = setsockopt(b->num, IPPROTO_IPV6,
@@ -552,7 +540,7 @@ dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
552 ret = data->mtu; 540 ret = data->mtu;
553 } 541 }
554 break; 542 break;
555#if OPENSSL_USE_IPV6 && defined(IPV6_MTU) 543#if defined(IPV6_MTU)
556 case AF_INET6: 544 case AF_INET6:
557 if ((ret = getsockopt(b->num, IPPROTO_IPV6, IPV6_MTU, 545 if ((ret = getsockopt(b->num, IPPROTO_IPV6, IPV6_MTU,
558 (void *)&sockopt_val, &sockopt_len)) < 0 || 546 (void *)&sockopt_val, &sockopt_len)) < 0 ||
@@ -580,7 +568,6 @@ default:
580 case AF_INET: 568 case AF_INET:
581 ret = 576 - 20 - 8; 569 ret = 576 - 20 - 8;
582 break; 570 break;
583#if OPENSSL_USE_IPV6
584 case AF_INET6: 571 case AF_INET6:
585#ifdef IN6_IS_ADDR_V4MAPPED 572#ifdef IN6_IS_ADDR_V4MAPPED
586 if (IN6_IS_ADDR_V4MAPPED(&data->peer.sa_in6.sin6_addr)) 573 if (IN6_IS_ADDR_V4MAPPED(&data->peer.sa_in6.sin6_addr))
@@ -589,7 +576,6 @@ default:
589#endif 576#endif
590 ret = 1280 - 40 - 8; 577 ret = 1280 - 40 - 8;
591 break; 578 break;
592#endif
593 default: 579 default:
594 ret = 576 - 20 - 8; 580 ret = 576 - 20 - 8;
595 break; 581 break;
@@ -611,11 +597,9 @@ default:
611 case AF_INET: 597 case AF_INET:
612 memcpy(&data->peer, to, sizeof(data->peer.sa_in)); 598 memcpy(&data->peer, to, sizeof(data->peer.sa_in));
613 break; 599 break;
614#if OPENSSL_USE_IPV6
615 case AF_INET6: 600 case AF_INET6:
616 memcpy(&data->peer, to, sizeof(data->peer.sa_in6)); 601 memcpy(&data->peer, to, sizeof(data->peer.sa_in6));
617 break; 602 break;
618#endif
619 default: 603 default:
620 memcpy(&data->peer, to, sizeof(data->peer.sa)); 604 memcpy(&data->peer, to, sizeof(data->peer.sa));
621 break; 605 break;
@@ -630,11 +614,9 @@ default:
630 case AF_INET: 614 case AF_INET:
631 ret = sizeof(data->peer.sa_in); 615 ret = sizeof(data->peer.sa_in);
632 break; 616 break;
633#if OPENSSL_USE_IPV6
634 case AF_INET6: 617 case AF_INET6:
635 ret = sizeof(data->peer.sa_in6); 618 ret = sizeof(data->peer.sa_in6);
636 break; 619 break;
637#endif
638 default: 620 default:
639 ret = sizeof(data->peer.sa); 621 ret = sizeof(data->peer.sa);
640 break; 622 break;
@@ -649,11 +631,9 @@ default:
649 case AF_INET: 631 case AF_INET:
650 memcpy(&data->peer, to, sizeof(data->peer.sa_in)); 632 memcpy(&data->peer, to, sizeof(data->peer.sa_in));
651 break; 633 break;
652#if OPENSSL_USE_IPV6
653 case AF_INET6: 634 case AF_INET6:
654 memcpy(&data->peer, to, sizeof(data->peer.sa_in6)); 635 memcpy(&data->peer, to, sizeof(data->peer.sa_in6));
655 break; 636 break;
656#endif
657 default: 637 default:
658 memcpy(&data->peer, to, sizeof(data->peer.sa)); 638 memcpy(&data->peer, to, sizeof(data->peer.sa));
659 break; 639 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 @@
56 * [including the GNU Public Licence.] 56 * [including the GNU Public Licence.]
57 */ 57 */
58 58
59
60#include "e_os.h"
61
62#ifdef OPENSSL_SYS_WIN32 59#ifdef OPENSSL_SYS_WIN32
63#include <stdlib.h> 60#include <stdlib.h>
64#endif 61#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 @@
68#include <string.h> 68#include <string.h>
69#include <openssl/conf.h> 69#include <openssl/conf.h>
70#include <openssl/conf_api.h> 70#include <openssl/conf_api.h>
71#include "e_os.h"
72 71
73static void value_free_hash_doall_arg(CONF_VALUE *a, 72static void value_free_hash_doall_arg(CONF_VALUE *a,
74 LHASH_OF(CONF_VALUE) *conf); 73 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 @@
64#include <string.h> 64#include <string.h>
65#include <unistd.h> 65#include <unistd.h>
66 66
67#include "e_os.h"
68
69#include <openssl/crypto.h> 67#include <openssl/crypto.h>
70#include <openssl/buffer.h> 68#include <openssl/buffer.h>
71#include <openssl/bio.h> 69#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 @@
57 */ 57 */
58 58
59#include "des_locl.h" 59#include "des_locl.h"
60#include "e_os.h"
61 60
62/* The input and output encrypted as though 64bit cfb mode is being 61/* The input and output encrypted as though 64bit cfb mode is being
63 * used. The extra state information to record how much of the 62 * 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 @@
56 * [including the GNU Public Licence.] 56 * [including the GNU Public Licence.]
57 */ 57 */
58 58
59#include "e_os.h"
60#include "des_locl.h" 59#include "des_locl.h"
61#include <assert.h> 60#include <assert.h>
62 61
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 @@
3 */ 3 */
4 4
5#include <ctype.h> 5#include <ctype.h>
6#include <e_os.h>
7#include <string.h> 6#include <string.h>
8 7
9int OPENSSL_strcasecmp(const char *str1, const char *str2); 8int 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 @@
60#include <stdlib.h> 60#include <stdlib.h>
61#include <ctype.h> 61#include <ctype.h>
62#include <string.h> 62#include <string.h>
63#include "e_os.h"
64#include <openssl/asn1.h> 63#include <openssl/asn1.h>
65#include <openssl/ocsp.h> 64#include <openssl/ocsp.h>
66#include <openssl/err.h> 65#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 @@
61#include <stdlib.h> 61#include <stdlib.h>
62#include <string.h> 62#include <string.h>
63 63
64#include "e_os.h"
65#include <openssl/crypto.h> 64#include <openssl/crypto.h>
66#include <openssl/rand.h> 65#include <openssl/rand.h>
67#include <openssl/buffer.h> 66#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 @@
63#include <string.h> 63#include <string.h>
64#include <stdlib.h> 64#include <stdlib.h>
65 65
66#include "../e_os.h"
67
68#ifdef OPENSSL_NO_RC5 66#ifdef OPENSSL_NO_RC5
69int main(int argc, char *argv[]) 67int main(int argc, char *argv[])
70{ 68{
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 @@
112#ifndef HEADER_APPS_H 112#ifndef HEADER_APPS_H
113#define HEADER_APPS_H 113#define HEADER_APPS_H
114 114
115#include "e_os.h" 115#include <openssl/e_os2.h>
116
117#include <openssl/bio.h> 116#include <openssl/bio.h>
118#include <openssl/x509.h> 117#include <openssl/x509.h>
119#include <openssl/lhash.h> 118#include <openssl/lhash.h>
@@ -133,9 +132,7 @@ int app_RAND_write_file(const char *file, BIO *bio_e);
133 * `bio_e' is for error messages. */ 132 * `bio_e' is for error messages. */
134void app_RAND_allow_write_file(void); 133void app_RAND_allow_write_file(void);
135long app_RAND_load_files(char *file); /* `file' is a list of files to read, 134long app_RAND_load_files(char *file); /* `file' is a list of files to read,
136 * separated by LIST_SEPARATOR_CHAR 135 * separated by ':'. The string is destroyed! */
137 * (see e_os.h). The string is
138 * destroyed! */
139 136
140extern CONF *config; 137extern CONF *config;
141extern char *default_config_file; 138extern 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,
725 union { 725 union {
726 struct sockaddr sa; 726 struct sockaddr sa;
727 struct sockaddr_in s4; 727 struct sockaddr_in s4;
728#if OPENSSL_USE_IPV6
729 struct sockaddr_in6 s6; 728 struct sockaddr_in6 s6;
730#endif
731 } peer; 729 } peer;
732 730
733 /* Initialize a random secret */ 731 /* Initialize a random secret */
@@ -749,12 +747,10 @@ generate_cookie_callback(SSL * ssl, unsigned char *cookie,
749 length += sizeof(struct in_addr); 747 length += sizeof(struct in_addr);
750 length += sizeof(peer.s4.sin_port); 748 length += sizeof(peer.s4.sin_port);
751 break; 749 break;
752#if OPENSSL_USE_IPV6
753 case AF_INET6: 750 case AF_INET6:
754 length += sizeof(struct in6_addr); 751 length += sizeof(struct in6_addr);
755 length += sizeof(peer.s6.sin6_port); 752 length += sizeof(peer.s6.sin6_port);
756 break; 753 break;
757#endif
758 default: 754 default:
759 OPENSSL_assert(0); 755 OPENSSL_assert(0);
760 break; 756 break;
@@ -771,13 +767,11 @@ generate_cookie_callback(SSL * ssl, unsigned char *cookie,
771 memcpy(buffer + sizeof(peer.s4.sin_port), 767 memcpy(buffer + sizeof(peer.s4.sin_port),
772 &peer.s4.sin_addr, sizeof(struct in_addr)); 768 &peer.s4.sin_addr, sizeof(struct in_addr));
773 break; 769 break;
774#if OPENSSL_USE_IPV6
775 case AF_INET6: 770 case AF_INET6:
776 memcpy(buffer, &peer.s6.sin6_port, sizeof(peer.s6.sin6_port)); 771 memcpy(buffer, &peer.s6.sin6_port, sizeof(peer.s6.sin6_port));
777 memcpy(buffer + sizeof(peer.s6.sin6_port), 772 memcpy(buffer + sizeof(peer.s6.sin6_port),
778 &peer.s6.sin6_addr, sizeof(struct in6_addr)); 773 &peer.s6.sin6_addr, sizeof(struct in6_addr));
779 break; 774 break;
780#endif
781 default: 775 default:
782 OPENSSL_assert(0); 776 OPENSSL_assert(0);
783 break; 777 break;
@@ -802,9 +796,7 @@ verify_cookie_callback(SSL * ssl, unsigned char *cookie, unsigned int cookie_len
802 union { 796 union {
803 struct sockaddr sa; 797 struct sockaddr sa;
804 struct sockaddr_in s4; 798 struct sockaddr_in s4;
805#if OPENSSL_USE_IPV6
806 struct sockaddr_in6 s6; 799 struct sockaddr_in6 s6;
807#endif
808 } peer; 800 } peer;
809 801
810 /* If secret isn't initialized yet, the cookie can't be valid */ 802 /* 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
821 length += sizeof(struct in_addr); 813 length += sizeof(struct in_addr);
822 length += sizeof(peer.s4.sin_port); 814 length += sizeof(peer.s4.sin_port);
823 break; 815 break;
824#if OPENSSL_USE_IPV6
825 case AF_INET6: 816 case AF_INET6:
826 length += sizeof(struct in6_addr); 817 length += sizeof(struct in6_addr);
827 length += sizeof(peer.s6.sin6_port); 818 length += sizeof(peer.s6.sin6_port);
828 break; 819 break;
829#endif
830 default: 820 default:
831 OPENSSL_assert(0); 821 OPENSSL_assert(0);
832 break; 822 break;
@@ -843,13 +833,11 @@ verify_cookie_callback(SSL * ssl, unsigned char *cookie, unsigned int cookie_len
843 memcpy(buffer + sizeof(peer.s4.sin_port), 833 memcpy(buffer + sizeof(peer.s4.sin_port),
844 &peer.s4.sin_addr, sizeof(struct in_addr)); 834 &peer.s4.sin_addr, sizeof(struct in_addr));
845 break; 835 break;
846#if OPENSSL_USE_IPV6
847 case AF_INET6: 836 case AF_INET6:
848 memcpy(buffer, &peer.s6.sin6_port, sizeof(peer.s6.sin6_port)); 837 memcpy(buffer, &peer.s6.sin6_port, sizeof(peer.s6.sin6_port));
849 memcpy(buffer + sizeof(peer.s6.sin6_port), 838 memcpy(buffer + sizeof(peer.s6.sin6_port),
850 &peer.s6.sin6_addr, sizeof(struct in6_addr)); 839 &peer.s6.sin6_addr, sizeof(struct in6_addr));
851 break; 840 break;
852#endif
853 default: 841 default:
854 OPENSSL_assert(0); 842 OPENSSL_assert(0);
855 break; 843 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 @@
66#include <sys/socket.h> 66#include <sys/socket.h>
67#include <netinet/in.h> 67#include <netinet/in.h>
68 68
69#ifdef FLAT_INC 69#include <openssl/e_os2.h>
70#include "e_os2.h"
71#else
72#include "../e_os2.h"
73#endif
74 70
75#define NON_MAIN 71#define NON_MAIN
76#include "apps.h" 72#include "apps.h"
@@ -78,12 +74,6 @@
78#include "s_apps.h" 74#include "s_apps.h"
79#include <openssl/ssl.h> 75#include <openssl/ssl.h>
80 76
81#ifdef FLAT_INC
82#include "e_os.h"
83#else
84#include "../e_os.h"
85#endif
86
87#ifndef OPENSSL_NO_SOCK 77#ifndef OPENSSL_NO_SOCK
88 78
89 79
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)
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
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 @@
83#include <openssl/err.h> 83#include <openssl/err.h>
84#include <openssl/crypto.h> 84#include <openssl/crypto.h>
85 85
86#include "e_os.h"
87
88static int bio_new(BIO *bio); 86static int bio_new(BIO *bio);
89static int bio_free(BIO *bio); 87static int bio_free(BIO *bio);
90static int bio_read(BIO *bio, char *buf, int size); 88static 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 {
147 union { 147 union {
148 struct sockaddr sa; 148 struct sockaddr sa;
149 struct sockaddr_in sa_in; 149 struct sockaddr_in sa_in;
150#if OPENSSL_USE_IPV6
151 struct sockaddr_in6 sa_in6; 150 struct sockaddr_in6 sa_in6;
152#endif
153 } peer; 151 } peer;
154 unsigned int connected; 152 unsigned int connected;
155 unsigned int _errno; 153 unsigned int _errno;
@@ -169,9 +167,7 @@ typedef struct bio_dgram_sctp_data_st {
169 union { 167 union {
170 struct sockaddr sa; 168 struct sockaddr sa;
171 struct sockaddr_in sa_in; 169 struct sockaddr_in sa_in;
172#if OPENSSL_USE_IPV6
173 struct sockaddr_in6 sa_in6; 170 struct sockaddr_in6 sa_in6;
174#endif
175 } peer; 171 } peer;
176 unsigned int connected; 172 unsigned int connected;
177 unsigned int _errno; 173 unsigned int _errno;
@@ -346,9 +342,7 @@ dgram_read(BIO *b, char *out, int outl)
346 union { 342 union {
347 struct sockaddr sa; 343 struct sockaddr sa;
348 struct sockaddr_in sa_in; 344 struct sockaddr_in sa_in;
349#if OPENSSL_USE_IPV6
350 struct sockaddr_in6 sa_in6; 345 struct sockaddr_in6 sa_in6;
351#endif
352 } peer; 346 } peer;
353 } sa; 347 } sa;
354 348
@@ -395,10 +389,8 @@ dgram_write(BIO *b, const char *in, int inl)
395 389
396 if (data->peer.sa.sa_family == AF_INET) 390 if (data->peer.sa.sa_family == AF_INET)
397 peerlen = sizeof(data->peer.sa_in); 391 peerlen = sizeof(data->peer.sa_in);
398#if OPENSSL_USE_IPV6
399 else if (data->peer.sa.sa_family == AF_INET6) 392 else if (data->peer.sa.sa_family == AF_INET6)
400 peerlen = sizeof(data->peer.sa_in6); 393 peerlen = sizeof(data->peer.sa_in6);
401#endif
402 ret = sendto(b->num, in, inl, 0, &data->peer.sa, peerlen); 394 ret = sendto(b->num, in, inl, 0, &data->peer.sa, peerlen);
403 } 395 }
404 396
@@ -432,9 +424,7 @@ dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
432 union { 424 union {
433 struct sockaddr sa; 425 struct sockaddr sa;
434 struct sockaddr_in s4; 426 struct sockaddr_in s4;
435#if OPENSSL_USE_IPV6
436 struct sockaddr_in6 s6; 427 struct sockaddr_in6 s6;
437#endif
438 } addr; 428 } addr;
439#endif 429#endif
440 430
@@ -485,11 +475,9 @@ dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
485 case AF_INET: 475 case AF_INET:
486 memcpy(&data->peer, to, sizeof(data->peer.sa_in)); 476 memcpy(&data->peer, to, sizeof(data->peer.sa_in));
487 break; 477 break;
488#if OPENSSL_USE_IPV6
489 case AF_INET6: 478 case AF_INET6:
490 memcpy(&data->peer, to, sizeof(data->peer.sa_in6)); 479 memcpy(&data->peer, to, sizeof(data->peer.sa_in6));
491 break; 480 break;
492#endif
493 default: 481 default:
494 memcpy(&data->peer, to, sizeof(data->peer.sa)); 482 memcpy(&data->peer, to, sizeof(data->peer.sa));
495 break; 483 break;
@@ -512,7 +500,7 @@ dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
512 sizeof(sockopt_val))) < 0) 500 sizeof(sockopt_val))) < 0)
513 perror("setsockopt"); 501 perror("setsockopt");
514 break; 502 break;
515#if OPENSSL_USE_IPV6 && defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO) 503#if defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO)
516 case AF_INET6: 504 case AF_INET6:
517 sockopt_val = IPV6_PMTUDISC_DO; 505 sockopt_val = IPV6_PMTUDISC_DO;
518 if ((ret = setsockopt(b->num, IPPROTO_IPV6, 506 if ((ret = setsockopt(b->num, IPPROTO_IPV6,
@@ -552,7 +540,7 @@ dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
552 ret = data->mtu; 540 ret = data->mtu;
553 } 541 }
554 break; 542 break;
555#if OPENSSL_USE_IPV6 && defined(IPV6_MTU) 543#if defined(IPV6_MTU)
556 case AF_INET6: 544 case AF_INET6:
557 if ((ret = getsockopt(b->num, IPPROTO_IPV6, IPV6_MTU, 545 if ((ret = getsockopt(b->num, IPPROTO_IPV6, IPV6_MTU,
558 (void *)&sockopt_val, &sockopt_len)) < 0 || 546 (void *)&sockopt_val, &sockopt_len)) < 0 ||
@@ -580,7 +568,6 @@ default:
580 case AF_INET: 568 case AF_INET:
581 ret = 576 - 20 - 8; 569 ret = 576 - 20 - 8;
582 break; 570 break;
583#if OPENSSL_USE_IPV6
584 case AF_INET6: 571 case AF_INET6:
585#ifdef IN6_IS_ADDR_V4MAPPED 572#ifdef IN6_IS_ADDR_V4MAPPED
586 if (IN6_IS_ADDR_V4MAPPED(&data->peer.sa_in6.sin6_addr)) 573 if (IN6_IS_ADDR_V4MAPPED(&data->peer.sa_in6.sin6_addr))
@@ -589,7 +576,6 @@ default:
589#endif 576#endif
590 ret = 1280 - 40 - 8; 577 ret = 1280 - 40 - 8;
591 break; 578 break;
592#endif
593 default: 579 default:
594 ret = 576 - 20 - 8; 580 ret = 576 - 20 - 8;
595 break; 581 break;
@@ -611,11 +597,9 @@ default:
611 case AF_INET: 597 case AF_INET:
612 memcpy(&data->peer, to, sizeof(data->peer.sa_in)); 598 memcpy(&data->peer, to, sizeof(data->peer.sa_in));
613 break; 599 break;
614#if OPENSSL_USE_IPV6
615 case AF_INET6: 600 case AF_INET6:
616 memcpy(&data->peer, to, sizeof(data->peer.sa_in6)); 601 memcpy(&data->peer, to, sizeof(data->peer.sa_in6));
617 break; 602 break;
618#endif
619 default: 603 default:
620 memcpy(&data->peer, to, sizeof(data->peer.sa)); 604 memcpy(&data->peer, to, sizeof(data->peer.sa));
621 break; 605 break;
@@ -630,11 +614,9 @@ default:
630 case AF_INET: 614 case AF_INET:
631 ret = sizeof(data->peer.sa_in); 615 ret = sizeof(data->peer.sa_in);
632 break; 616 break;
633#if OPENSSL_USE_IPV6
634 case AF_INET6: 617 case AF_INET6:
635 ret = sizeof(data->peer.sa_in6); 618 ret = sizeof(data->peer.sa_in6);
636 break; 619 break;
637#endif
638 default: 620 default:
639 ret = sizeof(data->peer.sa); 621 ret = sizeof(data->peer.sa);
640 break; 622 break;
@@ -649,11 +631,9 @@ default:
649 case AF_INET: 631 case AF_INET:
650 memcpy(&data->peer, to, sizeof(data->peer.sa_in)); 632 memcpy(&data->peer, to, sizeof(data->peer.sa_in));
651 break; 633 break;
652#if OPENSSL_USE_IPV6
653 case AF_INET6: 634 case AF_INET6:
654 memcpy(&data->peer, to, sizeof(data->peer.sa_in6)); 635 memcpy(&data->peer, to, sizeof(data->peer.sa_in6));
655 break; 636 break;
656#endif
657 default: 637 default:
658 memcpy(&data->peer, to, sizeof(data->peer.sa)); 638 memcpy(&data->peer, to, sizeof(data->peer.sa));
659 break; 639 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 @@
56 * [including the GNU Public Licence.] 56 * [including the GNU Public Licence.]
57 */ 57 */
58 58
59
60#include "e_os.h"
61
62#ifdef OPENSSL_SYS_WIN32 59#ifdef OPENSSL_SYS_WIN32
63#include <stdlib.h> 60#include <stdlib.h>
64#endif 61#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 @@
68#include <string.h> 68#include <string.h>
69#include <openssl/conf.h> 69#include <openssl/conf.h>
70#include <openssl/conf_api.h> 70#include <openssl/conf_api.h>
71#include "e_os.h"
72 71
73static void value_free_hash_doall_arg(CONF_VALUE *a, 72static void value_free_hash_doall_arg(CONF_VALUE *a,
74 LHASH_OF(CONF_VALUE) *conf); 73 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 @@
64#include <string.h> 64#include <string.h>
65#include <unistd.h> 65#include <unistd.h>
66 66
67#include "e_os.h"
68
69#include <openssl/crypto.h> 67#include <openssl/crypto.h>
70#include <openssl/buffer.h> 68#include <openssl/buffer.h>
71#include <openssl/bio.h> 69#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 @@
57 */ 57 */
58 58
59#include "des_locl.h" 59#include "des_locl.h"
60#include "e_os.h"
61 60
62/* The input and output encrypted as though 64bit cfb mode is being 61/* The input and output encrypted as though 64bit cfb mode is being
63 * used. The extra state information to record how much of the 62 * 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 @@
56 * [including the GNU Public Licence.] 56 * [including the GNU Public Licence.]
57 */ 57 */
58 58
59#include "e_os.h"
60#include "des_locl.h" 59#include "des_locl.h"
61#include <assert.h> 60#include <assert.h>
62 61
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 @@
3 */ 3 */
4 4
5#include <ctype.h> 5#include <ctype.h>
6#include <e_os.h>
7#include <string.h> 6#include <string.h>
8 7
9int OPENSSL_strcasecmp(const char *str1, const char *str2); 8int 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 @@
60#include <stdlib.h> 60#include <stdlib.h>
61#include <ctype.h> 61#include <ctype.h>
62#include <string.h> 62#include <string.h>
63#include "e_os.h"
64#include <openssl/asn1.h> 63#include <openssl/asn1.h>
65#include <openssl/ocsp.h> 64#include <openssl/ocsp.h>
66#include <openssl/err.h> 65#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 @@
61#include <stdlib.h> 61#include <stdlib.h>
62#include <string.h> 62#include <string.h>
63 63
64#include "e_os.h"
65#include <openssl/crypto.h> 64#include <openssl/crypto.h>
66#include <openssl/rand.h> 65#include <openssl/rand.h>
67#include <openssl/buffer.h> 66#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 @@
63#include <string.h> 63#include <string.h>
64#include <stdlib.h> 64#include <stdlib.h>
65 65
66#include "../e_os.h"
67
68#ifdef OPENSSL_NO_RC5 66#ifdef OPENSSL_NO_RC5
69int main(int argc, char *argv[]) 67int main(int argc, char *argv[])
70{ 68{
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 @@
1/* e_os.h */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *
9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions
11 * apply to all code found in this distribution, be it the RC4, RSA,
12 * lhash, DES, etc., code; not just the SSL code. The SSL documentation
13 * included with this distribution is covered by the same copyright terms
14 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
15 *
16 * Copyright remains Eric Young's, and as such any Copyright notices in
17 * the code are not to be removed.
18 * If this package is used in a product, Eric Young should be given attribution
19 * as the author of the parts of the library used.
20 * This can be in the form of a textual message at program startup or
21 * in documentation (online or textual) provided with the package.
22 *
23 * Redistribution and use in source and binary forms, with or without
24 * modification, are permitted provided that the following conditions
25 * are met:
26 * 1. Redistributions of source code must retain the copyright
27 * notice, this list of conditions and the following disclaimer.
28 * 2. Redistributions in binary form must reproduce the above copyright
29 * notice, this list of conditions and the following disclaimer in the
30 * documentation and/or other materials provided with the distribution.
31 * 3. All advertising materials mentioning features or use of this software
32 * must display the following acknowledgement:
33 * "This product includes cryptographic software written by
34 * Eric Young (eay@cryptsoft.com)"
35 * The word 'cryptographic' can be left out if the rouines from the library
36 * being used are not cryptographic related :-).
37 * 4. If you include any Windows specific code (or a derivative thereof) from
38 * the apps directory (application code) you must include an acknowledgement:
39 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
40 *
41 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
42 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
43 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
44 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
45 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
46 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
47 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
48 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51 * SUCH DAMAGE.
52 *
53 * The licence and distribution terms for any publically available version or
54 * derivative of this code cannot be changed. i.e. this code cannot simply be
55 * copied and put under another distribution licence
56 * [including the GNU Public Licence.]
57 */
58
59#ifndef HEADER_E_OS_H
60#define HEADER_E_OS_H
61
62#include <openssl/opensslconf.h>
63
64/*
65 * <openssl/e_os2.h> contains what we can justify to make visible
66 * to the outside
67 * <openssl/e_os2.h> is not exported interface (except to the openssl
68 * command)
69 */
70
71#include <openssl/e_os2.h>
72
73#define OPENSSL_CONF "openssl.cnf"
74
75#define OPENSSL_USE_IPV6 1
76
77#endif
78
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-20 11:20:01 +0000