diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-08-21 17:22:19 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-08-22 14:15:40 -0400 |
| commit | 0e97f1e1a7f43be3a5e5c6256fe6bcb90caf9e01 (patch) | |
| tree | 640bd7aea51a53d5e98666aa8ef2cb78270bdff6 /apps | |
| parent | 94e1f8ab5a9e5996d1808f236c77343acfad9d33 (diff) | |
(Re)move some things from e_os.h
Remove GETPID_IS_MEANINGLESS and osslargused.
Move socket-related things to new file internal/sockets.h; this is now
only needed by four(!!!) files. Compiles should be a bit faster.
Remove USE_SOCKETS ifdef's
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4209)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/ocsp.c | 2 | ||||
| -rw-r--r-- | apps/openssl.c | 1 | ||||
| -rw-r--r-- | apps/s_cb.c | 2 | ||||
| -rw-r--r-- | apps/s_client.c | 3 | ||||
| -rw-r--r-- | apps/s_server.c | 2 | ||||
| -rw-r--r-- | apps/s_socket.c | 3 | ||||
| -rw-r--r-- | apps/s_time.c | 1 |
7 files changed, 4 insertions, 10 deletions
diff --git a/apps/ocsp.c b/apps/ocsp.c index 3e1201ff73..8f7b1c8b0b 100644 --- a/apps/ocsp.c +++ b/apps/ocsp.c @@ -17,8 +17,6 @@ NON_EMPTY_TRANSLATION_UNIT * on OpenVMS */ # endif -# define USE_SOCKETS - # include <stdio.h> # include <stdlib.h> # include <string.h> diff --git a/apps/openssl.c b/apps/openssl.c index 184c401073..c23cd4b216 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -21,7 +21,6 @@ # include <openssl/engine.h> #endif #include <openssl/err.h> -#define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */ #include "s_apps.h" /* Needed to get the other O_xxx flags. */ #ifdef OPENSSL_SYS_VMS diff --git a/apps/s_cb.c b/apps/s_cb.c index 38a410b334..cb5d18c083 100644 --- a/apps/s_cb.c +++ b/apps/s_cb.c @@ -11,9 +11,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> /* for memcpy() and strcmp() */ -#define USE_SOCKETS #include "apps.h" -#undef USE_SOCKETS #include <openssl/err.h> #include <openssl/rand.h> #include <openssl/x509.h> diff --git a/apps/s_client.c b/apps/s_client.c index 5ae52b453f..5f7b31c9dc 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -13,6 +13,7 @@ #include <stdlib.h> #include <string.h> #include <errno.h> +#include "e_os.h" #include <openssl/e_os2.h> #ifndef OPENSSL_NO_SOCK @@ -28,7 +29,6 @@ typedef unsigned int u_int; #endif -#define USE_SOCKETS #include "apps.h" #include <openssl/x509.h> #include <openssl/ssl.h> @@ -46,6 +46,7 @@ typedef unsigned int u_int; #endif #include "s_apps.h" #include "timeouts.h" +#include "internal/sockets.h" #if defined(__has_feature) # if __has_feature(memory_sanitizer) diff --git a/apps/s_server.c b/apps/s_server.c index 8883994f8f..81ae6dba3e 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -37,7 +37,6 @@ typedef unsigned int u_int; #include <openssl/lhash.h> #include <openssl/bn.h> -#define USE_SOCKETS #include "apps.h" #include <openssl/err.h> #include <openssl/pem.h> @@ -59,6 +58,7 @@ typedef unsigned int u_int; #ifdef CHARSET_EBCDIC #include <openssl/ebcdic.h> #endif +#include "internal/sockets.h" static int not_resumable_sess_cb(SSL *s, int is_forward_secure); static int sv_body(int s, int stype, int prot, unsigned char *context); diff --git a/apps/s_socket.c b/apps/s_socket.c index 804ab5b05a..3bdb587395 100644 --- a/apps/s_socket.c +++ b/apps/s_socket.c @@ -28,10 +28,9 @@ typedef unsigned int u_int; #ifndef OPENSSL_NO_SOCK -# define USE_SOCKETS # include "apps.h" -# undef USE_SOCKETS # include "s_apps.h" +# include "internal/sockets.h" # include <openssl/bio.h> # include <openssl/err.h> diff --git a/apps/s_time.c b/apps/s_time.c index cf9ed4571d..7e24988721 100644 --- a/apps/s_time.c +++ b/apps/s_time.c @@ -17,7 +17,6 @@ #ifndef OPENSSL_NO_SOCK -#define USE_SOCKETS #include "apps.h" #include <openssl/x509.h> #include <openssl/ssl.h> |