summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbeck <>2014-04-13 19:50:56 +0000
committerbeck <>2014-04-13 19:50:56 +0000
commitb8d0226baeb7d192c015a0db36bb7d77f17b744c (patch)
tree408fd582bdaae20967d5a427b44a92580d19a1e2 /src
parentda46bab8c0298f3edf0a0d6efc66fc7838b161e5 (diff)
downloadopenbsd-b8d0226baeb7d192c015a0db36bb7d77f17b744c.tar.gz
openbsd-b8d0226baeb7d192c015a0db36bb7d77f17b744c.tar.bz2
openbsd-b8d0226baeb7d192c015a0db36bb7d77f17b744c.zip
Remove some stuff that isn't needed.
ok miod@ deraadt@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/bio/bio_cb.c4
-rw-r--r--src/lib/libcrypto/bio/bss_file.c28
-rw-r--r--src/lib/libcrypto/bio/bss_log.c20
-rw-r--r--src/lib/libcrypto/cryptlib.c14
-rw-r--r--src/lib/libcrypto/objects/obj_dat.c2
-rw-r--r--src/lib/libcrypto/rand/randfile.c2
-rw-r--r--src/lib/libssl/src/crypto/bio/bio_cb.c4
-rw-r--r--src/lib/libssl/src/crypto/bio/bss_file.c28
-rw-r--r--src/lib/libssl/src/crypto/bio/bss_log.c20
-rw-r--r--src/lib/libssl/src/crypto/cryptlib.c14
-rw-r--r--src/lib/libssl/src/crypto/objects/obj_dat.c2
-rw-r--r--src/lib/libssl/src/crypto/rand/randfile.c2
-rw-r--r--src/lib/libssl/src/e_os.h589
13 files changed, 72 insertions, 657 deletions
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 @@
63#include <openssl/bio.h> 63#include <openssl/bio.h>
64#include <openssl/err.h> 64#include <openssl/err.h>
65 65
66long MS_CALLBACK BIO_debug_callback(BIO *bio, int cmd, const char *argp, 66long BIO_debug_callback(BIO *bio, int cmd, const char *argp,
67 int argi, long argl, long ret) 67 int argi, long argl, long ret)
68 { 68 {
69 BIO *b; 69 BIO *b;
70 MS_STATIC char buf[256]; 70 char buf[256];
71 char *p; 71 char *p;
72 long r=1; 72 long r=1;
73 size_t p_maxlen; 73 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 @@
95 95
96#if !defined(OPENSSL_NO_STDIO) 96#if !defined(OPENSSL_NO_STDIO)
97 97
98static int MS_CALLBACK file_write(BIO *h, const char *buf, int num); 98static int file_write(BIO *h, const char *buf, int num);
99static int MS_CALLBACK file_read(BIO *h, char *buf, int size); 99static int file_read(BIO *h, char *buf, int size);
100static int MS_CALLBACK file_puts(BIO *h, const char *str); 100static int file_puts(BIO *h, const char *str);
101static int MS_CALLBACK file_gets(BIO *h, char *str, int size); 101static int file_gets(BIO *h, char *str, int size);
102static long MS_CALLBACK file_ctrl(BIO *h, int cmd, long arg1, void *arg2); 102static long file_ctrl(BIO *h, int cmd, long arg1, void *arg2);
103static int MS_CALLBACK file_new(BIO *h); 103static int file_new(BIO *h);
104static int MS_CALLBACK file_free(BIO *data); 104static int file_free(BIO *data);
105static BIO_METHOD methods_filep= 105static BIO_METHOD methods_filep=
106 { 106 {
107 BIO_TYPE_FILE, 107 BIO_TYPE_FILE,
@@ -202,7 +202,7 @@ BIO_METHOD *BIO_s_file(void)
202 return(&methods_filep); 202 return(&methods_filep);
203 } 203 }
204 204
205static int MS_CALLBACK file_new(BIO *bi) 205static int file_new(BIO *bi)
206 { 206 {
207 bi->init=0; 207 bi->init=0;
208 bi->num=0; 208 bi->num=0;
@@ -211,7 +211,7 @@ static int MS_CALLBACK file_new(BIO *bi)
211 return(1); 211 return(1);
212 } 212 }
213 213
214static int MS_CALLBACK file_free(BIO *a) 214static int file_free(BIO *a)
215 { 215 {
216 if (a == NULL) return(0); 216 if (a == NULL) return(0);
217 if (a->shutdown) 217 if (a->shutdown)
@@ -230,7 +230,7 @@ static int MS_CALLBACK file_free(BIO *a)
230 return(1); 230 return(1);
231 } 231 }
232 232
233static int MS_CALLBACK file_read(BIO *b, char *out, int outl) 233static int file_read(BIO *b, char *out, int outl)
234 { 234 {
235 int ret=0; 235 int ret=0;
236 236
@@ -250,7 +250,7 @@ static int MS_CALLBACK file_read(BIO *b, char *out, int outl)
250 return(ret); 250 return(ret);
251 } 251 }
252 252
253static int MS_CALLBACK file_write(BIO *b, const char *in, int inl) 253static int file_write(BIO *b, const char *in, int inl)
254 { 254 {
255 int ret=0; 255 int ret=0;
256 256
@@ -270,7 +270,7 @@ static int MS_CALLBACK file_write(BIO *b, const char *in, int inl)
270 return(ret); 270 return(ret);
271 } 271 }
272 272
273static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr) 273static long file_ctrl(BIO *b, int cmd, long num, void *ptr)
274 { 274 {
275 long ret=1; 275 long ret=1;
276 FILE *fp=(FILE *)b->ptr; 276 FILE *fp=(FILE *)b->ptr;
@@ -440,7 +440,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
440 return(ret); 440 return(ret);
441 } 441 }
442 442
443static int MS_CALLBACK file_gets(BIO *bp, char *buf, int size) 443static int file_gets(BIO *bp, char *buf, int size)
444 { 444 {
445 int ret=0; 445 int ret=0;
446 446
@@ -461,7 +461,7 @@ static int MS_CALLBACK file_gets(BIO *bp, char *buf, int size)
461 return(ret); 461 return(ret);
462 } 462 }
463 463
464static int MS_CALLBACK file_puts(BIO *bp, const char *str) 464static int file_puts(BIO *bp, const char *str)
465 { 465 {
466 int n,ret; 466 int n,ret;
467 467
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 @@
122#define LOG_DAEMON OPC$M_NM_NTWORK 122#define LOG_DAEMON OPC$M_NM_NTWORK
123#endif 123#endif
124 124
125static int MS_CALLBACK slg_write(BIO *h, const char *buf, int num); 125static int slg_write(BIO *h, const char *buf, int num);
126static int MS_CALLBACK slg_puts(BIO *h, const char *str); 126static int slg_puts(BIO *h, const char *str);
127static long MS_CALLBACK slg_ctrl(BIO *h, int cmd, long arg1, void *arg2); 127static long slg_ctrl(BIO *h, int cmd, long arg1, void *arg2);
128static int MS_CALLBACK slg_new(BIO *h); 128static int slg_new(BIO *h);
129static int MS_CALLBACK slg_free(BIO *data); 129static int slg_free(BIO *data);
130static void xopenlog(BIO* bp, char* name, int level); 130static void xopenlog(BIO* bp, char* name, int level);
131static void xsyslog(BIO* bp, int priority, const char* string); 131static void xsyslog(BIO* bp, int priority, const char* string);
132static void xcloselog(BIO* bp); 132static void xcloselog(BIO* bp);
@@ -149,7 +149,7 @@ BIO_METHOD *BIO_s_log(void)
149 return(&methods_slg); 149 return(&methods_slg);
150 } 150 }
151 151
152static int MS_CALLBACK slg_new(BIO *bi) 152static int slg_new(BIO *bi)
153 { 153 {
154 bi->init=1; 154 bi->init=1;
155 bi->num=0; 155 bi->num=0;
@@ -158,14 +158,14 @@ static int MS_CALLBACK slg_new(BIO *bi)
158 return(1); 158 return(1);
159 } 159 }
160 160
161static int MS_CALLBACK slg_free(BIO *a) 161static int slg_free(BIO *a)
162 { 162 {
163 if (a == NULL) return(0); 163 if (a == NULL) return(0);
164 xcloselog(a); 164 xcloselog(a);
165 return(1); 165 return(1);
166 } 166 }
167 167
168static int MS_CALLBACK slg_write(BIO *b, const char *in, int inl) 168static int slg_write(BIO *b, const char *in, int inl)
169 { 169 {
170 int ret= inl; 170 int ret= inl;
171 char* buf; 171 char* buf;
@@ -218,7 +218,7 @@ static int MS_CALLBACK slg_write(BIO *b, const char *in, int inl)
218 return(ret); 218 return(ret);
219 } 219 }
220 220
221static long MS_CALLBACK slg_ctrl(BIO *b, int cmd, long num, void *ptr) 221static long slg_ctrl(BIO *b, int cmd, long num, void *ptr)
222 { 222 {
223 switch (cmd) 223 switch (cmd)
224 { 224 {
@@ -232,7 +232,7 @@ static long MS_CALLBACK slg_ctrl(BIO *b, int cmd, long num, void *ptr)
232 return(0); 232 return(0);
233 } 233 }
234 234
235static int MS_CALLBACK slg_puts(BIO *bp, const char *str) 235static int slg_puts(BIO *bp, const char *str)
236 { 236 {
237 int n,ret; 237 int n,ret;
238 238
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;
182static STACK_OF(CRYPTO_dynlock) *dyn_locks=NULL; 182static STACK_OF(CRYPTO_dynlock) *dyn_locks=NULL;
183 183
184 184
185static void (MS_FAR *locking_callback)(int mode,int type, 185static void (*locking_callback)(int mode,int type,
186 const char *file,int line)=0; 186 const char *file,int line)=0;
187static int (MS_FAR *add_lock_callback)(int *pointer,int amount, 187static int (*add_lock_callback)(int *pointer,int amount,
188 int type,const char *file,int line)=0; 188 int type,const char *file,int line)=0;
189#ifndef OPENSSL_NO_DEPRECATED 189#ifndef OPENSSL_NO_DEPRECATED
190static unsigned long (MS_FAR *id_callback)(void)=0; 190static unsigned long (*id_callback)(void)=0;
191#endif 191#endif
192static void (MS_FAR *threadid_callback)(CRYPTO_THREADID *)=0; 192static void (*threadid_callback)(CRYPTO_THREADID *)=0;
193static struct CRYPTO_dynlock_value *(MS_FAR *dynlock_create_callback) 193static struct CRYPTO_dynlock_value *(*dynlock_create_callback)
194 (const char *file,int line)=0; 194 (const char *file,int line)=0;
195static void (MS_FAR *dynlock_lock_callback)(int mode, 195static void (*dynlock_lock_callback)(int mode,
196 struct CRYPTO_dynlock_value *l, const char *file,int line)=0; 196 struct CRYPTO_dynlock_value *l, const char *file,int line)=0;
197static void (MS_FAR *dynlock_destroy_callback)(struct CRYPTO_dynlock_value *l, 197static void (*dynlock_destroy_callback)(struct CRYPTO_dynlock_value *l,
198 const char *file,int line)=0; 198 const char *file,int line)=0;
199 199
200int CRYPTO_get_new_lockid(char *name) 200int 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,
734 734
735int OBJ_create_objects(BIO *in) 735int OBJ_create_objects(BIO *in)
736 { 736 {
737 MS_STATIC char buf[512]; 737 char buf[512];
738 int i,num=0; 738 int i,num=0;
739 char *o,*s,*l=NULL; 739 char *o,*s,*l=NULL;
740 740
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)
110 /* If bytes >= 0, read up to 'bytes' bytes. 110 /* If bytes >= 0, read up to 'bytes' bytes.
111 * if bytes == -1, read complete file. */ 111 * if bytes == -1, read complete file. */
112 112
113 MS_STATIC unsigned char buf[BUFSIZE]; 113 unsigned char buf[BUFSIZE];
114#ifndef OPENSSL_NO_POSIX_IO 114#ifndef OPENSSL_NO_POSIX_IO
115 struct stat sb; 115 struct stat sb;
116#endif 116#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 @@
63#include <openssl/bio.h> 63#include <openssl/bio.h>
64#include <openssl/err.h> 64#include <openssl/err.h>
65 65
66long MS_CALLBACK BIO_debug_callback(BIO *bio, int cmd, const char *argp, 66long BIO_debug_callback(BIO *bio, int cmd, const char *argp,
67 int argi, long argl, long ret) 67 int argi, long argl, long ret)
68 { 68 {
69 BIO *b; 69 BIO *b;
70 MS_STATIC char buf[256]; 70 char buf[256];
71 char *p; 71 char *p;
72 long r=1; 72 long r=1;
73 size_t p_maxlen; 73 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 @@
95 95
96#if !defined(OPENSSL_NO_STDIO) 96#if !defined(OPENSSL_NO_STDIO)
97 97
98static int MS_CALLBACK file_write(BIO *h, const char *buf, int num); 98static int file_write(BIO *h, const char *buf, int num);
99static int MS_CALLBACK file_read(BIO *h, char *buf, int size); 99static int file_read(BIO *h, char *buf, int size);
100static int MS_CALLBACK file_puts(BIO *h, const char *str); 100static int file_puts(BIO *h, const char *str);
101static int MS_CALLBACK file_gets(BIO *h, char *str, int size); 101static int file_gets(BIO *h, char *str, int size);
102static long MS_CALLBACK file_ctrl(BIO *h, int cmd, long arg1, void *arg2); 102static long file_ctrl(BIO *h, int cmd, long arg1, void *arg2);
103static int MS_CALLBACK file_new(BIO *h); 103static int file_new(BIO *h);
104static int MS_CALLBACK file_free(BIO *data); 104static int file_free(BIO *data);
105static BIO_METHOD methods_filep= 105static BIO_METHOD methods_filep=
106 { 106 {
107 BIO_TYPE_FILE, 107 BIO_TYPE_FILE,
@@ -202,7 +202,7 @@ BIO_METHOD *BIO_s_file(void)
202 return(&methods_filep); 202 return(&methods_filep);
203 } 203 }
204 204
205static int MS_CALLBACK file_new(BIO *bi) 205static int file_new(BIO *bi)
206 { 206 {
207 bi->init=0; 207 bi->init=0;
208 bi->num=0; 208 bi->num=0;
@@ -211,7 +211,7 @@ static int MS_CALLBACK file_new(BIO *bi)
211 return(1); 211 return(1);
212 } 212 }
213 213
214static int MS_CALLBACK file_free(BIO *a) 214static int file_free(BIO *a)
215 { 215 {
216 if (a == NULL) return(0); 216 if (a == NULL) return(0);
217 if (a->shutdown) 217 if (a->shutdown)
@@ -230,7 +230,7 @@ static int MS_CALLBACK file_free(BIO *a)
230 return(1); 230 return(1);
231 } 231 }
232 232
233static int MS_CALLBACK file_read(BIO *b, char *out, int outl) 233static int file_read(BIO *b, char *out, int outl)
234 { 234 {
235 int ret=0; 235 int ret=0;
236 236
@@ -250,7 +250,7 @@ static int MS_CALLBACK file_read(BIO *b, char *out, int outl)
250 return(ret); 250 return(ret);
251 } 251 }
252 252
253static int MS_CALLBACK file_write(BIO *b, const char *in, int inl) 253static int file_write(BIO *b, const char *in, int inl)
254 { 254 {
255 int ret=0; 255 int ret=0;
256 256
@@ -270,7 +270,7 @@ static int MS_CALLBACK file_write(BIO *b, const char *in, int inl)
270 return(ret); 270 return(ret);
271 } 271 }
272 272
273static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr) 273static long file_ctrl(BIO *b, int cmd, long num, void *ptr)
274 { 274 {
275 long ret=1; 275 long ret=1;
276 FILE *fp=(FILE *)b->ptr; 276 FILE *fp=(FILE *)b->ptr;
@@ -440,7 +440,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
440 return(ret); 440 return(ret);
441 } 441 }
442 442
443static int MS_CALLBACK file_gets(BIO *bp, char *buf, int size) 443static int file_gets(BIO *bp, char *buf, int size)
444 { 444 {
445 int ret=0; 445 int ret=0;
446 446
@@ -461,7 +461,7 @@ static int MS_CALLBACK file_gets(BIO *bp, char *buf, int size)
461 return(ret); 461 return(ret);
462 } 462 }
463 463
464static int MS_CALLBACK file_puts(BIO *bp, const char *str) 464static int file_puts(BIO *bp, const char *str)
465 { 465 {
466 int n,ret; 466 int n,ret;
467 467
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 @@
122#define LOG_DAEMON OPC$M_NM_NTWORK 122#define LOG_DAEMON OPC$M_NM_NTWORK
123#endif 123#endif
124 124
125static int MS_CALLBACK slg_write(BIO *h, const char *buf, int num); 125static int slg_write(BIO *h, const char *buf, int num);
126static int MS_CALLBACK slg_puts(BIO *h, const char *str); 126static int slg_puts(BIO *h, const char *str);
127static long MS_CALLBACK slg_ctrl(BIO *h, int cmd, long arg1, void *arg2); 127static long slg_ctrl(BIO *h, int cmd, long arg1, void *arg2);
128static int MS_CALLBACK slg_new(BIO *h); 128static int slg_new(BIO *h);
129static int MS_CALLBACK slg_free(BIO *data); 129static int slg_free(BIO *data);
130static void xopenlog(BIO* bp, char* name, int level); 130static void xopenlog(BIO* bp, char* name, int level);
131static void xsyslog(BIO* bp, int priority, const char* string); 131static void xsyslog(BIO* bp, int priority, const char* string);
132static void xcloselog(BIO* bp); 132static void xcloselog(BIO* bp);
@@ -149,7 +149,7 @@ BIO_METHOD *BIO_s_log(void)
149 return(&methods_slg); 149 return(&methods_slg);
150 } 150 }
151 151
152static int MS_CALLBACK slg_new(BIO *bi) 152static int slg_new(BIO *bi)
153 { 153 {
154 bi->init=1; 154 bi->init=1;
155 bi->num=0; 155 bi->num=0;
@@ -158,14 +158,14 @@ static int MS_CALLBACK slg_new(BIO *bi)
158 return(1); 158 return(1);
159 } 159 }
160 160
161static int MS_CALLBACK slg_free(BIO *a) 161static int slg_free(BIO *a)
162 { 162 {
163 if (a == NULL) return(0); 163 if (a == NULL) return(0);
164 xcloselog(a); 164 xcloselog(a);
165 return(1); 165 return(1);
166 } 166 }
167 167
168static int MS_CALLBACK slg_write(BIO *b, const char *in, int inl) 168static int slg_write(BIO *b, const char *in, int inl)
169 { 169 {
170 int ret= inl; 170 int ret= inl;
171 char* buf; 171 char* buf;
@@ -218,7 +218,7 @@ static int MS_CALLBACK slg_write(BIO *b, const char *in, int inl)
218 return(ret); 218 return(ret);
219 } 219 }
220 220
221static long MS_CALLBACK slg_ctrl(BIO *b, int cmd, long num, void *ptr) 221static long slg_ctrl(BIO *b, int cmd, long num, void *ptr)
222 { 222 {
223 switch (cmd) 223 switch (cmd)
224 { 224 {
@@ -232,7 +232,7 @@ static long MS_CALLBACK slg_ctrl(BIO *b, int cmd, long num, void *ptr)
232 return(0); 232 return(0);
233 } 233 }
234 234
235static int MS_CALLBACK slg_puts(BIO *bp, const char *str) 235static int slg_puts(BIO *bp, const char *str)
236 { 236 {
237 int n,ret; 237 int n,ret;
238 238
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;
182static STACK_OF(CRYPTO_dynlock) *dyn_locks=NULL; 182static STACK_OF(CRYPTO_dynlock) *dyn_locks=NULL;
183 183
184 184
185static void (MS_FAR *locking_callback)(int mode,int type, 185static void (*locking_callback)(int mode,int type,
186 const char *file,int line)=0; 186 const char *file,int line)=0;
187static int (MS_FAR *add_lock_callback)(int *pointer,int amount, 187static int (*add_lock_callback)(int *pointer,int amount,
188 int type,const char *file,int line)=0; 188 int type,const char *file,int line)=0;
189#ifndef OPENSSL_NO_DEPRECATED 189#ifndef OPENSSL_NO_DEPRECATED
190static unsigned long (MS_FAR *id_callback)(void)=0; 190static unsigned long (*id_callback)(void)=0;
191#endif 191#endif
192static void (MS_FAR *threadid_callback)(CRYPTO_THREADID *)=0; 192static void (*threadid_callback)(CRYPTO_THREADID *)=0;
193static struct CRYPTO_dynlock_value *(MS_FAR *dynlock_create_callback) 193static struct CRYPTO_dynlock_value *(*dynlock_create_callback)
194 (const char *file,int line)=0; 194 (const char *file,int line)=0;
195static void (MS_FAR *dynlock_lock_callback)(int mode, 195static void (*dynlock_lock_callback)(int mode,
196 struct CRYPTO_dynlock_value *l, const char *file,int line)=0; 196 struct CRYPTO_dynlock_value *l, const char *file,int line)=0;
197static void (MS_FAR *dynlock_destroy_callback)(struct CRYPTO_dynlock_value *l, 197static void (*dynlock_destroy_callback)(struct CRYPTO_dynlock_value *l,
198 const char *file,int line)=0; 198 const char *file,int line)=0;
199 199
200int CRYPTO_get_new_lockid(char *name) 200int 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,
734 734
735int OBJ_create_objects(BIO *in) 735int OBJ_create_objects(BIO *in)
736 { 736 {
737 MS_STATIC char buf[512]; 737 char buf[512];
738 int i,num=0; 738 int i,num=0;
739 char *o,*s,*l=NULL; 739 char *o,*s,*l=NULL;
740 740
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)
110 /* If bytes >= 0, read up to 'bytes' bytes. 110 /* If bytes >= 0, read up to 'bytes' bytes.
111 * if bytes == -1, read complete file. */ 111 * if bytes == -1, read complete file. */
112 112
113 MS_STATIC unsigned char buf[BUFSIZE]; 113 unsigned char buf[BUFSIZE];
114#ifndef OPENSSL_NO_POSIX_IO 114#ifndef OPENSSL_NO_POSIX_IO
115 struct stat sb; 115 struct stat sb;
116#endif 116#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" {
88#define DEVRANDOM_EGD "/var/run/egd-pool","/dev/egd-pool","/etc/egd-pool","/etc/entropy" 88#define DEVRANDOM_EGD "/var/run/egd-pool","/dev/egd-pool","/etc/egd-pool","/etc/entropy"
89#endif 89#endif
90 90
91#if defined(OPENSSL_SYS_VXWORKS)
92# define NO_SYS_PARAM_H
93# define NO_CHMOD
94# define NO_SYSLOG
95#endif
96
97#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC)
98# if macintosh==1
99# ifndef MAC_OS_GUSI_SOURCE
100# define MAC_OS_pre_X
101# define NO_SYS_TYPES_H
102# endif
103# define NO_SYS_PARAM_H
104# define NO_CHMOD
105# define NO_SYSLOG
106# undef DEVRANDOM
107# define GETPID_IS_MEANINGLESS
108# endif
109#endif
110
111/********************************************************************
112 The Microsoft section
113 ********************************************************************/
114/* The following is used because of the small stack in some
115 * Microsoft operating systems */
116#if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYSNAME_WIN32)
117# define MS_STATIC static
118#else
119# define MS_STATIC
120#endif
121
122#if defined(OPENSSL_SYS_WIN32) && !defined(WIN32)
123# define WIN32
124#endif
125#if defined(OPENSSL_SYS_WINDOWS) && !defined(WINDOWS)
126# define WINDOWS
127#endif
128#if defined(OPENSSL_SYS_MSDOS) && !defined(MSDOS)
129# define MSDOS
130#endif
131
132#if defined(MSDOS) && !defined(GETPID_IS_MEANINGLESS)
133# define GETPID_IS_MEANINGLESS
134#endif
135
136#ifdef WIN32
137#define get_last_sys_error() GetLastError()
138#define clear_sys_error() SetLastError(0)
139#if !defined(WINNT)
140#define WIN_CONSOLE_BUG
141#endif
142#else
143#define get_last_sys_error() errno 91#define get_last_sys_error() errno
144#define clear_sys_error() errno=0 92#define clear_sys_error() errno=0
145#endif
146
147#if defined(WINDOWS)
148#define get_last_socket_error() WSAGetLastError()
149#define clear_socket_error() WSASetLastError(0)
150#define readsocket(s,b,n) recv((s),(b),(n),0)
151#define writesocket(s,b,n) send((s),(b),(n),0)
152#elif defined(__DJGPP__)
153#define WATT32
154#define get_last_socket_error() errno
155#define clear_socket_error() errno=0
156#define closesocket(s) close_s(s)
157#define readsocket(s,b,n) read_s(s,b,n)
158#define writesocket(s,b,n) send(s,b,n,0)
159#elif defined(MAC_OS_pre_X)
160#define get_last_socket_error() errno
161#define clear_socket_error() errno=0
162#define closesocket(s) MacSocket_close(s)
163#define readsocket(s,b,n) MacSocket_recv((s),(b),(n),true)
164#define writesocket(s,b,n) MacSocket_send((s),(b),(n))
165#elif defined(OPENSSL_SYS_VMS)
166#define get_last_socket_error() errno
167#define clear_socket_error() errno=0
168#define ioctlsocket(a,b,c) ioctl(a,b,c)
169#define closesocket(s) close(s)
170#define readsocket(s,b,n) recv((s),(b),(n),0)
171#define writesocket(s,b,n) send((s),(b),(n),0)
172#elif defined(OPENSSL_SYS_VXWORKS)
173#define get_last_socket_error() errno
174#define clear_socket_error() errno=0
175#define ioctlsocket(a,b,c) ioctl((a),(b),(int)(c))
176#define closesocket(s) close(s)
177#define readsocket(s,b,n) read((s),(b),(n))
178#define writesocket(s,b,n) write((s),(char *)(b),(n))
179#elif defined(OPENSSL_SYS_BEOS_R5)
180#define get_last_socket_error() errno
181#define clear_socket_error() errno=0
182#define FIONBIO SO_NONBLOCK
183#define ioctlsocket(a,b,c) setsockopt((a),SOL_SOCKET,(b),(c),sizeof(*(c)))
184#define readsocket(s,b,n) recv((s),(b),(n),0)
185#define writesocket(s,b,n) send((s),(b),(n),0)
186#elif defined(OPENSSL_SYS_NETWARE)
187#if defined(NETWARE_BSDSOCK)
188#define get_last_socket_error() errno
189#define clear_socket_error() errno=0
190#define closesocket(s) close(s)
191#define ioctlsocket(a,b,c) ioctl(a,b,c)
192#if defined(NETWARE_LIBC)
193#define readsocket(s,b,n) recv((s),(b),(n),0)
194#define writesocket(s,b,n) send((s),(b),(n),0)
195#else
196#define readsocket(s,b,n) recv((s),(char*)(b),(n),0)
197#define writesocket(s,b,n) send((s),(char*)(b),(n),0)
198#endif
199#else
200#define get_last_socket_error() WSAGetLastError()
201#define clear_socket_error() WSASetLastError(0)
202#define readsocket(s,b,n) recv((s),(b),(n),0)
203#define writesocket(s,b,n) send((s),(b),(n),0)
204#endif
205#else
206#define get_last_socket_error() errno 93#define get_last_socket_error() errno
207#define clear_socket_error() errno=0 94#define clear_socket_error() errno=0
208#define ioctlsocket(a,b,c) ioctl(a,b,c) 95#define ioctlsocket(a,b,c) ioctl(a,b,c)
209#define closesocket(s) close(s) 96#define closesocket(s) close(s)
210#define readsocket(s,b,n) read((s),(b),(n)) 97#define readsocket(s,b,n) read((s),(b),(n))
211#define writesocket(s,b,n) write((s),(b),(n)) 98#define writesocket(s,b,n) write((s),(b),(n))
212#endif
213
214#ifdef WIN16 /* never the case */
215# define MS_CALLBACK _far _loadds
216# define MS_FAR _far
217#else
218# define MS_CALLBACK
219# define MS_FAR
220#endif
221
222#ifdef OPENSSL_NO_STDIO
223# undef OPENSSL_NO_FP_API
224# define OPENSSL_NO_FP_API
225#endif
226
227#if (defined(WINDOWS) || defined(MSDOS))
228
229# ifdef __DJGPP__
230# include <unistd.h>
231# include <sys/stat.h>
232# include <sys/socket.h>
233# include <tcp.h>
234# include <netdb.h>
235# define _setmode setmode
236# define _O_TEXT O_TEXT
237# define _O_BINARY O_BINARY
238# undef DEVRANDOM
239# define DEVRANDOM "/dev/urandom\x24"
240# endif /* __DJGPP__ */
241
242# ifndef S_IFDIR
243# define S_IFDIR _S_IFDIR
244# endif
245
246# ifndef S_IFMT
247# define S_IFMT _S_IFMT
248# endif
249 99
250# if !defined(WINNT) && !defined(__DJGPP__)
251# define NO_SYSLOG
252# endif
253# define NO_DIRENT
254
255# ifdef WINDOWS
256# if !defined(_WIN32_WCE) && !defined(_WIN32_WINNT)
257 /*
258 * Defining _WIN32_WINNT here in e_os.h implies certain "discipline."
259 * Most notably we ought to check for availability of each specific
260 * routine with GetProcAddress() and/or guard NT-specific calls with
261 * GetVersion() < 0x80000000. One can argue that in latter "or" case
262 * we ought to /DELAYLOAD some .DLLs in order to protect ourselves
263 * against run-time link errors. This doesn't seem to be necessary,
264 * because it turned out that already Windows 95, first non-NT Win32
265 * implementation, is equipped with at least NT 3.51 stubs, dummy
266 * routines with same name, but which do nothing. Meaning that it's
267 * apparently sufficient to guard "vanilla" NT calls with GetVersion
268 * alone, while NT 4.0 and above interfaces ought to be linked with
269 * GetProcAddress at run-time.
270 */
271# define _WIN32_WINNT 0x0400
272# endif
273# if !defined(OPENSSL_NO_SOCK) && defined(_WIN32_WINNT)
274 /*
275 * Just like defining _WIN32_WINNT including winsock2.h implies
276 * certain "discipline" for maintaining [broad] binary compatibility.
277 * As long as structures are invariant among Winsock versions,
278 * it's sufficient to check for specific Winsock2 API availability
279 * at run-time [DSO_global_lookup is recommended]...
280 */
281# include <winsock2.h>
282# include <ws2tcpip.h>
283 /* yes, they have to be #included prior to <windows.h> */
284# endif
285# include <windows.h>
286# include <stdio.h>
287# include <stddef.h>
288# include <errno.h>
289# include <string.h>
290# ifdef _WIN64
291# define strlen(s) _strlen31(s)
292/* cut strings to 2GB */
293static unsigned int _strlen31(const char *str)
294 {
295 unsigned int len=0;
296 while (*str && len<0x80000000U) str++, len++;
297 return len&0x7FFFFFFF;
298 }
299# endif
300# include <malloc.h>
301# if defined(_MSC_VER) && _MSC_VER<=1200 && defined(_MT) && defined(isspace)
302 /* compensate for bug in VC6 ctype.h */
303# undef isspace
304# undef isdigit
305# undef isalnum
306# undef isupper
307# undef isxdigit
308# endif
309# if defined(_MSC_VER) && !defined(_DLL) && defined(stdin)
310# if _MSC_VER>=1300
311# undef stdin
312# undef stdout
313# undef stderr
314 FILE *__iob_func();
315# define stdin (&__iob_func()[0])
316# define stdout (&__iob_func()[1])
317# define stderr (&__iob_func()[2])
318# elif defined(I_CAN_LIVE_WITH_LNK4049)
319# undef stdin
320# undef stdout
321# undef stderr
322 /* pre-1300 has __p__iob(), but it's available only in msvcrt.lib,
323 * or in other words with /MD. Declaring implicit import, i.e.
324 * with _imp_ prefix, works correctly with all compiler options,
325 * but without /MD results in LINK warning LNK4049:
326 * 'locally defined symbol "__iob" imported'.
327 */
328 extern FILE *_imp___iob;
329# define stdin (&_imp___iob[0])
330# define stdout (&_imp___iob[1])
331# define stderr (&_imp___iob[2])
332# endif
333# endif
334# endif
335# include <io.h>
336# include <fcntl.h>
337
338# ifdef OPENSSL_SYS_WINCE
339# define OPENSSL_NO_POSIX_IO
340# endif
341
342# if defined (__BORLANDC__)
343# define _setmode setmode
344# define _O_TEXT O_TEXT
345# define _O_BINARY O_BINARY
346# define _int64 __int64
347# define _kbhit kbhit
348# endif
349
350# define EXIT(n) exit(n)
351# define LIST_SEPARATOR_CHAR ';'
352# ifndef X_OK
353# define X_OK 0
354# endif
355# ifndef W_OK
356# define W_OK 2
357# endif
358# ifndef R_OK
359# define R_OK 4
360# endif
361# define OPENSSL_CONF "openssl.cnf"
362# define SSLEAY_CONF OPENSSL_CONF
363# define NUL_DEV "nul"
364# define RFILE ".rnd"
365# ifdef OPENSSL_SYS_WINCE
366# define DEFAULT_HOME ""
367# else
368# define DEFAULT_HOME "C:"
369# endif
370
371/* Avoid Windows 8 SDK GetVersion deprecated problems */
372#if defined(_MSC_VER) && _MSC_VER>=1800
373# define check_winnt() (1)
374#else
375# define check_winnt() (GetVersion() < 0x80000000)
376#endif
377
378#else /* The non-microsoft world */
379
380# ifdef OPENSSL_SYS_VMS
381# define VMS 1
382 /* some programs don't include stdlib, so exit() and others give implicit
383 function warnings */
384# include <stdlib.h>
385# if defined(__DECC)
386# include <unistd.h>
387# else
388# include <unixlib.h>
389# endif
390# define OPENSSL_CONF "openssl.cnf"
391# define SSLEAY_CONF OPENSSL_CONF
392# define RFILE ".rnd"
393# define LIST_SEPARATOR_CHAR ','
394# define NUL_DEV "NLA0:"
395 /* We don't have any well-defined random devices on VMS, yet... */
396# undef DEVRANDOM
397 /* We need to do this since VMS has the following coding on status codes:
398
399 Bits 0-2: status type: 0 = warning, 1 = success, 2 = error, 3 = info ...
400 The important thing to know is that odd numbers are considered
401 good, while even ones are considered errors.
402 Bits 3-15: actual status number
403 Bits 16-27: facility number. 0 is considered "unknown"
404 Bits 28-31: control bits. If bit 28 is set, the shell won't try to
405 output the message (which, for random codes, just looks ugly)
406
407 So, what we do here is to change 0 to 1 to get the default success status,
408 and everything else is shifted up to fit into the status number field, and
409 the status is tagged as an error, which I believe is what is wanted here.
410 -- Richard Levitte
411 */
412# define EXIT(n) do { int __VMS_EXIT = n; \
413 if (__VMS_EXIT == 0) \
414 __VMS_EXIT = 1; \
415 else \
416 __VMS_EXIT = (n << 3) | 2; \
417 __VMS_EXIT |= 0x10000000; \
418 exit(__VMS_EXIT); } while(0)
419# define NO_SYS_PARAM_H
420
421# elif defined(OPENSSL_SYS_NETWARE)
422# include <fcntl.h>
423# include <unistd.h>
424# define NO_SYS_TYPES_H
425# undef DEVRANDOM
426# ifdef NETWARE_CLIB
427# define getpid GetThreadID
428 extern int GetThreadID(void);
429/* # include <conio.h> */
430 extern int kbhit(void);
431# else
432# include <screen.h>
433# endif
434# define NO_SYSLOG
435# define _setmode setmode
436# define _kbhit kbhit
437# define _O_TEXT O_TEXT
438# define _O_BINARY O_BINARY
439# define OPENSSL_CONF "openssl.cnf"
440# define SSLEAY_CONF OPENSSL_CONF
441# define RFILE ".rnd"
442# define LIST_SEPARATOR_CHAR ';'
443# define EXIT(n) { if (n) printf("ERROR: %d\n", (int)n); exit(n); }
444
445# else
446 /* !defined VMS */
447# ifdef OPENSSL_SYS_MPE
448# define NO_SYS_PARAM_H
449# endif
450# ifdef OPENSSL_UNISTD
451# include OPENSSL_UNISTD
452# else
453# include <unistd.h> 100# include <unistd.h>
454# endif
455# ifndef NO_SYS_TYPES_H
456# include <sys/types.h> 101# include <sys/types.h>
457# endif
458# if defined(NeXT) || defined(OPENSSL_SYS_NEWS4)
459# define pid_t int /* pid_t is missing on NEXTSTEP/OPENSTEP
460 * (unless when compiling with -D_POSIX_SOURCE,
461 * which doesn't work for us) */
462# endif
463# ifdef OPENSSL_SYS_NEWS4 /* setvbuf is missing on mips-sony-bsd */
464# define setvbuf(a, b, c, d) setbuffer((a), (b), (d))
465 typedef unsigned long clock_t;
466# endif
467# ifdef OPENSSL_SYS_WIN32_CYGWIN
468# include <io.h>
469# include <fcntl.h>
470# endif
471
472# define OPENSSL_CONF "openssl.cnf" 102# define OPENSSL_CONF "openssl.cnf"
473# define SSLEAY_CONF OPENSSL_CONF 103# define SSLEAY_CONF OPENSSL_CONF
474# define RFILE ".rnd" 104# define RFILE ".rnd"
475# define LIST_SEPARATOR_CHAR ':' 105# define LIST_SEPARATOR_CHAR ':'
476# define NUL_DEV "/dev/null" 106# define NUL_DEV "/dev/null"
477# define EXIT(n) exit(n) 107# define EXIT(n) exit(n)
478# endif
479
480# define SSLeay_getpid() getpid() 108# define SSLeay_getpid() getpid()
481 109
482#endif
483
484
485/*************/
486 110
487#ifdef USE_SOCKETS 111#ifdef USE_SOCKETS
488# if defined(WINDOWS) || defined(MSDOS)
489 /* windows world */
490
491# ifdef OPENSSL_NO_SOCK
492# define SSLeay_Write(a,b,c) (-1)
493# define SSLeay_Read(a,b,c) (-1)
494# define SHUTDOWN(fd) close(fd)
495# define SHUTDOWN2(fd) close(fd)
496# elif !defined(__DJGPP__)
497# if defined(_WIN32_WCE) && _WIN32_WCE<410
498# define getservbyname _masked_declaration_getservbyname
499# endif
500# if !defined(IPPROTO_IP)
501 /* winsock[2].h was included already? */
502# include <winsock.h>
503# endif
504# ifdef getservbyname
505# undef getservbyname
506 /* this is used to be wcecompat/include/winsock_extras.h */
507 struct servent* PASCAL getservbyname(const char*,const char*);
508# endif
509
510# ifdef _WIN64
511/*
512 * Even though sizeof(SOCKET) is 8, it's safe to cast it to int, because
513 * the value constitutes an index in per-process table of limited size
514 * and not a real pointer.
515 */
516# define socket(d,t,p) ((int)socket(d,t,p))
517# define accept(s,f,l) ((int)accept(s,f,l))
518# endif
519# define SSLeay_Write(a,b,c) send((a),(b),(c),0)
520# define SSLeay_Read(a,b,c) recv((a),(b),(c),0)
521# define SHUTDOWN(fd) { shutdown((fd),0); closesocket(fd); }
522# define SHUTDOWN2(fd) { shutdown((fd),2); closesocket(fd); }
523# else
524# define SSLeay_Write(a,b,c) write_s(a,b,c,0)
525# define SSLeay_Read(a,b,c) read_s(a,b,c)
526# define SHUTDOWN(fd) close_s(fd)
527# define SHUTDOWN2(fd) close_s(fd)
528# endif
529
530# elif defined(MAC_OS_pre_X)
531
532# include "MacSocket.h"
533# define SSLeay_Write(a,b,c) MacSocket_send((a),(b),(c))
534# define SSLeay_Read(a,b,c) MacSocket_recv((a),(b),(c),true)
535# define SHUTDOWN(fd) MacSocket_close(fd)
536# define SHUTDOWN2(fd) MacSocket_close(fd)
537
538# elif defined(OPENSSL_SYS_NETWARE)
539 /* NetWare uses the WinSock2 interfaces by default, but can be configured for BSD
540 */
541# if defined(NETWARE_BSDSOCK)
542# include <sys/socket.h>
543# include <netinet/in.h>
544# include <sys/time.h>
545# if defined(NETWARE_CLIB)
546# include <sys/bsdskt.h>
547# else
548# include <sys/select.h>
549# endif
550# define INVALID_SOCKET (int)(~0)
551# else
552# include <novsock2.h>
553# endif
554# define SSLeay_Write(a,b,c) send((a),(b),(c),0)
555# define SSLeay_Read(a,b,c) recv((a),(b),(c),0)
556# define SHUTDOWN(fd) { shutdown((fd),0); closesocket(fd); }
557# define SHUTDOWN2(fd) { shutdown((fd),2); closesocket(fd); }
558
559# else
560
561# ifndef NO_SYS_PARAM_H
562# include <sys/param.h> 112# include <sys/param.h>
563# endif
564# ifdef OPENSSL_SYS_VXWORKS
565# include <time.h>
566# elif !defined(OPENSSL_SYS_MPE)
567# include <sys/time.h> /* Needed under linux for FD_XXX */ 113# include <sys/time.h> /* Needed under linux for FD_XXX */
568# endif
569
570# include <netdb.h> 114# include <netdb.h>
571# if defined(OPENSSL_SYS_VMS_NODECC)
572# include <socket.h>
573# include <in.h>
574# include <inet.h>
575# else
576# include <sys/socket.h> 115# include <sys/socket.h>
577# ifdef FILIO_H 116# ifdef FILIO_H
578# include <sys/filio.h> /* Added for FIONBIO under unixware */ 117# include <sys/filio.h> /* Added for FIONBIO under unixware */
579# endif 118# endif
580# include <netinet/in.h> 119# include <netinet/in.h>
581# if !defined(OPENSSL_SYS_BEOS_R5)
582# include <arpa/inet.h>
583# endif
584# endif
585
586# if defined(NeXT) || defined(_NEXT_SOURCE)
587# include <sys/fcntl.h>
588# include <sys/types.h>
589# endif
590
591# ifdef OPENSSL_SYS_AIX
592# include <sys/select.h>
593# endif
594
595# ifdef __QNX__
596# include <sys/select.h>
597# endif
598
599# if defined(sun)
600# include <sys/filio.h>
601# else
602# ifndef VMS
603# include <sys/ioctl.h> 120# include <sys/ioctl.h>
604# else
605 /* ioctl is only in VMS > 7.0 and when socketshr is not used */
606# if !defined(TCPIP_TYPE_SOCKETSHR) && defined(__VMS_VER) && (__VMS_VER > 70000000)
607# include <sys/ioctl.h>
608# endif
609# endif
610# endif
611
612# ifdef VMS
613# include <unixio.h>
614# if defined(TCPIP_TYPE_SOCKETSHR)
615# include <socketshr.h>
616# endif
617# endif
618
619# define SSLeay_Read(a,b,c) read((a),(b),(c)) 121# define SSLeay_Read(a,b,c) read((a),(b),(c))
620# define SSLeay_Write(a,b,c) write((a),(b),(c)) 122# define SSLeay_Write(a,b,c) write((a),(b),(c))
621# define SHUTDOWN(fd) { shutdown((fd),0); closesocket((fd)); } 123# define SHUTDOWN(fd) { shutdown((fd),0); closesocket((fd)); }
@@ -623,36 +125,19 @@ static unsigned int _strlen31(const char *str)
623# ifndef INVALID_SOCKET 125# ifndef INVALID_SOCKET
624# define INVALID_SOCKET (-1) 126# define INVALID_SOCKET (-1)
625# endif /* INVALID_SOCKET */ 127# endif /* INVALID_SOCKET */
626# endif 128#endif
627 129
628/* Some IPv6 implementations are broken, disable them in known bad 130/* Some IPv6 implementations are broken, disable them in known bad
629 * versions. 131 * versions.
630 */ 132 */
631# if !defined(OPENSSL_USE_IPV6) 133# if !defined(OPENSSL_USE_IPV6)
632# if defined(AF_INET6) && !defined(OPENSSL_SYS_BEOS_BONE) && !defined(NETWARE_CLIB) 134# if defined(AF_INET6)
633# define OPENSSL_USE_IPV6 1 135# define OPENSSL_USE_IPV6 1
634# else 136# else
635# define OPENSSL_USE_IPV6 0 137# define OPENSSL_USE_IPV6 0
636# endif 138# endif
637# endif 139# endif
638 140
639#endif
640
641#if defined(sun) && !defined(__svr4__) && !defined(__SVR4)
642 /* include headers first, so our defines don't break it */
643#include <stdlib.h>
644#include <string.h>
645 /* bcopy can handle overlapping moves according to SunOS 4.1.4 manpage */
646# define memmove(s1,s2,n) bcopy((s2),(s1),(n))
647# define strtoul(s,e,b) ((unsigned long int)strtol((s),(e),(b)))
648extern char *sys_errlist[]; extern int sys_nerr;
649# define strerror(errnum) \
650 (((errnum)<0 || (errnum)>=sys_nerr) ? NULL : sys_errlist[errnum])
651 /* Being signed SunOS 4.x memcpy breaks ASN1_OBJECT table lookup */
652#include "crypto/o_str.h"
653# define memcmp OPENSSL_memcmp
654#endif
655
656#ifndef OPENSSL_EXIT 141#ifndef OPENSSL_EXIT
657# if defined(MONOLITH) && !defined(OPENSSL_C) 142# if defined(MONOLITH) && !defined(OPENSSL_C)
658# define OPENSSL_EXIT(n) return(n) 143# define OPENSSL_EXIT(n) return(n)
@@ -663,76 +148,6 @@ extern char *sys_errlist[]; extern int sys_nerr;
663 148
664/***********************************************/ 149/***********************************************/
665 150
666#define DG_GCC_BUG /* gcc < 2.6.3 on DGUX */
667
668#ifdef sgi
669#define IRIX_CC_BUG /* all version of IRIX I've tested (4.* 5.*) */
670#endif
671#ifdef OPENSSL_SYS_SNI
672#define IRIX_CC_BUG /* CDS++ up to V2.0Bsomething suffered from the same bug.*/
673#endif
674
675#if defined(OPENSSL_SYS_WINDOWS)
676# define strcasecmp _stricmp
677# define strncasecmp _strnicmp
678#elif defined(OPENSSL_SYS_VMS)
679/* VMS below version 7.0 doesn't have strcasecmp() */
680# include "o_str.h"
681# define strcasecmp OPENSSL_strcasecmp
682# define strncasecmp OPENSSL_strncasecmp
683# define OPENSSL_IMPLEMENTS_strncasecmp
684#elif defined(OPENSSL_SYS_OS2) && defined(__EMX__)
685# define strcasecmp stricmp
686# define strncasecmp strnicmp
687#elif defined(OPENSSL_SYS_NETWARE)
688# include <string.h>
689# if defined(NETWARE_CLIB)
690# define strcasecmp stricmp
691# define strncasecmp strnicmp
692# endif /* NETWARE_CLIB */
693#endif
694
695#if defined(OPENSSL_SYS_OS2) && defined(__EMX__)
696# include <io.h>
697# include <fcntl.h>
698# define NO_SYSLOG
699#endif
700
701/* vxworks */
702#if defined(OPENSSL_SYS_VXWORKS)
703#include <ioLib.h>
704#include <tickLib.h>
705#include <sysLib.h>
706
707#define TTY_STRUCT int
708
709#define sleep(a) taskDelay((a) * sysClkRateGet())
710
711#include <vxWorks.h>
712#include <sockLib.h>
713#include <taskLib.h>
714
715#define getpid taskIdSelf
716
717/* NOTE: these are implemented by helpers in database app!
718 * if the database is not linked, we need to implement them
719 * elswhere */
720struct hostent *gethostbyname(const char *name);
721struct hostent *gethostbyaddr(const char *addr, int length, int type);
722struct servent *getservbyname(const char *name, const char *proto);
723
724#endif
725/* end vxworks */
726
727/* beos */
728#if defined(OPENSSL_SYS_BEOS_R5)
729#define SO_ERROR 0
730#define NO_SYS_UN
731#define IPPROTO_IP 0
732#include <OS.h>
733#endif
734
735
736#ifdef __cplusplus 151#ifdef __cplusplus
737} 152}
738#endif 153#endif
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-21 00:33:43 +0000