From 989bc3e3ace0e2326408d2f9aefae103402a8b03 Mon Sep 17 00:00:00 2001
From: Brent Cook <bcook@openbsd.org>
Date: Sun, 22 Mar 2015 05:49:58 -0500
Subject: [PATCH] the BIO_sock_init() patch is upstream.

---
 patches/win_bio_sock_init.diff | 44 ----------------------------------
 update.sh                      |  2 --
 2 files changed, 46 deletions(-)
 delete mode 100644 patches/win_bio_sock_init.diff

diff --git a/patches/win_bio_sock_init.diff b/patches/win_bio_sock_init.diff
deleted file mode 100644
index e0221b9..0000000
--- a/patches/win_bio_sock_init.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/src/usr.bin/openssl/openssl.c b/src/usr.bin/openssl/openssl.c
-index e7dd11c..cfd4593 100644
---- a/src/usr.bin/openssl/openssl.c
-+++ b/src/usr.bin/openssl/openssl.c
-@@ -253,6 +253,11 @@ main(int argc, char **argv)
- 	arg.data = NULL;
- 	arg.count = 0;
- 
-+	if (BIO_sock_init() != 1) {
-+		fprintf(stderr, "BIO_sock_init failed\n");
-+		exit(1);
-+	}
-+
- 	bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
- 	if (bio_err == NULL) {
- 		fprintf(stderr, "openssl: failed to initialise bio_err\n");
-diff --git a/src/usr.bin/openssl/s_socket.c b/src/usr.bin/openssl/s_socket.c
-index 3b96b1a..2ce31eb 100644
---- a/src/usr.bin/openssl/s_socket.c
-+++ b/src/usr.bin/openssl/s_socket.c
-@@ -85,11 +85,6 @@ init_client(int *sock, char *host, char *port, int type, int af)
- 	struct addrinfo hints, *ai_top, *ai;
- 	int i, s;
- 
--	if (BIO_sock_init() != 1) {
--		BIO_printf(bio_err, "BIO_sock_init failed\n");
--		return (0);
--	}
--
- 	memset(&hints, '\0', sizeof(hints));
- 	hints.ai_family = af;
- 	hints.ai_socktype = type;
-@@ -181,11 +176,6 @@ init_server_long(int *sock, int port, char *ip, int type)
- 	struct sockaddr_in server;
- 	int s = -1;
- 
--	if (BIO_sock_init() != 1) {
--		BIO_printf(bio_err, "BIO_sock_init failed\n");
--		return (0);
--	}
--
- 	memset((char *) &server, 0, sizeof(server));
- 	server.sin_family = AF_INET;
- 	server.sin_port = htons((unsigned short) port);
diff --git a/update.sh b/update.sh
index 85f8331..b8326fd 100755
--- a/update.sh
+++ b/update.sh
@@ -184,8 +184,6 @@ for i in `awk '/SOURCES|HEADERS/ { print $3 }' apps/Makefile.am` ; do
 		$CP $openssl_app_src/$i apps
 	fi
 done
-# patch for openssl(1) oscp on windows
-(cd apps; patch -p4 < $CWD/patches/win_bio_sock_init.diff)
 
 # copy libssl source
 echo "copying libssl source"