Use O_NONBLOCK over FIONBIO.

Prefer this because it is the POSIX standard and has consistent behavior
across platforms.

Use BIO_socket_nbio consistently across the tree.

from Jonas 'Sortie' Termansen, ok deraadt@

1 files changed, 3 insertions, 7 deletions

diff --git a/src/usr.bin/openssl/s_server.c b/src/usr.bin/openssl/s_server.c
index 7fa875c661..9ca13dd335 100644
--- a/src/usr.bin/openssl/s_server.c
+++ b/src/usr.bin/openssl/s_server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_server.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
+/* $OpenBSD: s_server.c,v 1.2 2014/10/13 02:39:09 bcook Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1364,11 +1364,9 @@ sv_body(char *hostname, int s, unsigned char *context)
                 goto err;
         }
         if (s_nbio) {
-                unsigned long sl = 1;
-
                 if (!s_quiet)
                         BIO_printf(bio_err, "turning on non blocking io\n");
-                if (BIO_socket_ioctl(s, FIONBIO, &sl) < 0)
+                if (!BIO_socket_nbio(s, 1))
                         ERR_print_errors(bio_err);
         }
 
@@ -1798,11 +1796,9 @@ www_body(char *hostname, int s, unsigned char *context)
                 goto err;
 
         if (s_nbio) {
-                unsigned long sl = 1;
-
                 if (!s_quiet)
                         BIO_printf(bio_err, "turning on non blocking io\n");
-                if (BIO_socket_ioctl(s, FIONBIO, &sl) < 0)
+                if (!BIO_socket_nbio(s, 1))
                         ERR_print_errors(bio_err);
         }