OpenSSL 1.1.1-pre2
This commit is contained in:
Hakase
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
|
||||
* Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
|
||||
*
|
||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||
* this file except in compliance with the License. You can obtain a copy
|
||||
@@ -10,9 +10,13 @@
|
||||
#ifndef HEADER_E_OS_H
|
||||
# define HEADER_E_OS_H
|
||||
|
||||
# include <limits.h>
|
||||
# include <openssl/opensslconf.h>
|
||||
|
||||
# include <openssl/e_os2.h>
|
||||
# include <openssl/crypto.h>
|
||||
# include "internal/nelem.h"
|
||||
|
||||
/*
|
||||
* <openssl/e_os2.h> contains what we can justify to make visible to the
|
||||
* outside; this file e_os.h is not part of the exported interface.
|
||||
@@ -22,61 +26,34 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* Used to checking reference counts, most while doing perl5 stuff :-) */
|
||||
# if defined(OPENSSL_NO_STDIO)
|
||||
# if defined(REF_PRINT)
|
||||
# error "REF_PRINT requires stdio"
|
||||
# endif
|
||||
# endif
|
||||
|
||||
/*
|
||||
* BIO_printf format modifier for [u]int64_t.
|
||||
*/
|
||||
# if defined(__LP64__) || (defined(__SIZEOF_LONG__) && __SIZEOF_LONG__==8)
|
||||
# define BIO_PRI64 "l" /* 'll' does work "universally", but 'l' is
|
||||
* here to shut -Wformat warnings in LP64... */
|
||||
# else
|
||||
# define BIO_PRI64 "ll"
|
||||
# endif
|
||||
|
||||
# if !defined(NDEBUG) && !defined(OPENSSL_NO_STDIO)
|
||||
# define REF_ASSERT_ISNT(test) \
|
||||
(void)((test) ? (OPENSSL_die("refcount error", __FILE__, __LINE__), 1) : 0)
|
||||
# else
|
||||
# define REF_ASSERT_ISNT(i)
|
||||
# endif
|
||||
# ifdef REF_PRINT
|
||||
# define REF_PRINT_COUNT(a, b) \
|
||||
fprintf(stderr, "%p:%4d:%s\n", b, b->references, a)
|
||||
# else
|
||||
# define REF_PRINT_COUNT(a, b)
|
||||
# endif
|
||||
|
||||
# define osslargused(x) (void)x
|
||||
# define OPENSSL_CONF "openssl.cnf"
|
||||
|
||||
# ifndef DEVRANDOM
|
||||
/*
|
||||
* set this to a comma-separated list of 'random' device files to try out. My
|
||||
* set this to a comma-separated list of 'random' device files to try out. By
|
||||
* default, we will try to read at least one of these files
|
||||
*/
|
||||
# define DEVRANDOM "/dev/urandom","/dev/random","/dev/srandom"
|
||||
# if defined(__s390__)
|
||||
# define DEVRANDOM "/dev/prandom","/dev/urandom","/dev/hwrng","/dev/random"
|
||||
# else
|
||||
# define DEVRANDOM "/dev/urandom","/dev/random","/dev/srandom"
|
||||
# endif
|
||||
# endif
|
||||
# if !defined(OPENSSL_NO_EGD) && !defined(DEVRANDOM_EGD)
|
||||
/*
|
||||
* set this to a comma-separated list of 'egd' sockets to try out. These
|
||||
* sockets will be tried in the order listed in case accessing the device
|
||||
* files listed in DEVRANDOM did not return enough entropy.
|
||||
* files listed in DEVRANDOM did not return enough randomness.
|
||||
*/
|
||||
# define DEVRANDOM_EGD "/var/run/egd-pool","/dev/egd-pool","/etc/egd-pool","/etc/entropy"
|
||||
# endif
|
||||
|
||||
# if defined(OPENSSL_SYS_VXWORKS)
|
||||
# define NO_SYS_PARAM_H
|
||||
# if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)
|
||||
# define NO_CHMOD
|
||||
# define NO_SYSLOG
|
||||
# endif
|
||||
|
||||
# define get_last_sys_error() errno
|
||||
# define clear_sys_error() errno=0
|
||||
|
||||
/********************************************************************
|
||||
The Microsoft section
|
||||
********************************************************************/
|
||||
@@ -90,56 +67,15 @@ extern "C" {
|
||||
# define MSDOS
|
||||
# endif
|
||||
|
||||
# if (defined(MSDOS) || defined(OPENSSL_SYS_UEFI)) && !defined(GETPID_IS_MEANINGLESS)
|
||||
# define GETPID_IS_MEANINGLESS
|
||||
# endif
|
||||
|
||||
# ifdef WIN32
|
||||
# define NO_SYS_UN_H
|
||||
# undef get_last_sys_error
|
||||
# undef clear_sys_error
|
||||
# define get_last_sys_error() GetLastError()
|
||||
# define clear_sys_error() SetLastError(0)
|
||||
# if !defined(WINNT)
|
||||
# define WIN_CONSOLE_BUG
|
||||
# endif
|
||||
# else
|
||||
# define get_last_sys_error() errno
|
||||
# define clear_sys_error() errno=0
|
||||
# endif
|
||||
|
||||
# if defined(WINDOWS)
|
||||
# define get_last_socket_error() WSAGetLastError()
|
||||
# define clear_socket_error() WSASetLastError(0)
|
||||
# define readsocket(s,b,n) recv((s),(b),(n),0)
|
||||
# define writesocket(s,b,n) send((s),(b),(n),0)
|
||||
# elif defined(__DJGPP__)
|
||||
# define WATT32
|
||||
# define WATT32_NO_OLDIES
|
||||
# define get_last_socket_error() errno
|
||||
# define clear_socket_error() errno=0
|
||||
# define closesocket(s) close_s(s)
|
||||
# define readsocket(s,b,n) read_s(s,b,n)
|
||||
# define writesocket(s,b,n) send(s,b,n,0)
|
||||
# elif defined(OPENSSL_SYS_VMS)
|
||||
# define get_last_socket_error() errno
|
||||
# define clear_socket_error() errno=0
|
||||
# define ioctlsocket(a,b,c) ioctl(a,b,c)
|
||||
# define closesocket(s) close(s)
|
||||
# define readsocket(s,b,n) recv((s),(b),(n),0)
|
||||
# define writesocket(s,b,n) send((s),(b),(n),0)
|
||||
# elif defined(OPENSSL_SYS_VXWORKS)
|
||||
# define get_last_socket_error() errno
|
||||
# define clear_socket_error() errno=0
|
||||
# define ioctlsocket(a,b,c) ioctl((a),(b),(int)(c))
|
||||
# define closesocket(s) close(s)
|
||||
# define readsocket(s,b,n) read((s),(b),(n))
|
||||
# define writesocket(s,b,n) write((s),(char *)(b),(n))
|
||||
# else
|
||||
# define get_last_socket_error() errno
|
||||
# define clear_socket_error() errno=0
|
||||
# define ioctlsocket(a,b,c) ioctl(a,b,c)
|
||||
# define closesocket(s) close(s)
|
||||
# define readsocket(s,b,n) read((s),(b),(n))
|
||||
# define writesocket(s,b,n) write((s),(b),(n))
|
||||
# endif
|
||||
|
||||
# if (defined(WINDOWS) || defined(MSDOS))
|
||||
@@ -147,10 +83,6 @@ extern "C" {
|
||||
# ifdef __DJGPP__
|
||||
# include <unistd.h>
|
||||
# include <sys/stat.h>
|
||||
# include <sys/socket.h>
|
||||
# include <sys/un.h>
|
||||
# include <tcp.h>
|
||||
# include <netdb.h>
|
||||
# define _setmode setmode
|
||||
# define _O_TEXT O_TEXT
|
||||
# define _O_BINARY O_BINARY
|
||||
@@ -220,14 +152,6 @@ static __inline unsigned int _strlen31(const char *str)
|
||||
}
|
||||
# endif
|
||||
# include <malloc.h>
|
||||
# if defined(_MSC_VER) && _MSC_VER<=1200 && defined(_MT) && defined(isspace)
|
||||
/* compensate for bug in VC6 ctype.h */
|
||||
# undef isspace
|
||||
# undef isdigit
|
||||
# undef isalnum
|
||||
# undef isupper
|
||||
# undef isxdigit
|
||||
# endif
|
||||
# if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(_DLL) && defined(stdin)
|
||||
# if _MSC_VER>=1300 && _MSC_VER<1600
|
||||
# undef stdin
|
||||
@@ -264,9 +188,6 @@ extern FILE *_imp___iob;
|
||||
|
||||
# define EXIT(n) exit(n)
|
||||
# define LIST_SEPARATOR_CHAR ';'
|
||||
# ifndef X_OK
|
||||
# define X_OK 0
|
||||
# endif
|
||||
# ifndef W_OK
|
||||
# define W_OK 2
|
||||
# endif
|
||||
@@ -290,6 +211,12 @@ extern FILE *_imp___iob;
|
||||
|
||||
# else /* The non-microsoft world */
|
||||
|
||||
# if defined(OPENSSL_SYS_VXWORKS)
|
||||
# include <sys/times.h>
|
||||
# else
|
||||
# include <sys/time.h>
|
||||
# endif
|
||||
|
||||
# ifdef OPENSSL_SYS_VMS
|
||||
# define VMS 1
|
||||
/*
|
||||
@@ -331,9 +258,6 @@ extern FILE *_imp___iob;
|
||||
*/
|
||||
# define EXIT(n) exit((n) ? (((n) << 3) | 2 | 0x10000000 | 0x35a000) : 1)
|
||||
|
||||
# define NO_SYS_PARAM_H
|
||||
# define NO_SYS_UN_H
|
||||
|
||||
# define DEFAULT_HOME "SYS$LOGIN:"
|
||||
|
||||
# else
|
||||
@@ -355,124 +279,6 @@ extern FILE *_imp___iob;
|
||||
|
||||
# endif
|
||||
|
||||
/*************/
|
||||
|
||||
# ifdef USE_SOCKETS
|
||||
# ifdef OPENSSL_NO_SOCK
|
||||
# elif defined(WINDOWS) || defined(MSDOS)
|
||||
/* windows world */
|
||||
# if !defined(__DJGPP__)
|
||||
# if defined(_WIN32_WCE) && _WIN32_WCE<410
|
||||
# define getservbyname _masked_declaration_getservbyname
|
||||
# endif
|
||||
# if !defined(IPPROTO_IP)
|
||||
/* winsock[2].h was included already? */
|
||||
# include <winsock.h>
|
||||
# endif
|
||||
# ifdef getservbyname
|
||||
# undef getservbyname
|
||||
/* this is used to be wcecompat/include/winsock_extras.h */
|
||||
struct servent *PASCAL getservbyname(const char *, const char *);
|
||||
# endif
|
||||
|
||||
# ifdef _WIN64
|
||||
/*
|
||||
* Even though sizeof(SOCKET) is 8, it's safe to cast it to int, because
|
||||
* the value constitutes an index in per-process table of limited size
|
||||
* and not a real pointer. And we also depend on fact that all processors
|
||||
* Windows run on happen to be two's-complement, which allows to
|
||||
* interchange INVALID_SOCKET and -1.
|
||||
*/
|
||||
# define socket(d,t,p) ((int)socket(d,t,p))
|
||||
# define accept(s,f,l) ((int)accept(s,f,l))
|
||||
# endif
|
||||
# else
|
||||
# endif
|
||||
|
||||
# else
|
||||
|
||||
# ifndef NO_SYS_PARAM_H
|
||||
# include <sys/param.h>
|
||||
# endif
|
||||
# ifdef OPENSSL_SYS_VXWORKS
|
||||
# include <time.h>
|
||||
# endif
|
||||
|
||||
# include <netdb.h>
|
||||
# if defined(OPENSSL_SYS_VMS_NODECC)
|
||||
# include <socket.h>
|
||||
# include <in.h>
|
||||
# include <inet.h>
|
||||
# else
|
||||
# include <sys/socket.h>
|
||||
# ifndef NO_SYS_UN_H
|
||||
# ifdef OPENSSL_SYS_VXWORKS
|
||||
# include <streams/un.h>
|
||||
# else
|
||||
# include <sys/un.h>
|
||||
# endif
|
||||
# ifndef UNIX_PATH_MAX
|
||||
# define UNIX_PATH_MAX sizeof(((struct sockaddr_un *)NULL)->sun_path)
|
||||
# endif
|
||||
# endif
|
||||
# ifdef FILIO_H
|
||||
# include <sys/filio.h> /* FIONBIO in some SVR4, e.g. unixware, solaris */
|
||||
# endif
|
||||
# include <netinet/in.h>
|
||||
# include <arpa/inet.h>
|
||||
# include <netinet/tcp.h>
|
||||
# endif
|
||||
|
||||
# ifdef OPENSSL_SYS_AIX
|
||||
# include <sys/select.h>
|
||||
# endif
|
||||
|
||||
# ifdef __QNX__
|
||||
# include <sys/select.h>
|
||||
# endif
|
||||
|
||||
# ifndef VMS
|
||||
# include <sys/ioctl.h>
|
||||
# else
|
||||
/* ioctl is only in VMS > 7.0 and when socketshr is not used */
|
||||
# if !defined(TCPIP_TYPE_SOCKETSHR) && defined(__VMS_VER) && (__VMS_VER > 70000000)
|
||||
# include <sys/ioctl.h>
|
||||
# endif
|
||||
# endif
|
||||
|
||||
# ifdef VMS
|
||||
# include <unixio.h>
|
||||
# if defined(TCPIP_TYPE_SOCKETSHR)
|
||||
# include <socketshr.h>
|
||||
# endif
|
||||
# endif
|
||||
|
||||
# ifndef INVALID_SOCKET
|
||||
# define INVALID_SOCKET (-1)
|
||||
# endif /* INVALID_SOCKET */
|
||||
# endif
|
||||
|
||||
/*
|
||||
* Some IPv6 implementations are broken, disable them in known bad versions.
|
||||
*/
|
||||
# if !defined(OPENSSL_USE_IPV6)
|
||||
# if defined(AF_INET6) && !defined(NETWARE_CLIB)
|
||||
# define OPENSSL_USE_IPV6 1
|
||||
# else
|
||||
# define OPENSSL_USE_IPV6 0
|
||||
# endif
|
||||
# endif
|
||||
|
||||
# endif
|
||||
|
||||
# ifndef OPENSSL_EXIT
|
||||
# if defined(MONOLITH) && !defined(OPENSSL_C)
|
||||
# define OPENSSL_EXIT(n) return(n)
|
||||
# else
|
||||
# define OPENSSL_EXIT(n) do { EXIT(n); return(n); } while(0)
|
||||
# endif
|
||||
# endif
|
||||
|
||||
/***********************************************/
|
||||
|
||||
# if defined(OPENSSL_SYS_WINDOWS)
|
||||
@@ -486,6 +292,7 @@ struct servent *PASCAL getservbyname(const char *, const char *);
|
||||
# define strdup _strdup
|
||||
# endif
|
||||
# define unlink _unlink
|
||||
# define fileno _fileno
|
||||
# endif
|
||||
# else
|
||||
# include <strings.h>
|
||||
@@ -496,20 +303,16 @@ struct servent *PASCAL getservbyname(const char *, const char *);
|
||||
# include <ioLib.h>
|
||||
# include <tickLib.h>
|
||||
# include <sysLib.h>
|
||||
|
||||
# define TTY_STRUCT int
|
||||
|
||||
# define sleep(a) taskDelay((a) * sysClkRateGet())
|
||||
|
||||
# include <vxWorks.h>
|
||||
# include <sockLib.h>
|
||||
# include <taskLib.h>
|
||||
|
||||
# define getpid taskIdSelf
|
||||
# define TTY_STRUCT int
|
||||
# define sleep(a) taskDelay((a) * sysClkRateGet())
|
||||
|
||||
/*
|
||||
* NOTE: these are implemented by helpers in database app! if the database is
|
||||
* not linked, we need to implement them elswhere
|
||||
* not linked, we need to implement them elsewhere
|
||||
*/
|
||||
struct hostent *gethostbyname(const char *name);
|
||||
struct hostent *gethostbyaddr(const char *addr, int length, int type);
|
||||
@@ -518,7 +321,9 @@ struct servent *getservbyname(const char *name, const char *proto);
|
||||
# endif
|
||||
/* end vxworks */
|
||||
|
||||
#define OSSL_NELEM(x) (sizeof(x)/sizeof((x)[0]))
|
||||
#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
|
||||
# define CRYPTO_memcmp memcmp
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user