Since Windows needs BIO_sock_init() before you can call any networking

functions, and ocsp and s_time need networking enabled too, this just moves
BIO_sock_init() up into main() as a catch-all for all of the commands.

Of course, it is a no-op on any other platform.

ok @guenther

1 files changed, 6 insertions, 1 deletions

diff --git a/src/usr.bin/openssl/openssl.c b/src/usr.bin/openssl/openssl.c
index 76e1644f59..08e22ca829 100644
--- a/src/usr.bin/openssl/openssl.c
+++ b/src/usr.bin/openssl/openssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: openssl.c,v 1.2 2014/10/22 13:54:03 jsing Exp $ */
+/* $OpenBSD: openssl.c,v 1.3 2015/03/22 10:36:22 bcook Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -259,6 +259,11 @@ main(int argc, char **argv)
                 exit(1);
         }
 
+        if (BIO_sock_init() != 1) {
+                BIO_printf(bio_err, "BIO_sock_init failed\n");
+                exit(1);
+        }
+
         CRYPTO_set_locking_callback(lock_dbg_cb);
 
         openssl_startup();