From b8d0226baeb7d192c015a0db36bb7d77f17b744c Mon Sep 17 00:00:00 2001 From: beck <> Date: Sun, 13 Apr 2014 19:50:56 +0000 Subject: Remove some stuff that isn't needed. ok miod@ deraadt@ --- src/lib/libcrypto/bio/bio_cb.c | 4 +- src/lib/libcrypto/bio/bss_file.c | 28 +- src/lib/libcrypto/bio/bss_log.c | 20 +- src/lib/libcrypto/cryptlib.c | 14 +- src/lib/libcrypto/objects/obj_dat.c | 2 +- src/lib/libcrypto/rand/randfile.c | 2 +- src/lib/libssl/src/crypto/bio/bio_cb.c | 4 +- src/lib/libssl/src/crypto/bio/bss_file.c | 28 +- src/lib/libssl/src/crypto/bio/bss_log.c | 20 +- src/lib/libssl/src/crypto/cryptlib.c | 14 +- src/lib/libssl/src/crypto/objects/obj_dat.c | 2 +- src/lib/libssl/src/crypto/rand/randfile.c | 2 +- src/lib/libssl/src/e_os.h | 589 +--------------------------- 13 files changed, 72 insertions(+), 657 deletions(-) (limited to 'src') diff --git a/src/lib/libcrypto/bio/bio_cb.c b/src/lib/libcrypto/bio/bio_cb.c index 9bcbc321d9..7334a254bf 100644 --- a/src/lib/libcrypto/bio/bio_cb.c +++ b/src/lib/libcrypto/bio/bio_cb.c @@ -63,11 +63,11 @@ #include #include -long MS_CALLBACK BIO_debug_callback(BIO *bio, int cmd, const char *argp, +long BIO_debug_callback(BIO *bio, int cmd, const char *argp, int argi, long argl, long ret) { BIO *b; - MS_STATIC char buf[256]; + char buf[256]; char *p; long r=1; size_t p_maxlen; diff --git a/src/lib/libcrypto/bio/bss_file.c b/src/lib/libcrypto/bio/bss_file.c index b954fe7ebc..4a4e747bc7 100644 --- a/src/lib/libcrypto/bio/bss_file.c +++ b/src/lib/libcrypto/bio/bss_file.c @@ -95,13 +95,13 @@ #if !defined(OPENSSL_NO_STDIO) -static int MS_CALLBACK file_write(BIO *h, const char *buf, int num); -static int MS_CALLBACK file_read(BIO *h, char *buf, int size); -static int MS_CALLBACK file_puts(BIO *h, const char *str); -static int MS_CALLBACK file_gets(BIO *h, char *str, int size); -static long MS_CALLBACK file_ctrl(BIO *h, int cmd, long arg1, void *arg2); -static int MS_CALLBACK file_new(BIO *h); -static int MS_CALLBACK file_free(BIO *data); +static int file_write(BIO *h, const char *buf, int num); +static int file_read(BIO *h, char *buf, int size); +static int file_puts(BIO *h, const char *str); +static int file_gets(BIO *h, char *str, int size); +static long file_ctrl(BIO *h, int cmd, long arg1, void *arg2); +static int file_new(BIO *h); +static int file_free(BIO *data); static BIO_METHOD methods_filep= { BIO_TYPE_FILE, @@ -202,7 +202,7 @@ BIO_METHOD *BIO_s_file(void) return(&methods_filep); } -static int MS_CALLBACK file_new(BIO *bi) +static int file_new(BIO *bi) { bi->init=0; bi->num=0; @@ -211,7 +211,7 @@ static int MS_CALLBACK file_new(BIO *bi) return(1); } -static int MS_CALLBACK file_free(BIO *a) +static int file_free(BIO *a) { if (a == NULL) return(0); if (a->shutdown) @@ -230,7 +230,7 @@ static int MS_CALLBACK file_free(BIO *a) return(1); } -static int MS_CALLBACK file_read(BIO *b, char *out, int outl) +static int file_read(BIO *b, char *out, int outl) { int ret=0; @@ -250,7 +250,7 @@ static int MS_CALLBACK file_read(BIO *b, char *out, int outl) return(ret); } -static int MS_CALLBACK file_write(BIO *b, const char *in, int inl) +static int file_write(BIO *b, const char *in, int inl) { int ret=0; @@ -270,7 +270,7 @@ static int MS_CALLBACK file_write(BIO *b, const char *in, int inl) return(ret); } -static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr) +static long file_ctrl(BIO *b, int cmd, long num, void *ptr) { long ret=1; FILE *fp=(FILE *)b->ptr; @@ -440,7 +440,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr) return(ret); } -static int MS_CALLBACK file_gets(BIO *bp, char *buf, int size) +static int file_gets(BIO *bp, char *buf, int size) { int ret=0; @@ -461,7 +461,7 @@ static int MS_CALLBACK file_gets(BIO *bp, char *buf, int size) return(ret); } -static int MS_CALLBACK file_puts(BIO *bp, const char *str) +static int file_puts(BIO *bp, const char *str) { int n,ret; diff --git a/src/lib/libcrypto/bio/bss_log.c b/src/lib/libcrypto/bio/bss_log.c index 2227b2b52d..1cc413a916 100644 --- a/src/lib/libcrypto/bio/bss_log.c +++ b/src/lib/libcrypto/bio/bss_log.c @@ -122,11 +122,11 @@ #define LOG_DAEMON OPC$M_NM_NTWORK #endif -static int MS_CALLBACK slg_write(BIO *h, const char *buf, int num); -static int MS_CALLBACK slg_puts(BIO *h, const char *str); -static long MS_CALLBACK slg_ctrl(BIO *h, int cmd, long arg1, void *arg2); -static int MS_CALLBACK slg_new(BIO *h); -static int MS_CALLBACK slg_free(BIO *data); +static int slg_write(BIO *h, const char *buf, int num); +static int slg_puts(BIO *h, const char *str); +static long slg_ctrl(BIO *h, int cmd, long arg1, void *arg2); +static int slg_new(BIO *h); +static int slg_free(BIO *data); static void xopenlog(BIO* bp, char* name, int level); static void xsyslog(BIO* bp, int priority, const char* string); static void xcloselog(BIO* bp); @@ -149,7 +149,7 @@ BIO_METHOD *BIO_s_log(void) return(&methods_slg); } -static int MS_CALLBACK slg_new(BIO *bi) +static int slg_new(BIO *bi) { bi->init=1; bi->num=0; @@ -158,14 +158,14 @@ static int MS_CALLBACK slg_new(BIO *bi) return(1); } -static int MS_CALLBACK slg_free(BIO *a) +static int slg_free(BIO *a) { if (a == NULL) return(0); xcloselog(a); return(1); } -static int MS_CALLBACK slg_write(BIO *b, const char *in, int inl) +static int slg_write(BIO *b, const char *in, int inl) { int ret= inl; char* buf; @@ -218,7 +218,7 @@ static int MS_CALLBACK slg_write(BIO *b, const char *in, int inl) return(ret); } -static long MS_CALLBACK slg_ctrl(BIO *b, int cmd, long num, void *ptr) +static long slg_ctrl(BIO *b, int cmd, long num, void *ptr) { switch (cmd) { @@ -232,7 +232,7 @@ static long MS_CALLBACK slg_ctrl(BIO *b, int cmd, long num, void *ptr) return(0); } -static int MS_CALLBACK slg_puts(BIO *bp, const char *str) +static int slg_puts(BIO *bp, const char *str) { int n,ret; diff --git a/src/lib/libcrypto/cryptlib.c b/src/lib/libcrypto/cryptlib.c index 0b77d8b7d0..082b2e88ee 100644 --- a/src/lib/libcrypto/cryptlib.c +++ b/src/lib/libcrypto/cryptlib.c @@ -182,19 +182,19 @@ static STACK_OF(OPENSSL_STRING) *app_locks=NULL; static STACK_OF(CRYPTO_dynlock) *dyn_locks=NULL; -static void (MS_FAR *locking_callback)(int mode,int type, +static void (*locking_callback)(int mode,int type, const char *file,int line)=0; -static int (MS_FAR *add_lock_callback)(int *pointer,int amount, +static int (*add_lock_callback)(int *pointer,int amount, int type,const char *file,int line)=0; #ifndef OPENSSL_NO_DEPRECATED -static unsigned long (MS_FAR *id_callback)(void)=0; +static unsigned long (*id_callback)(void)=0; #endif -static void (MS_FAR *threadid_callback)(CRYPTO_THREADID *)=0; -static struct CRYPTO_dynlock_value *(MS_FAR *dynlock_create_callback) +static void (*threadid_callback)(CRYPTO_THREADID *)=0; +static struct CRYPTO_dynlock_value *(*dynlock_create_callback) (const char *file,int line)=0; -static void (MS_FAR *dynlock_lock_callback)(int mode, +static void (*dynlock_lock_callback)(int mode, struct CRYPTO_dynlock_value *l, const char *file,int line)=0; -static void (MS_FAR *dynlock_destroy_callback)(struct CRYPTO_dynlock_value *l, +static void (*dynlock_destroy_callback)(struct CRYPTO_dynlock_value *l, const char *file,int line)=0; int CRYPTO_get_new_lockid(char *name) diff --git a/src/lib/libcrypto/objects/obj_dat.c b/src/lib/libcrypto/objects/obj_dat.c index 8a342ba3eb..99646c300c 100644 --- a/src/lib/libcrypto/objects/obj_dat.c +++ b/src/lib/libcrypto/objects/obj_dat.c @@ -734,7 +734,7 @@ const void *OBJ_bsearch_ex_(const void *key, const void *base_, int num, int OBJ_create_objects(BIO *in) { - MS_STATIC char buf[512]; + char buf[512]; int i,num=0; char *o,*s,*l=NULL; diff --git a/src/lib/libcrypto/rand/randfile.c b/src/lib/libcrypto/rand/randfile.c index 7f1428072d..10d511b8e8 100644 --- a/src/lib/libcrypto/rand/randfile.c +++ b/src/lib/libcrypto/rand/randfile.c @@ -110,7 +110,7 @@ int RAND_load_file(const char *file, long bytes) /* If bytes >= 0, read up to 'bytes' bytes. * if bytes == -1, read complete file. */ - MS_STATIC unsigned char buf[BUFSIZE]; + unsigned char buf[BUFSIZE]; #ifndef OPENSSL_NO_POSIX_IO struct stat sb; #endif diff --git a/src/lib/libssl/src/crypto/bio/bio_cb.c b/src/lib/libssl/src/crypto/bio/bio_cb.c index 9bcbc321d9..7334a254bf 100644 --- a/src/lib/libssl/src/crypto/bio/bio_cb.c +++ b/src/lib/libssl/src/crypto/bio/bio_cb.c @@ -63,11 +63,11 @@ #include #include -long MS_CALLBACK BIO_debug_callback(BIO *bio, int cmd, const char *argp, +long BIO_debug_callback(BIO *bio, int cmd, const char *argp, int argi, long argl, long ret) { BIO *b; - MS_STATIC char buf[256]; + char buf[256]; char *p; long r=1; size_t p_maxlen; diff --git a/src/lib/libssl/src/crypto/bio/bss_file.c b/src/lib/libssl/src/crypto/bio/bss_file.c index b954fe7ebc..4a4e747bc7 100644 --- a/src/lib/libssl/src/crypto/bio/bss_file.c +++ b/src/lib/libssl/src/crypto/bio/bss_file.c @@ -95,13 +95,13 @@ #if !defined(OPENSSL_NO_STDIO) -static int MS_CALLBACK file_write(BIO *h, const char *buf, int num); -static int MS_CALLBACK file_read(BIO *h, char *buf, int size); -static int MS_CALLBACK file_puts(BIO *h, const char *str); -static int MS_CALLBACK file_gets(BIO *h, char *str, int size); -static long MS_CALLBACK file_ctrl(BIO *h, int cmd, long arg1, void *arg2); -static int MS_CALLBACK file_new(BIO *h); -static int MS_CALLBACK file_free(BIO *data); +static int file_write(BIO *h, const char *buf, int num); +static int file_read(BIO *h, char *buf, int size); +static int file_puts(BIO *h, const char *str); +static int file_gets(BIO *h, char *str, int size); +static long file_ctrl(BIO *h, int cmd, long arg1, void *arg2); +static int file_new(BIO *h); +static int file_free(BIO *data); static BIO_METHOD methods_filep= { BIO_TYPE_FILE, @@ -202,7 +202,7 @@ BIO_METHOD *BIO_s_file(void) return(&methods_filep); } -static int MS_CALLBACK file_new(BIO *bi) +static int file_new(BIO *bi) { bi->init=0; bi->num=0; @@ -211,7 +211,7 @@ static int MS_CALLBACK file_new(BIO *bi) return(1); } -static int MS_CALLBACK file_free(BIO *a) +static int file_free(BIO *a) { if (a == NULL) return(0); if (a->shutdown) @@ -230,7 +230,7 @@ static int MS_CALLBACK file_free(BIO *a) return(1); } -static int MS_CALLBACK file_read(BIO *b, char *out, int outl) +static int file_read(BIO *b, char *out, int outl) { int ret=0; @@ -250,7 +250,7 @@ static int MS_CALLBACK file_read(BIO *b, char *out, int outl) return(ret); } -static int MS_CALLBACK file_write(BIO *b, const char *in, int inl) +static int file_write(BIO *b, const char *in, int inl) { int ret=0; @@ -270,7 +270,7 @@ static int MS_CALLBACK file_write(BIO *b, const char *in, int inl) return(ret); } -static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr) +static long file_ctrl(BIO *b, int cmd, long num, void *ptr) { long ret=1; FILE *fp=(FILE *)b->ptr; @@ -440,7 +440,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr) return(ret); } -static int MS_CALLBACK file_gets(BIO *bp, char *buf, int size) +static int file_gets(BIO *bp, char *buf, int size) { int ret=0; @@ -461,7 +461,7 @@ static int MS_CALLBACK file_gets(BIO *bp, char *buf, int size) return(ret); } -static int MS_CALLBACK file_puts(BIO *bp, const char *str) +static int file_puts(BIO *bp, const char *str) { int n,ret; diff --git a/src/lib/libssl/src/crypto/bio/bss_log.c b/src/lib/libssl/src/crypto/bio/bss_log.c index 2227b2b52d..1cc413a916 100644 --- a/src/lib/libssl/src/crypto/bio/bss_log.c +++ b/src/lib/libssl/src/crypto/bio/bss_log.c @@ -122,11 +122,11 @@ #define LOG_DAEMON OPC$M_NM_NTWORK #endif -static int MS_CALLBACK slg_write(BIO *h, const char *buf, int num); -static int MS_CALLBACK slg_puts(BIO *h, const char *str); -static long MS_CALLBACK slg_ctrl(BIO *h, int cmd, long arg1, void *arg2); -static int MS_CALLBACK slg_new(BIO *h); -static int MS_CALLBACK slg_free(BIO *data); +static int slg_write(BIO *h, const char *buf, int num); +static int slg_puts(BIO *h, const char *str); +static long slg_ctrl(BIO *h, int cmd, long arg1, void *arg2); +static int slg_new(BIO *h); +static int slg_free(BIO *data); static void xopenlog(BIO* bp, char* name, int level); static void xsyslog(BIO* bp, int priority, const char* string); static void xcloselog(BIO* bp); @@ -149,7 +149,7 @@ BIO_METHOD *BIO_s_log(void) return(&methods_slg); } -static int MS_CALLBACK slg_new(BIO *bi) +static int slg_new(BIO *bi) { bi->init=1; bi->num=0; @@ -158,14 +158,14 @@ static int MS_CALLBACK slg_new(BIO *bi) return(1); } -static int MS_CALLBACK slg_free(BIO *a) +static int slg_free(BIO *a) { if (a == NULL) return(0); xcloselog(a); return(1); } -static int MS_CALLBACK slg_write(BIO *b, const char *in, int inl) +static int slg_write(BIO *b, const char *in, int inl) { int ret= inl; char* buf; @@ -218,7 +218,7 @@ static int MS_CALLBACK slg_write(BIO *b, const char *in, int inl) return(ret); } -static long MS_CALLBACK slg_ctrl(BIO *b, int cmd, long num, void *ptr) +static long slg_ctrl(BIO *b, int cmd, long num, void *ptr) { switch (cmd) { @@ -232,7 +232,7 @@ static long MS_CALLBACK slg_ctrl(BIO *b, int cmd, long num, void *ptr) return(0); } -static int MS_CALLBACK slg_puts(BIO *bp, const char *str) +static int slg_puts(BIO *bp, const char *str) { int n,ret; diff --git a/src/lib/libssl/src/crypto/cryptlib.c b/src/lib/libssl/src/crypto/cryptlib.c index 0b77d8b7d0..082b2e88ee 100644 --- a/src/lib/libssl/src/crypto/cryptlib.c +++ b/src/lib/libssl/src/crypto/cryptlib.c @@ -182,19 +182,19 @@ static STACK_OF(OPENSSL_STRING) *app_locks=NULL; static STACK_OF(CRYPTO_dynlock) *dyn_locks=NULL; -static void (MS_FAR *locking_callback)(int mode,int type, +static void (*locking_callback)(int mode,int type, const char *file,int line)=0; -static int (MS_FAR *add_lock_callback)(int *pointer,int amount, +static int (*add_lock_callback)(int *pointer,int amount, int type,const char *file,int line)=0; #ifndef OPENSSL_NO_DEPRECATED -static unsigned long (MS_FAR *id_callback)(void)=0; +static unsigned long (*id_callback)(void)=0; #endif -static void (MS_FAR *threadid_callback)(CRYPTO_THREADID *)=0; -static struct CRYPTO_dynlock_value *(MS_FAR *dynlock_create_callback) +static void (*threadid_callback)(CRYPTO_THREADID *)=0; +static struct CRYPTO_dynlock_value *(*dynlock_create_callback) (const char *file,int line)=0; -static void (MS_FAR *dynlock_lock_callback)(int mode, +static void (*dynlock_lock_callback)(int mode, struct CRYPTO_dynlock_value *l, const char *file,int line)=0; -static void (MS_FAR *dynlock_destroy_callback)(struct CRYPTO_dynlock_value *l, +static void (*dynlock_destroy_callback)(struct CRYPTO_dynlock_value *l, const char *file,int line)=0; int CRYPTO_get_new_lockid(char *name) diff --git a/src/lib/libssl/src/crypto/objects/obj_dat.c b/src/lib/libssl/src/crypto/objects/obj_dat.c index 8a342ba3eb..99646c300c 100644 --- a/src/lib/libssl/src/crypto/objects/obj_dat.c +++ b/src/lib/libssl/src/crypto/objects/obj_dat.c @@ -734,7 +734,7 @@ const void *OBJ_bsearch_ex_(const void *key, const void *base_, int num, int OBJ_create_objects(BIO *in) { - MS_STATIC char buf[512]; + char buf[512]; int i,num=0; char *o,*s,*l=NULL; diff --git a/src/lib/libssl/src/crypto/rand/randfile.c b/src/lib/libssl/src/crypto/rand/randfile.c index 7f1428072d..10d511b8e8 100644 --- a/src/lib/libssl/src/crypto/rand/randfile.c +++ b/src/lib/libssl/src/crypto/rand/randfile.c @@ -110,7 +110,7 @@ int RAND_load_file(const char *file, long bytes) /* If bytes >= 0, read up to 'bytes' bytes. * if bytes == -1, read complete file. */ - MS_STATIC unsigned char buf[BUFSIZE]; + unsigned char buf[BUFSIZE]; #ifndef OPENSSL_NO_POSIX_IO struct stat sb; #endif diff --git a/src/lib/libssl/src/e_os.h b/src/lib/libssl/src/e_os.h index 6a0aad1de7..5131b41495 100644 --- a/src/lib/libssl/src/e_os.h +++ b/src/lib/libssl/src/e_os.h @@ -88,534 +88,36 @@ extern "C" { #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 -# define NO_CHMOD -# define NO_SYSLOG -#endif - -#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC) -# if macintosh==1 -# ifndef MAC_OS_GUSI_SOURCE -# define MAC_OS_pre_X -# define NO_SYS_TYPES_H -# endif -# define NO_SYS_PARAM_H -# define NO_CHMOD -# define NO_SYSLOG -# undef DEVRANDOM -# define GETPID_IS_MEANINGLESS -# endif -#endif - -/******************************************************************** - The Microsoft section - ********************************************************************/ -/* The following is used because of the small stack in some - * Microsoft operating systems */ -#if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYSNAME_WIN32) -# define MS_STATIC static -#else -# define MS_STATIC -#endif - -#if defined(OPENSSL_SYS_WIN32) && !defined(WIN32) -# define WIN32 -#endif -#if defined(OPENSSL_SYS_WINDOWS) && !defined(WINDOWS) -# define WINDOWS -#endif -#if defined(OPENSSL_SYS_MSDOS) && !defined(MSDOS) -# define MSDOS -#endif - -#if defined(MSDOS) && !defined(GETPID_IS_MEANINGLESS) -# define GETPID_IS_MEANINGLESS -#endif - -#ifdef WIN32 -#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 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(MAC_OS_pre_X) -#define get_last_socket_error() errno -#define clear_socket_error() errno=0 -#define closesocket(s) MacSocket_close(s) -#define readsocket(s,b,n) MacSocket_recv((s),(b),(n),true) -#define writesocket(s,b,n) MacSocket_send((s),(b),(n)) -#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)) -#elif defined(OPENSSL_SYS_BEOS_R5) -#define get_last_socket_error() errno -#define clear_socket_error() errno=0 -#define FIONBIO SO_NONBLOCK -#define ioctlsocket(a,b,c) setsockopt((a),SOL_SOCKET,(b),(c),sizeof(*(c))) -#define readsocket(s,b,n) recv((s),(b),(n),0) -#define writesocket(s,b,n) send((s),(b),(n),0) -#elif defined(OPENSSL_SYS_NETWARE) -#if defined(NETWARE_BSDSOCK) -#define get_last_socket_error() errno -#define clear_socket_error() errno=0 -#define closesocket(s) close(s) -#define ioctlsocket(a,b,c) ioctl(a,b,c) -#if defined(NETWARE_LIBC) -#define readsocket(s,b,n) recv((s),(b),(n),0) -#define writesocket(s,b,n) send((s),(b),(n),0) -#else -#define readsocket(s,b,n) recv((s),(char*)(b),(n),0) -#define writesocket(s,b,n) send((s),(char*)(b),(n),0) -#endif -#else -#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) -#endif -#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 - -#ifdef WIN16 /* never the case */ -# define MS_CALLBACK _far _loadds -# define MS_FAR _far -#else -# define MS_CALLBACK -# define MS_FAR -#endif - -#ifdef OPENSSL_NO_STDIO -# undef OPENSSL_NO_FP_API -# define OPENSSL_NO_FP_API -#endif - -#if (defined(WINDOWS) || defined(MSDOS)) - -# ifdef __DJGPP__ -# include -# include -# include -# include -# include -# define _setmode setmode -# define _O_TEXT O_TEXT -# define _O_BINARY O_BINARY -# undef DEVRANDOM -# define DEVRANDOM "/dev/urandom\x24" -# endif /* __DJGPP__ */ - -# ifndef S_IFDIR -# define S_IFDIR _S_IFDIR -# endif - -# ifndef S_IFMT -# define S_IFMT _S_IFMT -# endif -# if !defined(WINNT) && !defined(__DJGPP__) -# define NO_SYSLOG -# endif -# define NO_DIRENT - -# ifdef WINDOWS -# if !defined(_WIN32_WCE) && !defined(_WIN32_WINNT) - /* - * Defining _WIN32_WINNT here in e_os.h implies certain "discipline." - * Most notably we ought to check for availability of each specific - * routine with GetProcAddress() and/or guard NT-specific calls with - * GetVersion() < 0x80000000. One can argue that in latter "or" case - * we ought to /DELAYLOAD some .DLLs in order to protect ourselves - * against run-time link errors. This doesn't seem to be necessary, - * because it turned out that already Windows 95, first non-NT Win32 - * implementation, is equipped with at least NT 3.51 stubs, dummy - * routines with same name, but which do nothing. Meaning that it's - * apparently sufficient to guard "vanilla" NT calls with GetVersion - * alone, while NT 4.0 and above interfaces ought to be linked with - * GetProcAddress at run-time. - */ -# define _WIN32_WINNT 0x0400 -# endif -# if !defined(OPENSSL_NO_SOCK) && defined(_WIN32_WINNT) - /* - * Just like defining _WIN32_WINNT including winsock2.h implies - * certain "discipline" for maintaining [broad] binary compatibility. - * As long as structures are invariant among Winsock versions, - * it's sufficient to check for specific Winsock2 API availability - * at run-time [DSO_global_lookup is recommended]... - */ -# include -# include - /* yes, they have to be #included prior to */ -# endif -# include -# include -# include -# include -# include -# ifdef _WIN64 -# define strlen(s) _strlen31(s) -/* cut strings to 2GB */ -static unsigned int _strlen31(const char *str) - { - unsigned int len=0; - while (*str && len<0x80000000U) str++, len++; - return len&0x7FFFFFFF; - } -# endif -# include -# 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(_DLL) && defined(stdin) -# if _MSC_VER>=1300 -# undef stdin -# undef stdout -# undef stderr - FILE *__iob_func(); -# define stdin (&__iob_func()[0]) -# define stdout (&__iob_func()[1]) -# define stderr (&__iob_func()[2]) -# elif defined(I_CAN_LIVE_WITH_LNK4049) -# undef stdin -# undef stdout -# undef stderr - /* pre-1300 has __p__iob(), but it's available only in msvcrt.lib, - * or in other words with /MD. Declaring implicit import, i.e. - * with _imp_ prefix, works correctly with all compiler options, - * but without /MD results in LINK warning LNK4049: - * 'locally defined symbol "__iob" imported'. - */ - extern FILE *_imp___iob; -# define stdin (&_imp___iob[0]) -# define stdout (&_imp___iob[1]) -# define stderr (&_imp___iob[2]) -# endif -# endif -# endif -# include -# include - -# ifdef OPENSSL_SYS_WINCE -# define OPENSSL_NO_POSIX_IO -# endif - -# if defined (__BORLANDC__) -# define _setmode setmode -# define _O_TEXT O_TEXT -# define _O_BINARY O_BINARY -# define _int64 __int64 -# define _kbhit kbhit -# endif - -# 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 -# ifndef R_OK -# define R_OK 4 -# endif -# define OPENSSL_CONF "openssl.cnf" -# define SSLEAY_CONF OPENSSL_CONF -# define NUL_DEV "nul" -# define RFILE ".rnd" -# ifdef OPENSSL_SYS_WINCE -# define DEFAULT_HOME "" -# else -# define DEFAULT_HOME "C:" -# endif - -/* Avoid Windows 8 SDK GetVersion deprecated problems */ -#if defined(_MSC_VER) && _MSC_VER>=1800 -# define check_winnt() (1) -#else -# define check_winnt() (GetVersion() < 0x80000000) -#endif - -#else /* The non-microsoft world */ - -# ifdef OPENSSL_SYS_VMS -# define VMS 1 - /* some programs don't include stdlib, so exit() and others give implicit - function warnings */ -# include -# if defined(__DECC) -# include -# else -# include -# endif -# define OPENSSL_CONF "openssl.cnf" -# define SSLEAY_CONF OPENSSL_CONF -# define RFILE ".rnd" -# define LIST_SEPARATOR_CHAR ',' -# define NUL_DEV "NLA0:" - /* We don't have any well-defined random devices on VMS, yet... */ -# undef DEVRANDOM - /* We need to do this since VMS has the following coding on status codes: - - Bits 0-2: status type: 0 = warning, 1 = success, 2 = error, 3 = info ... - The important thing to know is that odd numbers are considered - good, while even ones are considered errors. - Bits 3-15: actual status number - Bits 16-27: facility number. 0 is considered "unknown" - Bits 28-31: control bits. If bit 28 is set, the shell won't try to - output the message (which, for random codes, just looks ugly) - - So, what we do here is to change 0 to 1 to get the default success status, - and everything else is shifted up to fit into the status number field, and - the status is tagged as an error, which I believe is what is wanted here. - -- Richard Levitte - */ -# define EXIT(n) do { int __VMS_EXIT = n; \ - if (__VMS_EXIT == 0) \ - __VMS_EXIT = 1; \ - else \ - __VMS_EXIT = (n << 3) | 2; \ - __VMS_EXIT |= 0x10000000; \ - exit(__VMS_EXIT); } while(0) -# define NO_SYS_PARAM_H - -# elif defined(OPENSSL_SYS_NETWARE) -# include -# include -# define NO_SYS_TYPES_H -# undef DEVRANDOM -# ifdef NETWARE_CLIB -# define getpid GetThreadID - extern int GetThreadID(void); -/* # include */ - extern int kbhit(void); -# else -# include -# endif -# define NO_SYSLOG -# define _setmode setmode -# define _kbhit kbhit -# define _O_TEXT O_TEXT -# define _O_BINARY O_BINARY -# define OPENSSL_CONF "openssl.cnf" -# define SSLEAY_CONF OPENSSL_CONF -# define RFILE ".rnd" -# define LIST_SEPARATOR_CHAR ';' -# define EXIT(n) { if (n) printf("ERROR: %d\n", (int)n); exit(n); } - -# else - /* !defined VMS */ -# ifdef OPENSSL_SYS_MPE -# define NO_SYS_PARAM_H -# endif -# ifdef OPENSSL_UNISTD -# include OPENSSL_UNISTD -# else # include -# endif -# ifndef NO_SYS_TYPES_H # include -# endif -# if defined(NeXT) || defined(OPENSSL_SYS_NEWS4) -# define pid_t int /* pid_t is missing on NEXTSTEP/OPENSTEP - * (unless when compiling with -D_POSIX_SOURCE, - * which doesn't work for us) */ -# endif -# ifdef OPENSSL_SYS_NEWS4 /* setvbuf is missing on mips-sony-bsd */ -# define setvbuf(a, b, c, d) setbuffer((a), (b), (d)) - typedef unsigned long clock_t; -# endif -# ifdef OPENSSL_SYS_WIN32_CYGWIN -# include -# include -# endif - # define OPENSSL_CONF "openssl.cnf" # define SSLEAY_CONF OPENSSL_CONF # define RFILE ".rnd" # define LIST_SEPARATOR_CHAR ':' # define NUL_DEV "/dev/null" # define EXIT(n) exit(n) -# endif - # define SSLeay_getpid() getpid() -#endif - - -/*************/ #ifdef USE_SOCKETS -# if defined(WINDOWS) || defined(MSDOS) - /* windows world */ - -# ifdef OPENSSL_NO_SOCK -# define SSLeay_Write(a,b,c) (-1) -# define SSLeay_Read(a,b,c) (-1) -# define SHUTDOWN(fd) close(fd) -# define SHUTDOWN2(fd) close(fd) -# elif !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 -# 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. - */ -# define socket(d,t,p) ((int)socket(d,t,p)) -# define accept(s,f,l) ((int)accept(s,f,l)) -# endif -# define SSLeay_Write(a,b,c) send((a),(b),(c),0) -# define SSLeay_Read(a,b,c) recv((a),(b),(c),0) -# define SHUTDOWN(fd) { shutdown((fd),0); closesocket(fd); } -# define SHUTDOWN2(fd) { shutdown((fd),2); closesocket(fd); } -# else -# define SSLeay_Write(a,b,c) write_s(a,b,c,0) -# define SSLeay_Read(a,b,c) read_s(a,b,c) -# define SHUTDOWN(fd) close_s(fd) -# define SHUTDOWN2(fd) close_s(fd) -# endif - -# elif defined(MAC_OS_pre_X) - -# include "MacSocket.h" -# define SSLeay_Write(a,b,c) MacSocket_send((a),(b),(c)) -# define SSLeay_Read(a,b,c) MacSocket_recv((a),(b),(c),true) -# define SHUTDOWN(fd) MacSocket_close(fd) -# define SHUTDOWN2(fd) MacSocket_close(fd) - -# elif defined(OPENSSL_SYS_NETWARE) - /* NetWare uses the WinSock2 interfaces by default, but can be configured for BSD - */ -# if defined(NETWARE_BSDSOCK) -# include -# include -# include -# if defined(NETWARE_CLIB) -# include -# else -# include -# endif -# define INVALID_SOCKET (int)(~0) -# else -# include -# endif -# define SSLeay_Write(a,b,c) send((a),(b),(c),0) -# define SSLeay_Read(a,b,c) recv((a),(b),(c),0) -# define SHUTDOWN(fd) { shutdown((fd),0); closesocket(fd); } -# define SHUTDOWN2(fd) { shutdown((fd),2); closesocket(fd); } - -# else - -# ifndef NO_SYS_PARAM_H # include -# endif -# ifdef OPENSSL_SYS_VXWORKS -# include -# elif !defined(OPENSSL_SYS_MPE) # include /* Needed under linux for FD_XXX */ -# endif - # include -# if defined(OPENSSL_SYS_VMS_NODECC) -# include -# include -# include -# else # include # ifdef FILIO_H # include /* Added for FIONBIO under unixware */ # endif # include -# if !defined(OPENSSL_SYS_BEOS_R5) -# include -# endif -# endif - -# if defined(NeXT) || defined(_NEXT_SOURCE) -# include -# include -# endif - -# ifdef OPENSSL_SYS_AIX -# include -# endif - -# ifdef __QNX__ -# include -# endif - -# if defined(sun) -# include -# else -# ifndef VMS # include -# 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 -# endif -# endif -# endif - -# ifdef VMS -# include -# if defined(TCPIP_TYPE_SOCKETSHR) -# include -# endif -# endif - # define SSLeay_Read(a,b,c) read((a),(b),(c)) # define SSLeay_Write(a,b,c) write((a),(b),(c)) # define SHUTDOWN(fd) { shutdown((fd),0); closesocket((fd)); } @@ -623,36 +125,19 @@ static unsigned int _strlen31(const char *str) # ifndef INVALID_SOCKET # define INVALID_SOCKET (-1) # endif /* INVALID_SOCKET */ -# endif +#endif /* Some IPv6 implementations are broken, disable them in known bad * versions. */ # if !defined(OPENSSL_USE_IPV6) -# if defined(AF_INET6) && !defined(OPENSSL_SYS_BEOS_BONE) && !defined(NETWARE_CLIB) +# if defined(AF_INET6) # define OPENSSL_USE_IPV6 1 # else # define OPENSSL_USE_IPV6 0 # endif # endif -#endif - -#if defined(sun) && !defined(__svr4__) && !defined(__SVR4) - /* include headers first, so our defines don't break it */ -#include -#include - /* bcopy can handle overlapping moves according to SunOS 4.1.4 manpage */ -# define memmove(s1,s2,n) bcopy((s2),(s1),(n)) -# define strtoul(s,e,b) ((unsigned long int)strtol((s),(e),(b))) -extern char *sys_errlist[]; extern int sys_nerr; -# define strerror(errnum) \ - (((errnum)<0 || (errnum)>=sys_nerr) ? NULL : sys_errlist[errnum]) - /* Being signed SunOS 4.x memcpy breaks ASN1_OBJECT table lookup */ -#include "crypto/o_str.h" -# define memcmp OPENSSL_memcmp -#endif - #ifndef OPENSSL_EXIT # if defined(MONOLITH) && !defined(OPENSSL_C) # define OPENSSL_EXIT(n) return(n) @@ -663,76 +148,6 @@ extern char *sys_errlist[]; extern int sys_nerr; /***********************************************/ -#define DG_GCC_BUG /* gcc < 2.6.3 on DGUX */ - -#ifdef sgi -#define IRIX_CC_BUG /* all version of IRIX I've tested (4.* 5.*) */ -#endif -#ifdef OPENSSL_SYS_SNI -#define IRIX_CC_BUG /* CDS++ up to V2.0Bsomething suffered from the same bug.*/ -#endif - -#if defined(OPENSSL_SYS_WINDOWS) -# define strcasecmp _stricmp -# define strncasecmp _strnicmp -#elif defined(OPENSSL_SYS_VMS) -/* VMS below version 7.0 doesn't have strcasecmp() */ -# include "o_str.h" -# define strcasecmp OPENSSL_strcasecmp -# define strncasecmp OPENSSL_strncasecmp -# define OPENSSL_IMPLEMENTS_strncasecmp -#elif defined(OPENSSL_SYS_OS2) && defined(__EMX__) -# define strcasecmp stricmp -# define strncasecmp strnicmp -#elif defined(OPENSSL_SYS_NETWARE) -# include -# if defined(NETWARE_CLIB) -# define strcasecmp stricmp -# define strncasecmp strnicmp -# endif /* NETWARE_CLIB */ -#endif - -#if defined(OPENSSL_SYS_OS2) && defined(__EMX__) -# include -# include -# define NO_SYSLOG -#endif - -/* vxworks */ -#if defined(OPENSSL_SYS_VXWORKS) -#include -#include -#include - -#define TTY_STRUCT int - -#define sleep(a) taskDelay((a) * sysClkRateGet()) - -#include -#include -#include - -#define getpid taskIdSelf - -/* NOTE: these are implemented by helpers in database app! - * if the database is not linked, we need to implement them - * elswhere */ -struct hostent *gethostbyname(const char *name); -struct hostent *gethostbyaddr(const char *addr, int length, int type); -struct servent *getservbyname(const char *name, const char *proto); - -#endif -/* end vxworks */ - -/* beos */ -#if defined(OPENSSL_SYS_BEOS_R5) -#define SO_ERROR 0 -#define NO_SYS_UN -#define IPPROTO_IP 0 -#include -#endif - - #ifdef __cplusplus } #endif -- cgit v1.2.3-55-g6feb