![Please Enable Javascript]()
{"schema":"libjg2-1",
"vpath":"/git/",
"avatar":"/git/avatar/",
"alang":"",
"gen_ut":1753316264,
"reponame":"openssl",
"desc":"OpenSSL",
"owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://warmcat.com/repo/openssl",
"f":3,
"items": [
{"schema":"libjg2-1",
"cid":"ad39540a213b63742868c974dc251492",
"commit": {"type":"commit",
"time": 1503425740,
"time_ofs": 18446744073709551376,
"oid_tree": { "oid": "640bd7aea51a53d5e98666aa8ef2cb78270bdff6", "alias": []},
"oid":{ "oid": "0e97f1e1a7f43be3a5e5c6256fe6bcb90caf9e01", "alias": []},
"msg": "(Re)move some things from e_os.h",
"sig_commit": { "git_time": { "time": 1503425740, "offset": -240 }, "name": "Rich Salz", "email": "rsalz@openssl.org", "md5": "3ed6b9cf7bbe83902a044f6590346d26" },
"sig_author": { "git_time": { "time": 1503350539, "offset": -240 }, "name": "Rich Salz", "email": "rsalz@openssl.org", "md5": "3ed6b9cf7bbe83902a044f6590346d26" }},
"body": "(Re)move some things from e_os.h\n\nRemove GETPID_IS_MEANINGLESS and osslargused.\n\nMove socket-related things to new file internal/sockets.h; this is now\nonly needed by four(!!!) files. Compiles should be a bit faster.\nRemove USE_SOCKETS ifdef's\n\nReviewed-by: Richard Levitte \u003clevitte@openssl.org\u003e\n(Merged from https://github.com/openssl/openssl/pull/4209)\n"
,
"diff": "diff --git a/apps/ocsp.c b/apps/ocsp.c\nindex 3e1201f..8f7b1c8 100644\n--- a/apps/ocsp.c\n+++ b/apps/ocsp.c\n@@ -17,8 +17,6 @@ NON_EMPTY_TRANSLATION_UNIT\n * on OpenVMS */\n # endif\n \n-# define USE_SOCKETS\n-\n # include \u003cstdio.h\u003e\n # include \u003cstdlib.h\u003e\n # include \u003cstring.h\u003e\ndiff --git a/apps/openssl.c b/apps/openssl.c\nindex 184c401..c23cd4b 100644\n--- a/apps/openssl.c\n+++ b/apps/openssl.c\n@@ -21,7 +21,6 @@\n # include \u003copenssl/engine.h\u003e\n #endif\n #include \u003copenssl/err.h\u003e\n-#define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */\n #include \u0022s_apps.h\u0022\n /* Needed to get the other O_xxx flags. */\n #ifdef OPENSSL_SYS_VMS\ndiff --git a/apps/s_cb.c b/apps/s_cb.c\nindex 38a410b..cb5d18c 100644\n--- a/apps/s_cb.c\n+++ b/apps/s_cb.c\n@@ -11,9 +11,7 @@\n #include \u003cstdio.h\u003e\n #include \u003cstdlib.h\u003e\n #include \u003cstring.h\u003e /* for memcpy() and strcmp() */\n-#define USE_SOCKETS\n #include \u0022apps.h\u0022\n-#undef USE_SOCKETS\n #include \u003copenssl/err.h\u003e\n #include \u003copenssl/rand.h\u003e\n #include \u003copenssl/x509.h\u003e\ndiff --git a/apps/s_client.c b/apps/s_client.c\nindex 5ae52b4..5f7b31c 100644\n--- a/apps/s_client.c\n+++ b/apps/s_client.c\n@@ -13,6 +13,7 @@\n #include \u003cstdlib.h\u003e\n #include \u003cstring.h\u003e\n #include \u003cerrno.h\u003e\n+#include \u0022e_os.h\u0022\n #include \u003copenssl/e_os2.h\u003e\n \n #ifndef OPENSSL_NO_SOCK\n@@ -28,7 +29,6 @@\n typedef unsigned int u_int;\n #endif\n \n-#define USE_SOCKETS\n #include \u0022apps.h\u0022\n #include \u003copenssl/x509.h\u003e\n #include \u003copenssl/ssl.h\u003e\n@@ -46,6 +46,7 @@ typedef unsigned int u_int;\n #endif\n #include \u0022s_apps.h\u0022\n #include \u0022timeouts.h\u0022\n+#include \u0022internal/sockets.h\u0022\n \n #if defined(__has_feature)\n # if __has_feature(memory_sanitizer)\ndiff --git a/apps/s_server.c b/apps/s_server.c\nindex 8883994..81ae6db 100644\n--- a/apps/s_server.c\n+++ b/apps/s_server.c\n@@ -37,7 +37,6 @@ typedef unsigned int u_int;\n \n #include \u003copenssl/lhash.h\u003e\n #include \u003copenssl/bn.h\u003e\n-#define USE_SOCKETS\n #include \u0022apps.h\u0022\n #include \u003copenssl/err.h\u003e\n #include \u003copenssl/pem.h\u003e\n@@ -59,6 +58,7 @@ typedef unsigned int u_int;\n #ifdef CHARSET_EBCDIC\n #include \u003copenssl/ebcdic.h\u003e\n #endif\n+#include \u0022internal/sockets.h\u0022\n \n static int not_resumable_sess_cb(SSL *s, int is_forward_secure);\n static int sv_body(int s, int stype, int prot, unsigned char *context);\ndiff --git a/apps/s_socket.c b/apps/s_socket.c\nindex 804ab5b..3bdb587 100644\n--- a/apps/s_socket.c\n+++ b/apps/s_socket.c\n@@ -28,10 +28,9 @@ typedef unsigned int u_int;\n \n #ifndef OPENSSL_NO_SOCK\n \n-# define USE_SOCKETS\n # include \u0022apps.h\u0022\n-# undef USE_SOCKETS\n # include \u0022s_apps.h\u0022\n+# include \u0022internal/sockets.h\u0022\n \n # include \u003copenssl/bio.h\u003e\n # include \u003copenssl/err.h\u003e\ndiff --git a/apps/s_time.c b/apps/s_time.c\nindex cf9ed45..7e24988 100644\n--- a/apps/s_time.c\n+++ b/apps/s_time.c\n@@ -17,7 +17,6 @@\n \n #ifndef OPENSSL_NO_SOCK\n \n-#define USE_SOCKETS\n #include \u0022apps.h\u0022\n #include \u003copenssl/x509.h\u003e\n #include \u003copenssl/ssl.h\u003e\ndiff --git a/crypto/bio/bio_lcl.h b/crypto/bio/bio_lcl.h\nindex 337621b..e2c05a2 100644\n--- a/crypto/bio/bio_lcl.h\n+++ b/crypto/bio/bio_lcl.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#define USE_SOCKETS\n #include \u0022e_os.h\u0022\n+#include \u0022internal/sockets.h\u0022\n #include \u0022internal/refcount.h\u0022\n \n /* BEGIN BIO_ADDRINFO/BIO_ADDR stuff. */\ndiff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c\nindex 744b768..71be1cd 100644\n--- a/crypto/bio/bss_sock.c\n+++ b/crypto/bio/bss_sock.c\n@@ -9,7 +9,6 @@\n \n #include \u003cstdio.h\u003e\n #include \u003cerrno.h\u003e\n-#define USE_SOCKETS\n #include \u0022bio_lcl.h\u0022\n #include \u0022internal/cryptlib.h\u0022\n \ndiff --git a/crypto/mem.c b/crypto/mem.c\nindex 81a73cc..947c50e 100644\n--- a/crypto/mem.c\n+++ b/crypto/mem.c\n@@ -187,7 +187,7 @@ void *CRYPTO_malloc(size_t num, const char *file, int line)\n ret \u003d malloc(num);\n }\n #else\n- osslargused(file); osslargused(line);\n+ (void)(file); (void)(line);\n ret \u003d malloc(num);\n #endif\n \n@@ -228,7 +228,7 @@ void *CRYPTO_realloc(void *str, size_t num, const char *file, int line)\n return ret;\n }\n #else\n- osslargused(file); osslargused(line);\n+ (void)(file); (void)(line);\n #endif\n return realloc(str, num);\n \ndiff --git a/e_os.h b/e_os.h\nindex b90ed27..1db29f6 100644\n--- a/e_os.h\n+++ b/e_os.h\n@@ -72,7 +72,6 @@ extern \u0022C\u0022 {\n # define REF_PRINT_COUNT(a, b)\n # endif\n \n-# define osslargused(x) (void)x\n # define OPENSSL_CONF \u0022openssl.cnf\u0022\n \n # ifndef DEVRANDOM\n@@ -97,6 +96,9 @@ extern \u0022C\u0022 {\n # define NO_SYSLOG\n # endif\n \n+# define get_last_sys_error() errno\n+# define clear_sys_error() errno\u003d0\n+\n /********************************************************************\n The Microsoft section\n ********************************************************************/\n@@ -110,56 +112,16 @@ extern \u0022C\u0022 {\n # define MSDOS\n # endif\n \n-# if (defined(MSDOS) || defined(OPENSSL_SYS_UEFI)) \u0026\u0026 !defined(GETPID_IS_MEANINGLESS)\n-# define GETPID_IS_MEANINGLESS\n-# endif\n-\n # ifdef WIN32\n # define NO_SYS_UN_H\n+# undef get_last_sys_error\n+# undef clear_sys_error\n # define get_last_sys_error() GetLastError()\n # define clear_sys_error() SetLastError(0)\n # if !defined(WINNT)\n # define WIN_CONSOLE_BUG\n # endif\n # else\n-# define get_last_sys_error() errno\n-# define clear_sys_error() errno\u003d0\n-# endif\n-\n-# if defined(WINDOWS)\n-# define get_last_socket_error() WSAGetLastError()\n-# define clear_socket_error() WSASetLastError(0)\n-# define readsocket(s,b,n) recv((s),(b),(n),0)\n-# define writesocket(s,b,n) send((s),(b),(n),0)\n-# elif defined(__DJGPP__)\n-# define WATT32\n-# define WATT32_NO_OLDIES\n-# define get_last_socket_error() errno\n-# define clear_socket_error() errno\u003d0\n-# define closesocket(s) close_s(s)\n-# define readsocket(s,b,n) read_s(s,b,n)\n-# define writesocket(s,b,n) send(s,b,n,0)\n-# elif defined(OPENSSL_SYS_VMS)\n-# define get_last_socket_error() errno\n-# define clear_socket_error() errno\u003d0\n-# define ioctlsocket(a,b,c) ioctl(a,b,c)\n-# define closesocket(s) close(s)\n-# define readsocket(s,b,n) recv((s),(b),(n),0)\n-# define writesocket(s,b,n) send((s),(b),(n),0)\n-# elif defined(OPENSSL_SYS_VXWORKS)\n-# define get_last_socket_error() errno\n-# define clear_socket_error() errno\u003d0\n-# define ioctlsocket(a,b,c) ioctl((a),(b),(int)(c))\n-# define closesocket(s) close(s)\n-# define readsocket(s,b,n) read((s),(b),(n))\n-# define writesocket(s,b,n) write((s),(char *)(b),(n))\n-# else\n-# define get_last_socket_error() errno\n-# define clear_socket_error() errno\u003d0\n-# define ioctlsocket(a,b,c) ioctl(a,b,c)\n-# define closesocket(s) close(s)\n-# define readsocket(s,b,n) read((s),(b),(n))\n-# define writesocket(s,b,n) write((s),(b),(n))\n # endif\n \n # if (defined(WINDOWS) || defined(MSDOS))\n@@ -285,9 +247,6 @@ extern FILE *_imp___iob;\n \n # define EXIT(n) exit(n)\n # define LIST_SEPARATOR_CHAR ';'\n-# ifndef X_OK\n-# define X_OK 0\n-# endif\n # ifndef W_OK\n # define W_OK 2\n # endif\n@@ -378,124 +337,6 @@ extern FILE *_imp___iob;\n \n # endif\n \n-/*************/\n-\n-# ifdef USE_SOCKETS\n-# ifdef OPENSSL_NO_SOCK\n-# elif defined(WINDOWS) || defined(MSDOS)\n- /* windows world */\n-# if !defined(__DJGPP__)\n-# if defined(_WIN32_WCE) \u0026\u0026 _WIN32_WCE\u003c410\n-# define getservbyname _masked_declaration_getservbyname\n-# endif\n-# if !defined(IPPROTO_IP)\n- /* winsock[2].h was included already? */\n-# include \u003cwinsock.h\u003e\n-# endif\n-# ifdef getservbyname\n-# undef getservbyname\n- /* this is used to be wcecompat/include/winsock_extras.h */\n-struct servent *PASCAL getservbyname(const char *, const char *);\n-# endif\n-\n-# ifdef _WIN64\n-/*\n- * Even though sizeof(SOCKET) is 8, it's safe to cast it to int, because\n- * the value constitutes an index in per-process table of limited size\n- * and not a real pointer. And we also depend on fact that all processors\n- * Windows run on happen to be two's-complement, which allows to\n- * interchange INVALID_SOCKET and -1.\n- */\n-# define socket(d,t,p) ((int)socket(d,t,p))\n-# define accept(s,f,l) ((int)accept(s,f,l))\n-# endif\n-# else\n-# endif\n-\n-# else\n-\n-# ifndef NO_SYS_PARAM_H\n-# include \u003csys/param.h\u003e\n-# endif\n-# ifdef OPENSSL_SYS_VXWORKS\n-# include \u003ctime.h\u003e\n-# endif\n-\n-# include \u003cnetdb.h\u003e\n-# if defined(OPENSSL_SYS_VMS_NODECC)\n-# include \u003csocket.h\u003e\n-# include \u003cin.h\u003e\n-# include \u003cinet.h\u003e\n-# else\n-# include \u003csys/socket.h\u003e\n-# ifndef NO_SYS_UN_H\n-# ifdef OPENSSL_SYS_VXWORKS\n-# include \u003cstreams/un.h\u003e\n-# else\n-# include \u003csys/un.h\u003e\n-# endif\n-# ifndef UNIX_PATH_MAX\n-# define UNIX_PATH_MAX sizeof(((struct sockaddr_un *)NULL)-\u003esun_path)\n-# endif\n-# endif\n-# ifdef FILIO_H\n-# include \u003csys/filio.h\u003e /* FIONBIO in some SVR4, e.g. unixware, solaris */\n-# endif\n-# include \u003cnetinet/in.h\u003e\n-# include \u003carpa/inet.h\u003e\n-# include \u003cnetinet/tcp.h\u003e\n-# endif\n-\n-# ifdef OPENSSL_SYS_AIX\n-# include \u003csys/select.h\u003e\n-# endif\n-\n-# ifdef __QNX__\n-# include \u003csys/select.h\u003e\n-# endif\n-\n-# ifndef VMS\n-# include \u003csys/ioctl.h\u003e\n-# else\n- /* ioctl is only in VMS \u003e 7.0 and when socketshr is not used */\n-# if !defined(TCPIP_TYPE_SOCKETSHR) \u0026\u0026 defined(__VMS_VER) \u0026\u0026 (__VMS_VER \u003e 70000000)\n-# include \u003csys/ioctl.h\u003e\n-# endif\n-# endif\n-\n-# ifdef VMS\n-# include \u003cunixio.h\u003e\n-# if defined(TCPIP_TYPE_SOCKETSHR)\n-# include \u003csocketshr.h\u003e\n-# endif\n-# endif\n-\n-# ifndef INVALID_SOCKET\n-# define INVALID_SOCKET (-1)\n-# endif /* INVALID_SOCKET */\n-# endif\n-\n-/*\n- * Some IPv6 implementations are broken, disable them in known bad versions.\n- */\n-# if !defined(OPENSSL_USE_IPV6)\n-# if defined(AF_INET6) \u0026\u0026 !defined(NETWARE_CLIB)\n-# define OPENSSL_USE_IPV6 1\n-# else\n-# define OPENSSL_USE_IPV6 0\n-# endif\n-# endif\n-\n-# endif\n-\n-# ifndef OPENSSL_EXIT\n-# if defined(MONOLITH) \u0026\u0026 !defined(OPENSSL_C)\n-# define OPENSSL_EXIT(n) return(n)\n-# else\n-# define OPENSSL_EXIT(n) do { EXIT(n); return(n); } while(0)\n-# endif\n-# endif\n-\n /***********************************************/\n \n # if defined(OPENSSL_SYS_WINDOWS)\n@@ -520,16 +361,12 @@ struct servent *PASCAL getservbyname(const char *, const char *);\n # include \u003cioLib.h\u003e\n # include \u003ctickLib.h\u003e\n # include \u003csysLib.h\u003e\n-\n-# define TTY_STRUCT int\n-\n-# define sleep(a) taskDelay((a) * sysClkRateGet())\n-\n # include \u003cvxWorks.h\u003e\n # include \u003csockLib.h\u003e\n # include \u003ctaskLib.h\u003e\n \n-# define getpid taskIdSelf\n+# define TTY_STRUCT int\n+# define sleep(a) taskDelay((a) * sysClkRateGet())\n \n /*\n * NOTE: these are implemented by helpers in database app! if the database is\ndiff --git a/include/internal/sockets.h b/include/internal/sockets.h\nnew file mode 100644\nindex 0000000..c64e74c\n--- /dev/null\n+++ b/include/internal/sockets.h\n@@ -0,0 +1,149 @@\n+/*\n+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.\n+ *\n+ * Licensed under the OpenSSL license (the \u0022License\u0022). You may not use\n+ * this file except in compliance with the License. You can obtain a copy\n+ * in the file LICENSE in the source distribution or at\n+ * https://www.openssl.org/source/license.html\n+ */\n+\n+\n+#ifndef HEADER_OPENSSL_SOCKETS\n+\n+# ifdef OPENSSL_NO_SOCK\n+\n+# elif defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)\n+# if !defined(__DJGPP__)\n+# if defined(_WIN32_WCE) \u0026\u0026 _WIN32_WCE\u003c410\n+# define getservbyname _masked_declaration_getservbyname\n+# endif\n+# if !defined(IPPROTO_IP)\n+ /* winsock[2].h was included already? */\n+# include \u003cwinsock.h\u003e\n+# endif\n+# ifdef getservbyname\n+ /* this is used to be wcecompat/include/winsock_extras.h */\n+# undef getservbyname\n+struct servent *PASCAL getservbyname(const char *, const char *);\n+# endif\n+\n+# ifdef _WIN64\n+/*\n+ * Even though sizeof(SOCKET) is 8, it's safe to cast it to int, because\n+ * the value constitutes an index in per-process table of limited size\n+ * and not a real pointer. And we also depend on fact that all processors\n+ * Windows run on happen to be two's-complement, which allows to\n+ * interchange INVALID_SOCKET and -1.\n+ */\n+# define socket(d,t,p) ((int)socket(d,t,p))\n+# define accept(s,f,l) ((int)accept(s,f,l))\n+# endif\n+# else\n+# endif\n+\n+# else\n+\n+# ifndef NO_SYS_PARAM_H\n+# include \u003csys/param.h\u003e\n+# endif\n+# ifdef OPENSSL_SYS_VXWORKS\n+# include \u003ctime.h\u003e\n+# endif\n+\n+# include \u003cnetdb.h\u003e\n+# if defined(OPENSSL_SYS_VMS_NODECC)\n+# include \u003csocket.h\u003e\n+# include \u003cin.h\u003e\n+# include \u003cinet.h\u003e\n+# else\n+# include \u003csys/socket.h\u003e\n+# ifndef NO_SYS_UN_H\n+# ifdef OPENSSL_SYS_VXWORKS\n+# include \u003cstreams/un.h\u003e\n+# else\n+# include \u003csys/un.h\u003e\n+# endif\n+# ifndef UNIX_PATH_MAX\n+# define UNIX_PATH_MAX sizeof(((struct sockaddr_un *)NULL)-\u003esun_path)\n+# endif\n+# endif\n+# ifdef FILIO_H\n+# include \u003csys/filio.h\u003e /* FIONBIO in some SVR4, e.g. unixware, solaris */\n+# endif\n+# include \u003cnetinet/in.h\u003e\n+# include \u003carpa/inet.h\u003e\n+# include \u003cnetinet/tcp.h\u003e\n+# endif\n+\n+# ifdef OPENSSL_SYS_AIX\n+# include \u003csys/select.h\u003e\n+# endif\n+\n+# ifdef __QNX__\n+# include \u003csys/select.h\u003e\n+# endif\n+\n+# ifndef VMS\n+# include \u003csys/ioctl.h\u003e\n+# else\n+# if !defined(TCPIP_TYPE_SOCKETSHR) \u0026\u0026 defined(__VMS_VER) \u0026\u0026 (__VMS_VER \u003e 70000000)\n+ /* ioctl is only in VMS \u003e 7.0 and when socketshr is not used */\n+# include \u003csys/ioctl.h\u003e\n+# endif\n+# include \u003cunixio.h\u003e\n+# if defined(TCPIP_TYPE_SOCKETSHR)\n+# include \u003csocketshr.h\u003e\n+# endif\n+# endif\n+\n+# ifndef INVALID_SOCKET\n+# define INVALID_SOCKET (-1)\n+# endif\n+# endif\n+\n+/*\n+ * Some IPv6 implementations are broken, disable them in known bad versions.\n+ */\n+# if !defined(OPENSSL_USE_IPV6)\n+# if defined(AF_INET6) \u0026\u0026 !defined(NETWARE_CLIB)\n+# define OPENSSL_USE_IPV6 1\n+# else\n+# define OPENSSL_USE_IPV6 0\n+# endif\n+# endif\n+\n+#endif\n+\n+#define get_last_socket_error() errno\n+#define clear_socket_error() errno\u003d0\n+\n+#if defined(OPENSSL_SYS_WINDOWS)\n+# undef get_last_socket_error\n+# undef clear_socket_error\n+# define get_last_socket_error() WSAGetLastError()\n+# define clear_socket_error() WSASetLastError(0)\n+# define readsocket(s,b,n) recv((s),(b),(n),0)\n+# define writesocket(s,b,n) send((s),(b),(n),0)\n+#elif defined(__DJGPP__)\n+# define WATT32\n+# define WATT32_NO_OLDIES\n+# define closesocket(s) close_s(s)\n+# define readsocket(s,b,n) read_s(s,b,n)\n+# define writesocket(s,b,n) send(s,b,n,0)\n+#elif defined(OPENSSL_SYS_VMS)\n+# define ioctlsocket(a,b,c) ioctl(a,b,c)\n+# define closesocket(s) close(s)\n+# define readsocket(s,b,n) recv((s),(b),(n),0)\n+# define writesocket(s,b,n) send((s),(b),(n),0)\n+#elif defined(OPENSSL_SYS_VXWORKS)\n+# define ioctlsocket(a,b,c) ioctl((a),(b),(int)(c))\n+# define closesocket(s) close(s)\n+# define readsocket(s,b,n) read((s),(b),(n))\n+# define writesocket(s,b,n) write((s),(char *)(b),(n))\n+#else\n+# define ioctlsocket(a,b,c) ioctl(a,b,c)\n+# define closesocket(s) close(s)\n+# define readsocket(s,b,n) read((s),(b),(n))\n+# define writesocket(s,b,n) write((s),(b),(n))\n+#endif\n+\ndiff --git a/ssl/d1_lib.c b/ssl/d1_lib.c\nindex 150e875..dd62e0c 100644\n--- a/ssl/d1_lib.c\n+++ b/ssl/d1_lib.c\n@@ -8,7 +8,6 @@\n */\n \n #include \u003cstdio.h\u003e\n-#define USE_SOCKETS\n #include \u003copenssl/objects.h\u003e\n #include \u003copenssl/rand.h\u003e\n #include \u0022ssl_locl.h\u0022\ndiff --git a/ssl/d1_msg.c b/ssl/d1_msg.c\nindex aaee3ca..35a510d 100644\n--- a/ssl/d1_msg.c\n+++ b/ssl/d1_msg.c\n@@ -7,7 +7,6 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#define USE_SOCKETS\n #include \u0022ssl_locl.h\u0022\n \n int dtls1_write_app_data_bytes(SSL *s, int type, const void *buf_, size_t len,\ndiff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c\nindex 75e3aeb..5e7aa63 100644\n--- a/ssl/record/rec_layer_d1.c\n+++ b/ssl/record/rec_layer_d1.c\n@@ -9,7 +9,6 @@\n \n #include \u003cstdio.h\u003e\n #include \u003cerrno.h\u003e\n-#define USE_SOCKETS\n #include \u0022../ssl_locl.h\u0022\n #include \u003copenssl/evp.h\u003e\n #include \u003copenssl/buffer.h\u003e\ndiff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c\nindex c1e563c..d1dfb92 100644\n--- a/ssl/record/rec_layer_s3.c\n+++ b/ssl/record/rec_layer_s3.c\n@@ -10,7 +10,6 @@\n #include \u003cstdio.h\u003e\n #include \u003climits.h\u003e\n #include \u003cerrno.h\u003e\n-#define USE_SOCKETS\n #include \u0022../ssl_locl.h\u0022\n #include \u003copenssl/evp.h\u003e\n #include \u003copenssl/buffer.h\u003e\ndiff --git a/ssl/s3_msg.c b/ssl/s3_msg.c\nindex 1cd3941..d7352ef 100644\n--- a/ssl/s3_msg.c\n+++ b/ssl/s3_msg.c\n@@ -7,7 +7,6 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#define USE_SOCKETS\n #include \u0022ssl_locl.h\u0022\n \n int ssl3_do_change_cipher_spec(SSL *s)\ndiff --git a/test/handshake_helper.c b/test/handshake_helper.c\nindex 322957a..473e22d 100644\n--- a/test/handshake_helper.c\n+++ b/test/handshake_helper.c\n@@ -16,11 +16,7 @@\n #include \u003copenssl/srp.h\u003e\n #endif\n \n-#ifndef OPENSSL_NO_SOCK\n-# define USE_SOCKETS\n-# include \u0022internal/nelem.h\u0022\n-#endif\n-\n+#include \u0022internal/nelem.h\u0022\n #include \u0022handshake_helper.h\u0022\n #include \u0022testutil.h\u0022\n \ndiff --git a/test/ssltest_old.c b/test/ssltest_old.c\nindex b95a5a4..faabc2d 100644\n--- a/test/ssltest_old.c\n+++ b/test/ssltest_old.c\n@@ -27,7 +27,6 @@\n \n #include \u0022internal/nelem.h\u0022\n \n-#define USE_SOCKETS\n #include \u0022e_os.h\u0022\n \n #ifdef OPENSSL_SYS_VMS\n","s":{"c":1753316264,"u": 61748}}
],"g": 64846,"chitpc": 0,"ehitpc": 0,"indexed":0
,
"ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}