diff options
-rw-r--r-- | patches/win_bio_sock_init.diff | 44 | ||||
-rwxr-xr-x | update.sh | 2 |
2 files changed, 0 insertions, 46 deletions
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 @@ | |||
1 | diff --git a/src/usr.bin/openssl/openssl.c b/src/usr.bin/openssl/openssl.c | ||
2 | index e7dd11c..cfd4593 100644 | ||
3 | --- a/src/usr.bin/openssl/openssl.c | ||
4 | +++ b/src/usr.bin/openssl/openssl.c | ||
5 | @@ -253,6 +253,11 @@ main(int argc, char **argv) | ||
6 | arg.data = NULL; | ||
7 | arg.count = 0; | ||
8 | |||
9 | + if (BIO_sock_init() != 1) { | ||
10 | + fprintf(stderr, "BIO_sock_init failed\n"); | ||
11 | + exit(1); | ||
12 | + } | ||
13 | + | ||
14 | bio_err = BIO_new_fp(stderr, BIO_NOCLOSE); | ||
15 | if (bio_err == NULL) { | ||
16 | fprintf(stderr, "openssl: failed to initialise bio_err\n"); | ||
17 | diff --git a/src/usr.bin/openssl/s_socket.c b/src/usr.bin/openssl/s_socket.c | ||
18 | index 3b96b1a..2ce31eb 100644 | ||
19 | --- a/src/usr.bin/openssl/s_socket.c | ||
20 | +++ b/src/usr.bin/openssl/s_socket.c | ||
21 | @@ -85,11 +85,6 @@ init_client(int *sock, char *host, char *port, int type, int af) | ||
22 | struct addrinfo hints, *ai_top, *ai; | ||
23 | int i, s; | ||
24 | |||
25 | - if (BIO_sock_init() != 1) { | ||
26 | - BIO_printf(bio_err, "BIO_sock_init failed\n"); | ||
27 | - return (0); | ||
28 | - } | ||
29 | - | ||
30 | memset(&hints, '\0', sizeof(hints)); | ||
31 | hints.ai_family = af; | ||
32 | hints.ai_socktype = type; | ||
33 | @@ -181,11 +176,6 @@ init_server_long(int *sock, int port, char *ip, int type) | ||
34 | struct sockaddr_in server; | ||
35 | int s = -1; | ||
36 | |||
37 | - if (BIO_sock_init() != 1) { | ||
38 | - BIO_printf(bio_err, "BIO_sock_init failed\n"); | ||
39 | - return (0); | ||
40 | - } | ||
41 | - | ||
42 | memset((char *) &server, 0, sizeof(server)); | ||
43 | server.sin_family = AF_INET; | ||
44 | server.sin_port = htons((unsigned short) port); | ||
@@ -184,8 +184,6 @@ for i in `awk '/SOURCES|HEADERS/ { print $3 }' apps/Makefile.am` ; do | |||
184 | $CP $openssl_app_src/$i apps | 184 | $CP $openssl_app_src/$i apps |
185 | fi | 185 | fi |
186 | done | 186 | done |
187 | # patch for openssl(1) oscp on windows | ||
188 | (cd apps; patch -p4 < $CWD/patches/win_bio_sock_init.diff) | ||
189 | 187 | ||
190 | # copy libssl source | 188 | # copy libssl source |
191 | echo "copying libssl source" | 189 | echo "copying libssl source" |