Move Windows OS-specific functions to make porting easier.

Several functions that need to be redefined for a Windows port are right
in the middle of other code that is relatively portable. This patch
isolates the functions that need Windows-specific implementations so
they can be built conditionally in the portable tree.

Add calls to BIO_sock_init() as-needed to openssl(1) so that socket IO works on
Windows. Sorry, these are no-op on other platforms.

ok jsing@ deraadt@

1 files changed, 8 insertions, 7 deletions

diff --git a/src/usr.bin/openssl/Makefile b/src/usr.bin/openssl/Makefile
index 015d9abeb6..1619163a13 100644
--- a/src/usr.bin/openssl/Makefile
+++ b/src/usr.bin/openssl/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.3 2014/09/10 16:51:42 jsing Exp $
+#       $OpenBSD: Makefile,v 1.4 2014/12/03 22:16:02 bcook Exp $
 
 PROG=   openssl
 LDADD=  -lssl -lcrypto
@@ -17,11 +17,12 @@ CFLAGS+= -Wunused
 
 CFLAGS+= -DLIBRESSL_INTERNAL
 
-SRCS=   apps.c asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c dgst.c dh.c \
-        dhparam.c dsa.c dsaparam.c ec.c ecparam.c enc.c engine.c errstr.c \
-        gendh.c gendsa.c genpkey.c genrsa.c nseq.c ocsp.c openssl.c passwd.c \
-        pkcs12.c pkcs7.c pkcs8.c pkey.c pkeyparam.c pkeyutl.c prime.c rand.c \
-        req.c rsa.c rsautl.c s_cb.c s_client.c s_server.c s_socket.c s_time.c \
-        sess_id.c smime.c speed.c spkac.c ts.c verify.c version.c x509.c
+SRCS=   apps.c apps_posix.c asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c \
+        dgst.c dh.c dhparam.c dsa.c dsaparam.c ec.c ecparam.c enc.c engine.c \
+        errstr.c gendh.c gendsa.c genpkey.c genrsa.c nseq.c ocsp.c openssl.c \
+        passwd.c pkcs12.c pkcs7.c pkcs8.c pkey.c pkeyparam.c pkeyutl.c prime.c \
+        rand.c req.c rsa.c rsautl.c s_cb.c s_client.c s_server.c s_socket.c \
+        s_time.c sess_id.c smime.c speed.c spkac.c ts.c verify.c version.c \
+        x509.c
 
 .include <bsd.prog.mk>