diff options
| author | jsing <> | 2014-05-05 16:16:37 +0000 |
|---|---|---|
| committer | jsing <> | 2014-05-05 16:16:37 +0000 |
| commit | 82890565c5863589f46be0aea51007a0a2df9dfe (patch) | |
| tree | 4a4f1d63ce3fa598b7832b18762dd7b5824c1505 /src/lib | |
| parent | 2e055ca8939942494f40570902a2567c9a4ac275 (diff) | |
| download | openbsd-82890565c5863589f46be0aea51007a0a2df9dfe.tar.gz openbsd-82890565c5863589f46be0aea51007a0a2df9dfe.tar.bz2 openbsd-82890565c5863589f46be0aea51007a0a2df9dfe.zip | |
Repair BIO_socket_nbio operation.
ok miod@
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/libcrypto/bio/b_sock.c | 5 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/bio/b_sock.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c index ecfaf93b99..7da33d36b2 100644 --- a/src/lib/libcrypto/bio/b_sock.c +++ b/src/lib/libcrypto/bio/b_sock.c | |||
| @@ -56,6 +56,8 @@ | |||
| 56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
| 57 | */ | 57 | */ |
| 58 | 58 | ||
| 59 | #include <sys/ioctl.h> | ||
| 60 | |||
| 59 | #include <stdio.h> | 61 | #include <stdio.h> |
| 60 | #include <stdlib.h> | 62 | #include <stdlib.h> |
| 61 | #include <unistd.h> | 63 | #include <unistd.h> |
| @@ -575,8 +577,7 @@ BIO_socket_nbio(int s, int mode) | |||
| 575 | int l; | 577 | int l; |
| 576 | 578 | ||
| 577 | l = mode; | 579 | l = mode; |
| 578 | #ifdef FIONBIO | ||
| 579 | ret = BIO_socket_ioctl(s, FIONBIO, &l); | 580 | ret = BIO_socket_ioctl(s, FIONBIO, &l); |
| 580 | #endif | 581 | |
| 581 | return (ret == 0); | 582 | return (ret == 0); |
| 582 | } | 583 | } |
diff --git a/src/lib/libssl/src/crypto/bio/b_sock.c b/src/lib/libssl/src/crypto/bio/b_sock.c index ecfaf93b99..7da33d36b2 100644 --- a/src/lib/libssl/src/crypto/bio/b_sock.c +++ b/src/lib/libssl/src/crypto/bio/b_sock.c | |||
| @@ -56,6 +56,8 @@ | |||
| 56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
| 57 | */ | 57 | */ |
| 58 | 58 | ||
| 59 | #include <sys/ioctl.h> | ||
| 60 | |||
| 59 | #include <stdio.h> | 61 | #include <stdio.h> |
| 60 | #include <stdlib.h> | 62 | #include <stdlib.h> |
| 61 | #include <unistd.h> | 63 | #include <unistd.h> |
| @@ -575,8 +577,7 @@ BIO_socket_nbio(int s, int mode) | |||
| 575 | int l; | 577 | int l; |
| 576 | 578 | ||
| 577 | l = mode; | 579 | l = mode; |
| 578 | #ifdef FIONBIO | ||
| 579 | ret = BIO_socket_ioctl(s, FIONBIO, &l); | 580 | ret = BIO_socket_ioctl(s, FIONBIO, &l); |
| 580 | #endif | 581 | |
| 581 | return (ret == 0); | 582 | return (ret == 0); |
| 582 | } | 583 | } |