diff options
| author |   jsing <jsing@openbsd.org> | 2014-05-05 16:16:37 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-05-05 16:16:37 +0000 |
| commit | eca31f833dd6cf0affae2b8bce87c98ebfc6d361 (patch) | |
| tree | a8ea182f7e5bd9f7333065d60209b3b721419dad | |
| parent | During the great e_os.h nukathon we stopped pulling in <sys/filio.h> via (diff) | |
| download | wireguard-openbsd-eca31f833dd6cf0affae2b8bce87c98ebfc6d361.tar.xz wireguard-openbsd-eca31f833dd6cf0affae2b8bce87c98ebfc6d361.zip | |
Repair BIO_socket_nbio operation.
ok miod@
| -rw-r--r-- | lib/libcrypto/bio/b_sock.c | 5 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/bio/b_sock.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/libcrypto/bio/b_sock.c b/lib/libcrypto/bio/b_sock.c index ecfaf93b99d..7da33d36b27 100644 --- a/lib/libcrypto/bio/b_sock.c +++ b/lib/libcrypto/bio/b_sock.c @@ -56,6 +56,8 @@ * [including the GNU Public Licence.] */ +#include <sys/ioctl.h> + #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -575,8 +577,7 @@ BIO_socket_nbio(int s, int mode) int l; l = mode; -#ifdef FIONBIO ret = BIO_socket_ioctl(s, FIONBIO, &l); -#endif + return (ret == 0); } diff --git a/lib/libssl/src/crypto/bio/b_sock.c b/lib/libssl/src/crypto/bio/b_sock.c index ecfaf93b99d..7da33d36b27 100644 --- a/lib/libssl/src/crypto/bio/b_sock.c +++ b/lib/libssl/src/crypto/bio/b_sock.c @@ -56,6 +56,8 @@ * [including the GNU Public Licence.] */ +#include <sys/ioctl.h> + #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -575,8 +577,7 @@ BIO_socket_nbio(int s, int mode) int l; l = mode; -#ifdef FIONBIO ret = BIO_socket_ioctl(s, FIONBIO, &l); -#endif + return (ret == 0); } |