diff options
author | tedu <> | 2014-04-18 21:41:15 +0000 |
---|---|---|
committer | tedu <> | 2014-04-18 21:41:15 +0000 |
commit | 134c07c06a5d90d791e5776f48cd62e35ba34770 (patch) | |
tree | ced8cbd1daa64e2922901f55d59efa7ecb954eef /src | |
parent | e8a4b91de8e814e5c5c14a4606081bac4fd958bb (diff) | |
download | openbsd-134c07c06a5d90d791e5776f48cd62e35ba34770.tar.gz openbsd-134c07c06a5d90d791e5776f48cd62e35ba34770.tar.bz2 openbsd-134c07c06a5d90d791e5776f48cd62e35ba34770.zip |
unifdef NO_SOCK
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/bio/b_sock.c | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bss_acpt.c | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bss_conn.c | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bss_sock.c | 2 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/bio/b_sock.c | 2 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/bio/bss_acpt.c | 2 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/bio/bss_conn.c | 2 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/bio/bss_sock.c | 2 |
8 files changed, 0 insertions, 16 deletions
diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c index 0baece8cdb..a82c79a1b0 100644 --- a/src/lib/libcrypto/bio/b_sock.c +++ b/src/lib/libcrypto/bio/b_sock.c | |||
@@ -68,7 +68,6 @@ | |||
68 | #include <sys/socket.h> | 68 | #include <sys/socket.h> |
69 | #include <netinet/in.h> | 69 | #include <netinet/in.h> |
70 | 70 | ||
71 | #ifndef OPENSSL_NO_SOCK | ||
72 | 71 | ||
73 | #include <openssl/dso.h> | 72 | #include <openssl/dso.h> |
74 | 73 | ||
@@ -599,4 +598,3 @@ BIO_socket_nbio(int s, int mode) | |||
599 | #endif | 598 | #endif |
600 | return (ret == 0); | 599 | return (ret == 0); |
601 | } | 600 | } |
602 | #endif | ||
diff --git a/src/lib/libcrypto/bio/bss_acpt.c b/src/lib/libcrypto/bio/bss_acpt.c index dab8a811e1..4ab5856ed6 100644 --- a/src/lib/libcrypto/bio/bss_acpt.c +++ b/src/lib/libcrypto/bio/bss_acpt.c | |||
@@ -63,7 +63,6 @@ | |||
63 | #include <openssl/bio.h> | 63 | #include <openssl/bio.h> |
64 | #include <sys/socket.h> | 64 | #include <sys/socket.h> |
65 | 65 | ||
66 | #ifndef OPENSSL_NO_SOCK | ||
67 | 66 | ||
68 | #define SOCKET_PROTOCOL IPPROTO_TCP | 67 | #define SOCKET_PROTOCOL IPPROTO_TCP |
69 | 68 | ||
@@ -460,4 +459,3 @@ BIO_new_accept(char *str) | |||
460 | } | 459 | } |
461 | } | 460 | } |
462 | 461 | ||
463 | #endif | ||
diff --git a/src/lib/libcrypto/bio/bss_conn.c b/src/lib/libcrypto/bio/bss_conn.c index 12cbed2ae9..fca5d5e853 100644 --- a/src/lib/libcrypto/bio/bss_conn.c +++ b/src/lib/libcrypto/bio/bss_conn.c | |||
@@ -65,7 +65,6 @@ | |||
65 | #include <sys/socket.h> | 65 | #include <sys/socket.h> |
66 | #include <netinet/in.h> | 66 | #include <netinet/in.h> |
67 | 67 | ||
68 | #ifndef OPENSSL_NO_SOCK | ||
69 | 68 | ||
70 | #define SOCKET_PROTOCOL IPPROTO_TCP | 69 | #define SOCKET_PROTOCOL IPPROTO_TCP |
71 | 70 | ||
@@ -611,4 +610,3 @@ BIO_new_connect(char *str) | |||
611 | } | 610 | } |
612 | } | 611 | } |
613 | 612 | ||
614 | #endif | ||
diff --git a/src/lib/libcrypto/bio/bss_sock.c b/src/lib/libcrypto/bio/bss_sock.c index 0cba37f174..3dae2562bf 100644 --- a/src/lib/libcrypto/bio/bss_sock.c +++ b/src/lib/libcrypto/bio/bss_sock.c | |||
@@ -62,7 +62,6 @@ | |||
62 | #include "cryptlib.h" | 62 | #include "cryptlib.h" |
63 | #include <sys/socket.h> | 63 | #include <sys/socket.h> |
64 | 64 | ||
65 | #ifndef OPENSSL_NO_SOCK | ||
66 | 65 | ||
67 | #include <openssl/bio.h> | 66 | #include <openssl/bio.h> |
68 | 67 | ||
@@ -240,4 +239,3 @@ BIO_sock_non_fatal_error(int err) | |||
240 | return (0); | 239 | return (0); |
241 | } | 240 | } |
242 | 241 | ||
243 | #endif /* #ifndef OPENSSL_NO_SOCK */ | ||
diff --git a/src/lib/libssl/src/crypto/bio/b_sock.c b/src/lib/libssl/src/crypto/bio/b_sock.c index 0baece8cdb..a82c79a1b0 100644 --- a/src/lib/libssl/src/crypto/bio/b_sock.c +++ b/src/lib/libssl/src/crypto/bio/b_sock.c | |||
@@ -68,7 +68,6 @@ | |||
68 | #include <sys/socket.h> | 68 | #include <sys/socket.h> |
69 | #include <netinet/in.h> | 69 | #include <netinet/in.h> |
70 | 70 | ||
71 | #ifndef OPENSSL_NO_SOCK | ||
72 | 71 | ||
73 | #include <openssl/dso.h> | 72 | #include <openssl/dso.h> |
74 | 73 | ||
@@ -599,4 +598,3 @@ BIO_socket_nbio(int s, int mode) | |||
599 | #endif | 598 | #endif |
600 | return (ret == 0); | 599 | return (ret == 0); |
601 | } | 600 | } |
602 | #endif | ||
diff --git a/src/lib/libssl/src/crypto/bio/bss_acpt.c b/src/lib/libssl/src/crypto/bio/bss_acpt.c index dab8a811e1..4ab5856ed6 100644 --- a/src/lib/libssl/src/crypto/bio/bss_acpt.c +++ b/src/lib/libssl/src/crypto/bio/bss_acpt.c | |||
@@ -63,7 +63,6 @@ | |||
63 | #include <openssl/bio.h> | 63 | #include <openssl/bio.h> |
64 | #include <sys/socket.h> | 64 | #include <sys/socket.h> |
65 | 65 | ||
66 | #ifndef OPENSSL_NO_SOCK | ||
67 | 66 | ||
68 | #define SOCKET_PROTOCOL IPPROTO_TCP | 67 | #define SOCKET_PROTOCOL IPPROTO_TCP |
69 | 68 | ||
@@ -460,4 +459,3 @@ BIO_new_accept(char *str) | |||
460 | } | 459 | } |
461 | } | 460 | } |
462 | 461 | ||
463 | #endif | ||
diff --git a/src/lib/libssl/src/crypto/bio/bss_conn.c b/src/lib/libssl/src/crypto/bio/bss_conn.c index 12cbed2ae9..fca5d5e853 100644 --- a/src/lib/libssl/src/crypto/bio/bss_conn.c +++ b/src/lib/libssl/src/crypto/bio/bss_conn.c | |||
@@ -65,7 +65,6 @@ | |||
65 | #include <sys/socket.h> | 65 | #include <sys/socket.h> |
66 | #include <netinet/in.h> | 66 | #include <netinet/in.h> |
67 | 67 | ||
68 | #ifndef OPENSSL_NO_SOCK | ||
69 | 68 | ||
70 | #define SOCKET_PROTOCOL IPPROTO_TCP | 69 | #define SOCKET_PROTOCOL IPPROTO_TCP |
71 | 70 | ||
@@ -611,4 +610,3 @@ BIO_new_connect(char *str) | |||
611 | } | 610 | } |
612 | } | 611 | } |
613 | 612 | ||
614 | #endif | ||
diff --git a/src/lib/libssl/src/crypto/bio/bss_sock.c b/src/lib/libssl/src/crypto/bio/bss_sock.c index 0cba37f174..3dae2562bf 100644 --- a/src/lib/libssl/src/crypto/bio/bss_sock.c +++ b/src/lib/libssl/src/crypto/bio/bss_sock.c | |||
@@ -62,7 +62,6 @@ | |||
62 | #include "cryptlib.h" | 62 | #include "cryptlib.h" |
63 | #include <sys/socket.h> | 63 | #include <sys/socket.h> |
64 | 64 | ||
65 | #ifndef OPENSSL_NO_SOCK | ||
66 | 65 | ||
67 | #include <openssl/bio.h> | 66 | #include <openssl/bio.h> |
68 | 67 | ||
@@ -240,4 +239,3 @@ BIO_sock_non_fatal_error(int err) | |||
240 | return (0); | 239 | return (0); |
241 | } | 240 | } |
242 | 241 | ||
243 | #endif /* #ifndef OPENSSL_NO_SOCK */ | ||