summaryrefslogtreecommitdiffstats
path: root/lib/libssl/src
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2014-04-18 21:41:15 +0000
committertedu <tedu@openbsd.org>2014-04-18 21:41:15 +0000
commit1f76dd3efa69b060134da2941dee2d474accb82e (patch)
tree5dcefbedd51bc841e3e90b2d7f977c2cd2c85c33 /lib/libssl/src
parentround up some enemy sympathizers found calling RAND_seed(). (diff)
downloadwireguard-openbsd-1f76dd3efa69b060134da2941dee2d474accb82e.tar.xz
wireguard-openbsd-1f76dd3efa69b060134da2941dee2d474accb82e.zip
unifdef NO_SOCK
Diffstat (limited to 'lib/libssl/src')
-rw-r--r--lib/libssl/src/crypto/bio/b_sock.c2
-rw-r--r--lib/libssl/src/crypto/bio/bss_acpt.c2
-rw-r--r--lib/libssl/src/crypto/bio/bss_conn.c2
-rw-r--r--lib/libssl/src/crypto/bio/bss_sock.c2
4 files changed, 0 insertions, 8 deletions
diff --git a/lib/libssl/src/crypto/bio/b_sock.c b/lib/libssl/src/crypto/bio/b_sock.c
index 0baece8cdbd..a82c79a1b08 100644
--- a/lib/libssl/src/crypto/bio/b_sock.c
+++ b/lib/libssl/src/crypto/bio/b_sock.c
@@ -68,7 +68,6 @@
#include <sys/socket.h>
#include <netinet/in.h>
-#ifndef OPENSSL_NO_SOCK
#include <openssl/dso.h>
@@ -599,4 +598,3 @@ BIO_socket_nbio(int s, int mode)
#endif
return (ret == 0);
}
-#endif
diff --git a/lib/libssl/src/crypto/bio/bss_acpt.c b/lib/libssl/src/crypto/bio/bss_acpt.c
index dab8a811e15..4ab5856ed6c 100644
--- a/lib/libssl/src/crypto/bio/bss_acpt.c
+++ b/lib/libssl/src/crypto/bio/bss_acpt.c
@@ -63,7 +63,6 @@
#include <openssl/bio.h>
#include <sys/socket.h>
-#ifndef OPENSSL_NO_SOCK
#define SOCKET_PROTOCOL IPPROTO_TCP
@@ -460,4 +459,3 @@ BIO_new_accept(char *str)
}
}
-#endif
diff --git a/lib/libssl/src/crypto/bio/bss_conn.c b/lib/libssl/src/crypto/bio/bss_conn.c
index 12cbed2ae92..fca5d5e853f 100644
--- a/lib/libssl/src/crypto/bio/bss_conn.c
+++ b/lib/libssl/src/crypto/bio/bss_conn.c
@@ -65,7 +65,6 @@
#include <sys/socket.h>
#include <netinet/in.h>
-#ifndef OPENSSL_NO_SOCK
#define SOCKET_PROTOCOL IPPROTO_TCP
@@ -611,4 +610,3 @@ BIO_new_connect(char *str)
}
}
-#endif
diff --git a/lib/libssl/src/crypto/bio/bss_sock.c b/lib/libssl/src/crypto/bio/bss_sock.c
index 0cba37f174f..3dae2562bf5 100644
--- a/lib/libssl/src/crypto/bio/bss_sock.c
+++ b/lib/libssl/src/crypto/bio/bss_sock.c
@@ -62,7 +62,6 @@
#include "cryptlib.h"
#include <sys/socket.h>
-#ifndef OPENSSL_NO_SOCK
#include <openssl/bio.h>
@@ -240,4 +239,3 @@ BIO_sock_non_fatal_error(int err)
return (0);
}
-#endif /* #ifndef OPENSSL_NO_SOCK */