Mostly gut e_os.h:

USE_SOCKETS is unrelated to using sockets, but just pulls in .h files.  It
makes every file buy a kitchen sink, because 11 files forgot to.
EXIT() is really exit(), a gentle surprise
but... OPENSSL_EXIT() is really just return(), because noone compiles the
openssl command non-monolithic anymore

7 files changed, 14 insertions, 14 deletions

diff --git a/lib/libcrypto/bio/b_sock.c b/lib/libcrypto/bio/b_sock.c
index 1ae9d96577c..0972feeb584 100644
--- a/lib/libcrypto/bio/b_sock.c
+++ b/lib/libcrypto/bio/b_sock.c
@@ -59,16 +59,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
-#define USE_SOCKETS
 #include "cryptlib.h"
 #include <openssl/bio.h>
-#if defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_BSDSOCK)
-#include <netdb.h>
-#if defined(NETWARE_CLIB)
 #include <sys/ioctl.h>
-NETDB_DEFINE_CONTEXT
-#endif
-#endif
+
+#include <netdb.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
 
 #ifndef OPENSSL_NO_SOCK
 
diff --git a/lib/libcrypto/bio/bss_acpt.c b/lib/libcrypto/bio/bss_acpt.c
index a272ada3667..27a4d371dc2 100644
--- a/lib/libcrypto/bio/bss_acpt.c
+++ b/lib/libcrypto/bio/bss_acpt.c
@@ -58,9 +58,9 @@
 
 #include <stdio.h>
 #include <errno.h>
-#define USE_SOCKETS
 #include "cryptlib.h"
 #include <openssl/bio.h>
+#include <sys/socket.h>
 
 #ifndef OPENSSL_NO_SOCK
 
diff --git a/lib/libcrypto/bio/bss_conn.c b/lib/libcrypto/bio/bss_conn.c
index 9c5320cafb6..46667bc7d62 100644
--- a/lib/libcrypto/bio/bss_conn.c
+++ b/lib/libcrypto/bio/bss_conn.c
@@ -58,9 +58,11 @@
 
 #include <stdio.h>
 #include <errno.h>
-#define USE_SOCKETS
 #include "cryptlib.h"
 #include <openssl/bio.h>
+#include <netdb.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
 
 #ifndef OPENSSL_NO_SOCK
 
diff --git a/lib/libcrypto/bio/bss_dgram.c b/lib/libcrypto/bio/bss_dgram.c
index 4c54601abcb..50281b5650a 100644
--- a/lib/libcrypto/bio/bss_dgram.c
+++ b/lib/libcrypto/bio/bss_dgram.c
@@ -60,10 +60,12 @@
 
 #include <stdio.h>
 #include <errno.h>
-#define USE_SOCKETS
 #include "cryptlib.h"
-
 #include <openssl/bio.h>
+#include <netdb.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
 #ifndef OPENSSL_NO_DGRAM
 
 #ifndef OPENSSL_NO_SCTP
diff --git a/lib/libcrypto/bio/bss_fd.c b/lib/libcrypto/bio/bss_fd.c
index 4369d6411d8..b84719c4870 100644
--- a/lib/libcrypto/bio/bss_fd.c
+++ b/lib/libcrypto/bio/bss_fd.c
@@ -58,7 +58,6 @@
 
 #include <stdio.h>
 #include <errno.h>
-#define USE_SOCKETS
 #include "cryptlib.h"
 
 #if defined(OPENSSL_NO_POSIX_IO)
diff --git a/lib/libcrypto/bio/bss_sock.c b/lib/libcrypto/bio/bss_sock.c
index 5335495c6ef..7c499634fbc 100644
--- a/lib/libcrypto/bio/bss_sock.c
+++ b/lib/libcrypto/bio/bss_sock.c
@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include <errno.h>
-#define USE_SOCKETS
 #include "cryptlib.h"
+#include <sys/socket.h>
 
 #ifndef OPENSSL_NO_SOCK
 
diff --git a/lib/libcrypto/x509/by_dir.c b/lib/libcrypto/x509/by_dir.c
index 76f8244f364..bc603312752 100644
--- a/lib/libcrypto/x509/by_dir.c
+++ b/lib/libcrypto/x509/by_dir.c
@@ -218,7 +218,7 @@ add_cert_dir(BY_DIR *ctx, const char *dir, int type)
 	s = dir;
 	p = s;
 	do {
-		if ((*p == LIST_SEPARATOR_CHAR) || (*p == '\0')) {
+		if ((*p == ':') || (*p == '\0')) {
 			BY_DIR_ENTRY *ent;
 			ss = s;
 			s = p + 1;