Commit 0e97f1e1 authored by Rich Salz's avatar Rich Salz
Browse files

(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: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4209)
parent 94e1f8ab

apps/ocsp.c

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ NON_EMPTY_TRANSLATION_UNIT 
                                 * on OpenVMS */

# endif



# define USE_SOCKETS



# include <stdio.h>

# include <stdlib.h>

# include <string.h>

apps/openssl.c

+0 −1
Original line number Diff line number Diff line
@@ -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

apps/s_cb.c

+0 −2
Original line number Diff line number Diff line
@@ -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>

apps/s_client.c

+2 −1
Original line number Diff line number Diff line
@@ -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)

apps/s_server.c

+1 −1
Original line number Diff line number Diff line
@@ -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);