]> git.proxmox.com Git - mirror_edk2.git/blame - CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2f.patch
projects / mirror_edk2.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
CryptoPkg/OpensslLib: Switch to upstream fix for OpenSSL RT#3628
[mirror_edk2.git] / CryptoPkg / Library / OpensslLib / EDKII_openssl-1.0.2f.patch
CommitLineData
ca6fa1fe
QL		 1diff --git a/Configure b/Configure\r
2index 4a715dc..eb61eda 100755\r
3--- a/Configure\r
4+++ b/Configure\r
5@@ -1082,7 +1082,7 @@ if (defined($disabled{"tls1"}))\r
6 }\r
7 \r
8 if (defined($disabled{"ec"}) || defined($disabled{"dsa"})\r
9- || defined($disabled{"dh"}))\r
10+ || defined($disabled{"dh"}) || defined($disabled{"stdio"}))\r
11 {\r
12 $disabled{"gost"} = "forced";\r
13 }\r
14diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c\r
15index 35fd44c..9f39bff 100644\r
16--- a/crypto/asn1/a_strex.c\r
17+++ b/crypto/asn1/a_strex.c\r
18@@ -104,6 +104,7 @@ static int send_bio_chars(void *arg, const void *buf, int len)\r
19 return 1;\r
20 }\r
21 \r
22+#ifndef OPENSSL_NO_FP_API\r
23 static int send_fp_chars(void *arg, const void *buf, int len)\r
24 {\r
25 if (!arg)\r
26@@ -112,6 +113,7 @@ static int send_fp_chars(void *arg, const void *buf, int len)\r
27 return 0;\r
28 return 1;\r
29 }\r
30+#endif\r
31 \r
32 typedef int char_io (void *arg, const void *buf, int len);\r
33 \r
e578aa19
QL		 34diff --git a/crypto/asn1/asn1_mac.h b/crypto/asn1/asn1_mac.h\r
35index abc6dc3..3a672e9 100644\r
36--- a/crypto/asn1/asn1_mac.h\r
37+++ b/crypto/asn1/asn1_mac.h\r
38@@ -70,7 +70,7 @@ extern "C" {\r
39 # endif\r
40 \r
41 # define ASN1_MAC_H_err(f,r,line) \\r
42- ERR_PUT_error(ASN1_MAC_ERR_LIB,(f),(r),__FILE__,(line))\r
43+ ERR_PUT_error(ASN1_MAC_ERR_LIB,(f),(r),OPENSSL_FILE,(line))\r
44 \r
45 # define M_ASN1_D2I_vars(a,type,func) \\r
46 ASN1_const_CTX c; \\r
47@@ -81,7 +81,7 @@ extern "C" {\r
48 c.error=ERR_R_NESTED_ASN1_ERROR; \\r
49 if ((a == NULL) || ((*a) == NULL)) \\r
50 { if ((ret=(type)func()) == NULL) \\r
51- { c.line=__LINE__; goto err; } } \\r
52+ { c.line=OPENSSL_LINE; goto err; } } \\r
53 else ret=(*a);\r
54 \r
55 # define M_ASN1_D2I_Init() \\r
56@@ -90,7 +90,7 @@ extern "C" {\r
57 \r
58 # define M_ASN1_D2I_Finish_2(a) \\r
59 if (!asn1_const_Finish(&c)) \\r
60- { c.line=__LINE__; goto err; } \\r
61+ { c.line=OPENSSL_LINE; goto err; } \\r
62 *(const unsigned char **)pp=c.p; \\r
63 if (a != NULL) (*a)=ret; \\r
64 return(ret);\r
65@@ -105,7 +105,7 @@ err:\\r
66 \r
67 # define M_ASN1_D2I_start_sequence() \\r
68 if (!asn1_GetSequence(&c,&length)) \\r
69- { c.line=__LINE__; goto err; }\r
70+ { c.line=OPENSSL_LINE; goto err; }\r
71 /* Begin reading ASN1 without a surrounding sequence */\r
72 # define M_ASN1_D2I_begin() \\r
73 c.slen = length;\r
74@@ -129,21 +129,21 @@ err:\\r
75 # define M_ASN1_D2I_get(b, func) \\r
76 c.q=c.p; \\r
77 if (func(&(b),&c.p,c.slen) == NULL) \\r
78- {c.line=__LINE__; goto err; } \\r
79+ {c.line=OPENSSL_LINE; goto err; } \\r
80 c.slen-=(c.p-c.q);\r
81 \r
82 /* Don't use this with d2i_ASN1_BOOLEAN() */\r
83 # define M_ASN1_D2I_get_x(type,b,func) \\r
84 c.q=c.p; \\r
85 if (((D2I_OF(type))func)(&(b),&c.p,c.slen) == NULL) \\r
86- {c.line=__LINE__; goto err; } \\r
87+ {c.line=OPENSSL_LINE; goto err; } \\r
88 c.slen-=(c.p-c.q);\r
89 \r
90 /* use this instead () */\r
91 # define M_ASN1_D2I_get_int(b,func) \\r
92 c.q=c.p; \\r
93 if (func(&(b),&c.p,c.slen) < 0) \\r
94- {c.line=__LINE__; goto err; } \\r
95+ {c.line=OPENSSL_LINE; goto err; } \\r
96 c.slen-=(c.p-c.q);\r
97 \r
98 # define M_ASN1_D2I_get_opt(b,func,type) \\r
99@@ -164,7 +164,7 @@ err:\\r
100 M_ASN1_next=(_tmp& V_ASN1_CONSTRUCTED)|type; \\r
101 c.q=c.p; \\r
102 if (func(&(b),&c.p,c.slen) == NULL) \\r
103- {c.line=__LINE__; M_ASN1_next_prev = _tmp; goto err; } \\r
104+ {c.line=OPENSSL_LINE; M_ASN1_next_prev = _tmp; goto err; } \\r
105 c.slen-=(c.p-c.q);\\r
106 M_ASN1_next_prev=_tmp;\r
107 \r
108@@ -258,20 +258,20 @@ err:\\r
109 c.q=c.p; \\r
110 if (d2i_ASN1_SET(&(r),&c.p,c.slen,(char *(*)())func,\\r
111 (void (*)())free_func,a,b) == NULL) \\r
112- { c.line=__LINE__; goto err; } \\r
113+ { c.line=OPENSSL_LINE; goto err; } \\r
114 c.slen-=(c.p-c.q);\r
115 \r
116 # define M_ASN1_D2I_get_imp_set_type(type,r,func,free_func,a,b) \\r
117 c.q=c.p; \\r
118 if (d2i_ASN1_SET_OF_##type(&(r),&c.p,c.slen,func,\\r
119 free_func,a,b) == NULL) \\r
120- { c.line=__LINE__; goto err; } \\r
121+ { c.line=OPENSSL_LINE; goto err; } \\r
122 c.slen-=(c.p-c.q);\r
123 \r
124 # define M_ASN1_D2I_get_set_strings(r,func,a,b) \\r
125 c.q=c.p; \\r
126 if (d2i_ASN1_STRING_SET(&(r),&c.p,c.slen,a,b) == NULL) \\r
127- { c.line=__LINE__; goto err; } \\r
128+ { c.line=OPENSSL_LINE; goto err; } \\r
129 c.slen-=(c.p-c.q);\r
130 \r
131 # define M_ASN1_D2I_get_EXP_opt(r,func,tag) \\r
132@@ -285,16 +285,16 @@ err:\\r
133 Tinf=ASN1_get_object(&c.p,&Tlen,&Ttag,&Tclass,c.slen); \\r
134 if (Tinf & 0x80) \\r
135 { c.error=ERR_R_BAD_ASN1_OBJECT_HEADER; \\r
136- c.line=__LINE__; goto err; } \\r
137+ c.line=OPENSSL_LINE; goto err; } \\r
138 if (Tinf == (V_ASN1_CONSTRUCTED+1)) \\r
139 Tlen = c.slen - (c.p - c.q) - 2; \\r
140 if (func(&(r),&c.p,Tlen) == NULL) \\r
141- { c.line=__LINE__; goto err; } \\r
142+ { c.line=OPENSSL_LINE; goto err; } \\r
143 if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \\r
144 Tlen = c.slen - (c.p - c.q); \\r
145 if(!ASN1_const_check_infinite_end(&c.p, Tlen)) \\r
146 { c.error=ERR_R_MISSING_ASN1_EOS; \\r
147- c.line=__LINE__; goto err; } \\r
148+ c.line=OPENSSL_LINE; goto err; } \\r
149 }\\r
150 c.slen-=(c.p-c.q); \\r
151 }\r
152@@ -310,18 +310,18 @@ err:\\r
153 Tinf=ASN1_get_object(&c.p,&Tlen,&Ttag,&Tclass,c.slen); \\r
154 if (Tinf & 0x80) \\r
155 { c.error=ERR_R_BAD_ASN1_OBJECT_HEADER; \\r
156- c.line=__LINE__; goto err; } \\r
157+ c.line=OPENSSL_LINE; goto err; } \\r
158 if (Tinf == (V_ASN1_CONSTRUCTED+1)) \\r
159 Tlen = c.slen - (c.p - c.q) - 2; \\r
160 if (d2i_ASN1_SET(&(r),&c.p,Tlen,(char *(*)())func, \\r
161 (void (*)())free_func, \\r
162 b,V_ASN1_UNIVERSAL) == NULL) \\r
163- { c.line=__LINE__; goto err; } \\r
164+ { c.line=OPENSSL_LINE; goto err; } \\r
165 if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \\r
166 Tlen = c.slen - (c.p - c.q); \\r
167 if(!ASN1_check_infinite_end(&c.p, Tlen)) \\r
168 { c.error=ERR_R_MISSING_ASN1_EOS; \\r
169- c.line=__LINE__; goto err; } \\r
170+ c.line=OPENSSL_LINE; goto err; } \\r
171 }\\r
172 c.slen-=(c.p-c.q); \\r
173 }\r
174@@ -337,17 +337,17 @@ err:\\r
175 Tinf=ASN1_get_object(&c.p,&Tlen,&Ttag,&Tclass,c.slen); \\r
176 if (Tinf & 0x80) \\r
177 { c.error=ERR_R_BAD_ASN1_OBJECT_HEADER; \\r
178- c.line=__LINE__; goto err; } \\r
179+ c.line=OPENSSL_LINE; goto err; } \\r
180 if (Tinf == (V_ASN1_CONSTRUCTED+1)) \\r
181 Tlen = c.slen - (c.p - c.q) - 2; \\r
182 if (d2i_ASN1_SET_OF_##type(&(r),&c.p,Tlen,func, \\r
183 free_func,b,V_ASN1_UNIVERSAL) == NULL) \\r
184- { c.line=__LINE__; goto err; } \\r
185+ { c.line=OPENSSL_LINE; goto err; } \\r
186 if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \\r
187 Tlen = c.slen - (c.p - c.q); \\r
188 if(!ASN1_check_infinite_end(&c.p, Tlen)) \\r
189 { c.error=ERR_R_MISSING_ASN1_EOS; \\r
190- c.line=__LINE__; goto err; } \\r
191+ c.line=OPENSSL_LINE; goto err; } \\r
192 }\\r
193 c.slen-=(c.p-c.q); \\r
194 }\r
195@@ -355,7 +355,7 @@ err:\\r
196 /* New macros */\r
197 # define M_ASN1_New_Malloc(ret,type) \\r
198 if ((ret=(type *)OPENSSL_malloc(sizeof(type))) == NULL) \\r
199- { c.line=__LINE__; goto err2; }\r
200+ { c.line=OPENSSL_LINE; goto err2; }\r
201 \r
202 # define M_ASN1_New(arg,func) \\r
203 if (((arg)=func()) == NULL) return(NULL)\r
ca6fa1fe
QL		 204diff --git a/crypto/conf/conf.h b/crypto/conf/conf.h\r
205index 8d926d5..41cf38e 100644\r
206--- a/crypto/conf/conf.h\r
207+++ b/crypto/conf/conf.h\r
208@@ -118,8 +118,10 @@ typedef void conf_finish_func (CONF_IMODULE *md);\r
209 \r
210 int CONF_set_default_method(CONF_METHOD *meth);\r
211 void CONF_set_nconf(CONF *conf, LHASH_OF(CONF_VALUE) *hash);\r
212+# ifndef OPENSSL_NO_STDIO\r
213 LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,\r
214 long *eline);\r
215+# endif\r
216 # ifndef OPENSSL_NO_FP_API\r
217 LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,\r
218 long *eline);\r
219@@ -133,7 +135,9 @@ char *CONF_get_string(LHASH_OF(CONF_VALUE) *conf, const char *group,\r
220 long CONF_get_number(LHASH_OF(CONF_VALUE) *conf, const char *group,\r
221 const char *name);\r
222 void CONF_free(LHASH_OF(CONF_VALUE) *conf);\r
223+#ifndef OPENSSL_NO_FP_API\r
224 int CONF_dump_fp(LHASH_OF(CONF_VALUE) *conf, FILE *out);\r
225+#endif\r
226 int CONF_dump_bio(LHASH_OF(CONF_VALUE) *conf, BIO *out);\r
227 \r
228 void OPENSSL_config(const char *config_name);\r
229@@ -160,7 +164,9 @@ CONF_METHOD *NCONF_XML(void);\r
230 void NCONF_free(CONF *conf);\r
231 void NCONF_free_data(CONF *conf);\r
232 \r
233+# ifndef OPENSSL_NO_STDIO\r
234 int NCONF_load(CONF *conf, const char *file, long *eline);\r
235+# endif\r
236 # ifndef OPENSSL_NO_FP_API\r
237 int NCONF_load_fp(CONF *conf, FILE *fp, long *eline);\r
f93f78ea 238 # endif\r
ca6fa1fe
QL		 239@@ -170,7 +176,9 @@ STACK_OF(CONF_VALUE) *NCONF_get_section(const CONF *conf,\r
240 char *NCONF_get_string(const CONF *conf, const char *group, const char *name);\r
241 int NCONF_get_number_e(const CONF *conf, const char *group, const char *name,\r
242 long *result);\r
243+#ifndef OPENSSL_NO_FP_API\r
244 int NCONF_dump_fp(const CONF *conf, FILE *out);\r
245+#endif\r
246 int NCONF_dump_bio(const CONF *conf, BIO *out);\r
247 \r
248 # if 0 /* The following function has no error\r
249@@ -184,8 +192,10 @@ long NCONF_get_number(CONF *conf, char *group, char *name);\r
250 \r
251 int CONF_modules_load(const CONF *cnf, const char *appname,\r
252 unsigned long flags);\r
253+#ifndef OPENSSL_NO_STDIO\r
254 int CONF_modules_load_file(const char *filename, const char *appname,\r
255 unsigned long flags);\r
256+#endif\r
257 void CONF_modules_unload(int all);\r
258 void CONF_modules_finish(void);\r
259 void CONF_modules_free(void);\r
260diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c\r
261index 68c77ce..3d308c7 100644\r
262--- a/crypto/conf/conf_def.c\r
263+++ b/crypto/conf/conf_def.c\r
264@@ -182,6 +182,10 @@ static int def_destroy_data(CONF *conf)\r
265 \r
266 static int def_load(CONF *conf, const char *name, long *line)\r
267 {\r
268+#ifdef OPENSSL_NO_STDIO\r
269+ CONFerr(CONF_F_DEF_LOAD, ERR_R_SYS_LIB);\r
270+ return 0;\r
271+#else\r
272 int ret;\r
273 BIO *in = NULL;\r
274 \r
275@@ -202,6 +206,7 @@ static int def_load(CONF *conf, const char *name, long *line)\r
276 BIO_free(in);\r
277 \r
278 return ret;\r
279+#endif\r
f93f78ea
QL		 280 }\r
281 \r
ca6fa1fe
QL		 282 static int def_load_bio(CONF *conf, BIO *in, long *line)\r
283diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c\r
284index 5281384..952b545 100644\r
285--- a/crypto/conf/conf_lib.c\r
286+++ b/crypto/conf/conf_lib.c\r
287@@ -90,6 +90,7 @@ int CONF_set_default_method(CONF_METHOD *meth)\r
288 return 1;\r
289 }\r
290 \r
291+#ifndef OPENSSL_NO_STDIO\r
292 LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,\r
293 long *eline)\r
294 {\r
295@@ -111,6 +112,7 @@ LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,\r
296 \r
297 return ltmp;\r
298 }\r
299+#endif\r
300 \r
301 #ifndef OPENSSL_NO_FP_API\r
302 LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,\r
303@@ -255,6 +257,7 @@ void NCONF_free_data(CONF *conf)\r
304 conf->meth->destroy_data(conf);\r
305 }\r
306 \r
307+#ifndef OPENSSL_NO_STDIO\r
308 int NCONF_load(CONF *conf, const char *file, long *eline)\r
309 {\r
310 if (conf == NULL) {\r
311@@ -264,6 +267,7 @@ int NCONF_load(CONF *conf, const char *file, long *eline)\r
312 \r
313 return conf->meth->load(conf, file, eline);\r
314 }\r
315+#endif\r
316 \r
317 #ifndef OPENSSL_NO_FP_API\r
318 int NCONF_load_fp(CONF *conf, FILE *fp, long *eline)\r
319diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c\r
320index 9acfca4..5e0a482 100644\r
321--- a/crypto/conf/conf_mod.c\r
322+++ b/crypto/conf/conf_mod.c\r
323@@ -159,6 +159,7 @@ int CONF_modules_load(const CONF *cnf, const char *appname,\r
f93f78ea 324 \r
ca6fa1fe
QL		 325 }\r
326 \r
327+#ifndef OPENSSL_NO_STDIO\r
328 int CONF_modules_load_file(const char *filename, const char *appname,\r
329 unsigned long flags)\r
330 {\r
331@@ -194,6 +195,7 @@ int CONF_modules_load_file(const char *filename, const char *appname,\r
332 \r
333 return ret;\r
334 }\r
335+#endif\r
336 \r
337 static int module_run(const CONF *cnf, char *name, char *value,\r
338 unsigned long flags)\r
339diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c\r
340index c042cf2..a25b636 100644\r
341--- a/crypto/conf/conf_sap.c\r
342+++ b/crypto/conf/conf_sap.c\r
343@@ -87,9 +87,11 @@ void OPENSSL_config(const char *config_name)\r
344 ENGINE_load_builtin_engines();\r
345 #endif\r
346 ERR_clear_error();\r
347+#ifndef OPENSSL_NO_STDIO\r
348 CONF_modules_load_file(NULL, config_name,\r
349 CONF_MFLAGS_DEFAULT_SECTION |\r
350 CONF_MFLAGS_IGNORE_MISSING_FILE);\r
351+#endif\r
352 openssl_configured = 1;\r
353 }\r
354 \r
355diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c\r
e578aa19 356index c9f674b..39ead7f 100644\r
ca6fa1fe
QL		 357--- a/crypto/cryptlib.c\r
358+++ b/crypto/cryptlib.c\r
e578aa19
QL		 359@@ -263,7 +263,7 @@ int CRYPTO_get_new_dynlockid(void)\r
360 return (0);\r
361 }\r
362 pointer->references = 1;\r
363- pointer->data = dynlock_create_callback(__FILE__, __LINE__);\r
364+ pointer->data = dynlock_create_callback(OPENSSL_FILE, OPENSSL_LINE);\r
365 if (pointer->data == NULL) {\r
366 OPENSSL_free(pointer);\r
367 CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID, ERR_R_MALLOC_FAILURE);\r
368@@ -289,7 +289,7 @@ int CRYPTO_get_new_dynlockid(void)\r
369 CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK);\r
370 \r
371 if (i == -1) {\r
372- dynlock_destroy_callback(pointer->data, __FILE__, __LINE__);\r
373+ dynlock_destroy_callback(pointer->data, OPENSSL_FILE, OPENSSL_LINE);\r
374 OPENSSL_free(pointer);\r
375 } else\r
376 i += 1; /* to avoid 0 */\r
377@@ -328,7 +328,7 @@ void CRYPTO_destroy_dynlockid(int i)\r
378 CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK);\r
379 \r
380 if (pointer) {\r
381- dynlock_destroy_callback(pointer->data, __FILE__, __LINE__);\r
382+ dynlock_destroy_callback(pointer->data, OPENSSL_FILE, OPENSSL_LINE);\r
383 OPENSSL_free(pointer);\r
384 }\r
385 }\r
ca6fa1fe
QL		 386@@ -670,6 +670,7 @@ unsigned long *OPENSSL_ia32cap_loc(void)\r
387 }\r
388 \r
389 # if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY)\r
390+#include <stdio.h>\r
391 # define OPENSSL_CPUID_SETUP\r
392 # if defined(_WIN32)\r
393 typedef unsigned __int64 IA32CAP;\r
394@@ -980,11 +981,13 @@ void OPENSSL_showfatal(const char *fmta, ...)\r
395 #else\r
396 void OPENSSL_showfatal(const char *fmta, ...)\r
397 {\r
398+#ifndef OPENSSL_NO_STDIO\r
399 va_list ap;\r
400 \r
401 va_start(ap, fmta);\r
402 vfprintf(stderr, fmta, ap);\r
403 va_end(ap);\r
404+#endif\r
405 }\r
406 \r
407 int OPENSSL_isservice(void)\r
408@@ -1011,10 +1014,12 @@ void OpenSSLDie(const char *file, int line, const char *assertion)\r
409 #endif\r
410 }\r
411 \r
412+#ifndef OPENSSL_NO_STDIO\r
413 void *OPENSSL_stderr(void)\r
414 {\r
415 return stderr;\r
416 }\r
417+#endif\r
418 \r
419 int CRYPTO_memcmp(const void *in_a, const void *in_b, size_t len)\r
420 {\r
421diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h\r
422index fba180a..3e3ea5e 100644\r
423--- a/crypto/cryptlib.h\r
424+++ b/crypto/cryptlib.h\r
425@@ -101,7 +101,9 @@ extern "C" {\r
426 void OPENSSL_cpuid_setup(void);\r
427 extern unsigned int OPENSSL_ia32cap_P[];\r
428 void OPENSSL_showfatal(const char *fmta, ...);\r
429+#ifndef OPENSSL_NO_STDIO\r
430 void *OPENSSL_stderr(void);\r
431+#endif\r
432 extern int OPENSSL_NONPIC_relocated;\r
433 \r
434 #ifdef __cplusplus\r
3f73ccb3 435diff --git a/crypto/crypto.h b/crypto/crypto.h\r
e578aa19 436index c450d7a..063d78e 100644\r
3f73ccb3
QL		 437--- a/crypto/crypto.h\r
438+++ b/crypto/crypto.h\r
439@@ -235,15 +235,15 @@ typedef struct openssl_item_st {\r
440 # ifndef OPENSSL_NO_LOCKING\r
441 # ifndef CRYPTO_w_lock\r
442 # define CRYPTO_w_lock(type) \\r
443- CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)\r
e578aa19 444+ CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,OPENSSL_FILE,OPENSSL_LINE)\r
3f73ccb3
QL		 445 # define CRYPTO_w_unlock(type) \\r
446- CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)\r
e578aa19 447+ CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,OPENSSL_FILE,OPENSSL_LINE)\r
3f73ccb3
QL		 448 # define CRYPTO_r_lock(type) \\r
449- CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)\r
e578aa19 450+ CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,OPENSSL_FILE,OPENSSL_LINE)\r
3f73ccb3
QL		 451 # define CRYPTO_r_unlock(type) \\r
452- CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)\r
e578aa19 453+ CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,OPENSSL_FILE,OPENSSL_LINE)\r
3f73ccb3
QL		 454 # define CRYPTO_add(addr,amount,type) \\r
455- CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)\r
e578aa19 456+ CRYPTO_add_lock(addr,amount,type,OPENSSL_FILE,OPENSSL_LINE)\r
3f73ccb3
QL		 457 # endif\r
458 # else\r
459 # define CRYPTO_w_lock(a)\r
460@@ -378,19 +378,19 @@ int CRYPTO_is_mem_check_on(void);\r
461 # define MemCheck_off() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE)\r
462 # define is_MemCheck_on() CRYPTO_is_mem_check_on()\r
463 \r
464-# define OPENSSL_malloc(num) CRYPTO_malloc((int)num,__FILE__,__LINE__)\r
465-# define OPENSSL_strdup(str) CRYPTO_strdup((str),__FILE__,__LINE__)\r
e578aa19
QL		 466+# define OPENSSL_malloc(num) CRYPTO_malloc((int)num,OPENSSL_FILE,OPENSSL_LINE)\r
467+# define OPENSSL_strdup(str) CRYPTO_strdup((str),OPENSSL_FILE,OPENSSL_LINE)\r
3f73ccb3
QL		 468 # define OPENSSL_realloc(addr,num) \\r
469- CRYPTO_realloc((char *)addr,(int)num,__FILE__,__LINE__)\r
e578aa19 470+ CRYPTO_realloc((char *)addr,(int)num,OPENSSL_FILE,OPENSSL_LINE)\r
3f73ccb3
QL		 471 # define OPENSSL_realloc_clean(addr,old_num,num) \\r
472- CRYPTO_realloc_clean(addr,old_num,num,__FILE__,__LINE__)\r
e578aa19 473+ CRYPTO_realloc_clean(addr,old_num,num,OPENSSL_FILE,OPENSSL_LINE)\r
3f73ccb3
QL		 474 # define OPENSSL_remalloc(addr,num) \\r
475- CRYPTO_remalloc((char **)addr,(int)num,__FILE__,__LINE__)\r
e578aa19 476+ CRYPTO_remalloc((char **)addr,(int)num,OPENSSL_FILE,OPENSSL_LINE)\r
3f73ccb3
QL		 477 # define OPENSSL_freeFunc CRYPTO_free\r
478 # define OPENSSL_free(addr) CRYPTO_free(addr)\r
479 \r
480 # define OPENSSL_malloc_locked(num) \\r
481- CRYPTO_malloc_locked((int)num,__FILE__,__LINE__)\r
e578aa19 482+ CRYPTO_malloc_locked((int)num,OPENSSL_FILE,OPENSSL_LINE)\r
3f73ccb3
QL		 483 # define OPENSSL_free_locked(addr) CRYPTO_free_locked(addr)\r
484 \r
485 const char *SSLeay_version(int type);\r
486@@ -545,7 +545,7 @@ void CRYPTO_set_mem_debug_options(long bits);\r
487 long CRYPTO_get_mem_debug_options(void);\r
488 \r
489 # define CRYPTO_push_info(info) \\r
490- CRYPTO_push_info_(info, __FILE__, __LINE__);\r
e578aa19 491+ CRYPTO_push_info_(info, OPENSSL_FILE, OPENSSL_LINE);\r
3f73ccb3
QL		 492 int CRYPTO_push_info_(const char *info, const char *file, int line);\r
493 int CRYPTO_pop_info(void);\r
494 int CRYPTO_remove_all_info(void);\r
495@@ -588,7 +588,7 @@ void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb);\r
496 \r
497 /* die if we have to */\r
498 void OpenSSLDie(const char *file, int line, const char *assertion);\r
499-# define OPENSSL_assert(e) (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1))\r
e578aa19 500+# define OPENSSL_assert(e) (void)((e) ? 0 : (OpenSSLDie(OPENSSL_FILE, OPENSSL_LINE, #e),1))\r
3f73ccb3
QL		 501 \r
502 unsigned long *OPENSSL_ia32cap_loc(void);\r
503 # define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))\r
504@@ -605,14 +605,14 @@ void OPENSSL_init(void);\r
505 # define fips_md_init_ctx(alg, cx) \\r
506 int alg##_Init(cx##_CTX *c) \\r
507 { \\r
508- if (FIPS_mode()) OpenSSLDie(__FILE__, __LINE__, \\r
e578aa19 509+ if (FIPS_mode()) OpenSSLDie(OPENSSL_FILE, OPENSSL_LINE, \\r
3f73ccb3
QL		 510 "Low level API call to digest " #alg " forbidden in FIPS mode!"); \\r
511 return private_##alg##_Init(c); \\r
512 } \\r
513 int private_##alg##_Init(cx##_CTX *c)\r
514 \r
515 # define fips_cipher_abort(alg) \\r
516- if (FIPS_mode()) OpenSSLDie(__FILE__, __LINE__, \\r
e578aa19 517+ if (FIPS_mode()) OpenSSLDie(OPENSSL_FILE, OPENSSL_LINE, \\r
3f73ccb3
QL		 518 "Low level API call to cipher " #alg " forbidden in FIPS mode!")\r
519 \r
520 # else\r
ca6fa1fe
QL		 521diff --git a/crypto/des/read2pwd.c b/crypto/des/read2pwd.c\r
522index 01e275f..7633139 100644\r
523--- a/crypto/des/read2pwd.c\r
524+++ b/crypto/des/read2pwd.c\r
525@@ -114,6 +114,10 @@\r
526 #include <openssl/ui.h>\r
527 #include <openssl/crypto.h>\r
528 \r
529+#ifndef BUFSIZ\r
530+#define BUFSIZ 256\r
531+#endif\r
532+\r
533 int DES_read_password(DES_cblock *key, const char *prompt, int verify)\r
534 {\r
535 int ok;\r
3f73ccb3
QL		 536diff --git a/crypto/dh/dh_pmeth.c b/crypto/dh/dh_pmeth.c\r
537index b58e3fa..e5f345a 100644\r
538--- a/crypto/dh/dh_pmeth.c\r
539+++ b/crypto/dh/dh_pmeth.c\r
540@@ -449,6 +449,9 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key,\r
f93f78ea
QL		 541 *keylen = ret;\r
542 return 1;\r
543 } else if (dctx->kdf_type == EVP_PKEY_DH_KDF_X9_42) {\r
544+#ifdef OPENSSL_NO_CMS\r
545+ return 0;\r
546+#else\r
547 unsigned char *Z = NULL;\r
548 size_t Zlen = 0;\r
549 if (!dctx->kdf_outlen || !dctx->kdf_oid)\r
3f73ccb3 550@@ -478,6 +481,7 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key,\r
f93f78ea
QL		 551 OPENSSL_free(Z);\r
552 }\r
553 return ret;\r
554+#endif\r
555 }\r
556 return 1;\r
557 }\r
e578aa19
QL		 558diff --git a/crypto/engine/eng_int.h b/crypto/engine/eng_int.h\r
559index 46f163b..b4a72a0 100644\r
560--- a/crypto/engine/eng_int.h\r
561+++ b/crypto/engine/eng_int.h\r
562@@ -88,7 +88,7 @@ extern "C" {\r
563 (unsigned int)(e), (isfunct ? "funct" : "struct"), \\r
564 ((isfunct) ? ((e)->funct_ref - (diff)) : ((e)->struct_ref - (diff))), \\r
565 ((isfunct) ? (e)->funct_ref : (e)->struct_ref), \\r
566- (__FILE__), (__LINE__));\r
567+ (OPENSSL_FILE), (OPENSSL_LINE));\r
568 \r
569 # else\r
570 \r
571@@ -136,7 +136,7 @@ ENGINE *engine_table_select(ENGINE_TABLE **table, int nid);\r
572 # else\r
573 ENGINE *engine_table_select_tmp(ENGINE_TABLE **table, int nid, const char *f,\r
574 int l);\r
575-# define engine_table_select(t,n) engine_table_select_tmp(t,n,__FILE__,__LINE__)\r
576+# define engine_table_select(t,n) engine_table_select_tmp(t,n,OPENSSL_FILE,OPENSSL_LINE)\r
577 # endif\r
578 typedef void (engine_table_doall_cb) (int nid, STACK_OF(ENGINE) *sk,\r
579 ENGINE *def, void *arg);\r
ca6fa1fe
QL		 580diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c\r
581index 34b0029..cf622bb 100644\r
582--- a/crypto/engine/eng_openssl.c\r
583+++ b/crypto/engine/eng_openssl.c\r
584@@ -86,7 +86,9 @@\r
585 * this is no longer automatic in ENGINE_load_builtin_engines().\r
586 */\r
587 #define TEST_ENG_OPENSSL_RC4\r
588+#ifndef OPENSSL_NO_FP_API\r
589 #define TEST_ENG_OPENSSL_PKEY\r
590+#endif\r
591 /* #define TEST_ENG_OPENSSL_RC4_OTHERS */\r
592 #define TEST_ENG_OPENSSL_RC4_P_INIT\r
593 /* #define TEST_ENG_OPENSSL_RC4_P_CIPHER */\r
e578aa19
QL		 594diff --git a/crypto/err/err.h b/crypto/err/err.h\r
595index 585aa8b..04c6cfc 100644\r
596--- a/crypto/err/err.h\r
597+++ b/crypto/err/err.h\r
598@@ -200,39 +200,39 @@ typedef struct err_state_st {\r
599 \r
600 # define ERR_LIB_USER 128\r
601 \r
602-# define SYSerr(f,r) ERR_PUT_error(ERR_LIB_SYS,(f),(r),__FILE__,__LINE__)\r
603-# define BNerr(f,r) ERR_PUT_error(ERR_LIB_BN,(f),(r),__FILE__,__LINE__)\r
604-# define RSAerr(f,r) ERR_PUT_error(ERR_LIB_RSA,(f),(r),__FILE__,__LINE__)\r
605-# define DHerr(f,r) ERR_PUT_error(ERR_LIB_DH,(f),(r),__FILE__,__LINE__)\r
606-# define EVPerr(f,r) ERR_PUT_error(ERR_LIB_EVP,(f),(r),__FILE__,__LINE__)\r
607-# define BUFerr(f,r) ERR_PUT_error(ERR_LIB_BUF,(f),(r),__FILE__,__LINE__)\r
608-# define OBJerr(f,r) ERR_PUT_error(ERR_LIB_OBJ,(f),(r),__FILE__,__LINE__)\r
609-# define PEMerr(f,r) ERR_PUT_error(ERR_LIB_PEM,(f),(r),__FILE__,__LINE__)\r
610-# define DSAerr(f,r) ERR_PUT_error(ERR_LIB_DSA,(f),(r),__FILE__,__LINE__)\r
611-# define X509err(f,r) ERR_PUT_error(ERR_LIB_X509,(f),(r),__FILE__,__LINE__)\r
612-# define ASN1err(f,r) ERR_PUT_error(ERR_LIB_ASN1,(f),(r),__FILE__,__LINE__)\r
613-# define CONFerr(f,r) ERR_PUT_error(ERR_LIB_CONF,(f),(r),__FILE__,__LINE__)\r
614-# define CRYPTOerr(f,r) ERR_PUT_error(ERR_LIB_CRYPTO,(f),(r),__FILE__,__LINE__)\r
615-# define ECerr(f,r) ERR_PUT_error(ERR_LIB_EC,(f),(r),__FILE__,__LINE__)\r
616-# define SSLerr(f,r) ERR_PUT_error(ERR_LIB_SSL,(f),(r),__FILE__,__LINE__)\r
617-# define BIOerr(f,r) ERR_PUT_error(ERR_LIB_BIO,(f),(r),__FILE__,__LINE__)\r
618-# define PKCS7err(f,r) ERR_PUT_error(ERR_LIB_PKCS7,(f),(r),__FILE__,__LINE__)\r
619-# define X509V3err(f,r) ERR_PUT_error(ERR_LIB_X509V3,(f),(r),__FILE__,__LINE__)\r
620-# define PKCS12err(f,r) ERR_PUT_error(ERR_LIB_PKCS12,(f),(r),__FILE__,__LINE__)\r
621-# define RANDerr(f,r) ERR_PUT_error(ERR_LIB_RAND,(f),(r),__FILE__,__LINE__)\r
622-# define DSOerr(f,r) ERR_PUT_error(ERR_LIB_DSO,(f),(r),__FILE__,__LINE__)\r
623-# define ENGINEerr(f,r) ERR_PUT_error(ERR_LIB_ENGINE,(f),(r),__FILE__,__LINE__)\r
624-# define OCSPerr(f,r) ERR_PUT_error(ERR_LIB_OCSP,(f),(r),__FILE__,__LINE__)\r
625-# define UIerr(f,r) ERR_PUT_error(ERR_LIB_UI,(f),(r),__FILE__,__LINE__)\r
626-# define COMPerr(f,r) ERR_PUT_error(ERR_LIB_COMP,(f),(r),__FILE__,__LINE__)\r
627-# define ECDSAerr(f,r) ERR_PUT_error(ERR_LIB_ECDSA,(f),(r),__FILE__,__LINE__)\r
628-# define ECDHerr(f,r) ERR_PUT_error(ERR_LIB_ECDH,(f),(r),__FILE__,__LINE__)\r
629-# define STOREerr(f,r) ERR_PUT_error(ERR_LIB_STORE,(f),(r),__FILE__,__LINE__)\r
630-# define FIPSerr(f,r) ERR_PUT_error(ERR_LIB_FIPS,(f),(r),__FILE__,__LINE__)\r
631-# define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),__FILE__,__LINE__)\r
632-# define TSerr(f,r) ERR_PUT_error(ERR_LIB_TS,(f),(r),__FILE__,__LINE__)\r
633-# define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),__FILE__,__LINE__)\r
634-# define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),__FILE__,__LINE__)\r
635+# define SYSerr(f,r) ERR_PUT_error(ERR_LIB_SYS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
636+# define BNerr(f,r) ERR_PUT_error(ERR_LIB_BN,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
637+# define RSAerr(f,r) ERR_PUT_error(ERR_LIB_RSA,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
638+# define DHerr(f,r) ERR_PUT_error(ERR_LIB_DH,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
639+# define EVPerr(f,r) ERR_PUT_error(ERR_LIB_EVP,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
640+# define BUFerr(f,r) ERR_PUT_error(ERR_LIB_BUF,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
641+# define OBJerr(f,r) ERR_PUT_error(ERR_LIB_OBJ,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
642+# define PEMerr(f,r) ERR_PUT_error(ERR_LIB_PEM,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
643+# define DSAerr(f,r) ERR_PUT_error(ERR_LIB_DSA,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
644+# define X509err(f,r) ERR_PUT_error(ERR_LIB_X509,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
645+# define ASN1err(f,r) ERR_PUT_error(ERR_LIB_ASN1,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
646+# define CONFerr(f,r) ERR_PUT_error(ERR_LIB_CONF,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
647+# define CRYPTOerr(f,r) ERR_PUT_error(ERR_LIB_CRYPTO,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
648+# define ECerr(f,r) ERR_PUT_error(ERR_LIB_EC,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
649+# define SSLerr(f,r) ERR_PUT_error(ERR_LIB_SSL,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
650+# define BIOerr(f,r) ERR_PUT_error(ERR_LIB_BIO,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
651+# define PKCS7err(f,r) ERR_PUT_error(ERR_LIB_PKCS7,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
652+# define X509V3err(f,r) ERR_PUT_error(ERR_LIB_X509V3,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
653+# define PKCS12err(f,r) ERR_PUT_error(ERR_LIB_PKCS12,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
654+# define RANDerr(f,r) ERR_PUT_error(ERR_LIB_RAND,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
655+# define DSOerr(f,r) ERR_PUT_error(ERR_LIB_DSO,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
656+# define ENGINEerr(f,r) ERR_PUT_error(ERR_LIB_ENGINE,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
657+# define OCSPerr(f,r) ERR_PUT_error(ERR_LIB_OCSP,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
658+# define UIerr(f,r) ERR_PUT_error(ERR_LIB_UI,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
659+# define COMPerr(f,r) ERR_PUT_error(ERR_LIB_COMP,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
660+# define ECDSAerr(f,r) ERR_PUT_error(ERR_LIB_ECDSA,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
661+# define ECDHerr(f,r) ERR_PUT_error(ERR_LIB_ECDH,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
662+# define STOREerr(f,r) ERR_PUT_error(ERR_LIB_STORE,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
663+# define FIPSerr(f,r) ERR_PUT_error(ERR_LIB_FIPS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
664+# define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
665+# define TSerr(f,r) ERR_PUT_error(ERR_LIB_TS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
666+# define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
667+# define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
668 \r
669 /*\r
670 * Borland C seems too stupid to be able to shift and do longs in the\r
671diff --git a/crypto/opensslconf.h.in b/crypto/opensslconf.h.in\r
672index 7a1c85d..a5f51a7 100644\r
673--- a/crypto/opensslconf.h.in\r
674+++ b/crypto/opensslconf.h.in\r
675@@ -1,5 +1,15 @@\r
676 /* crypto/opensslconf.h.in */\r
677 \r
678+#ifndef OPENSSL_FILE\r
679+#ifdef OPENSSL_NO_FILENAMES\r
680+#define OPENSSL_FILE ""\r
681+#define OPENSSL_LINE 0\r
682+#else\r
683+#define OPENSSL_FILE __FILE__\r
684+#define OPENSSL_LINE __LINE__\r
685+#endif\r
686+#endif\r
687+\r
688 /* Generate 80386 code? */\r
689 #undef I386_ONLY\r
690 \r
3f73ccb3 691diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h\r
ca6fa1fe 692index d3b23fc..87b0b6a 100644\r
3f73ccb3
QL		 693--- a/crypto/pem/pem.h\r
694+++ b/crypto/pem/pem.h\r
695@@ -324,6 +324,7 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \\r
f93f78ea
QL		 696 \r
697 # define DECLARE_PEM_read_fp(name, type) /**/\r
698 # define DECLARE_PEM_write_fp(name, type) /**/\r
699+# define DECLARE_PEM_write_fp_const(name, type) /**/\r
700 # define DECLARE_PEM_write_cb_fp(name, type) /**/\r
701 # else\r
702 \r
ca6fa1fe
QL		 703@@ -417,6 +418,7 @@ int PEM_X509_INFO_write_bio(BIO *bp, X509_INFO *xi, EVP_CIPHER *enc,\r
704 pem_password_cb *cd, void *u);\r
705 # endif\r
706 \r
707+#ifndef OPENSSL_NO_FP_API\r
708 int PEM_read(FILE *fp, char **name, char **header,\r
709 unsigned char **data, long *len);\r
710 int PEM_write(FILE *fp, const char *name, const char *hdr,\r
711@@ -428,6 +430,7 @@ int PEM_ASN1_write(i2d_of_void *i2d, const char *name, FILE *fp,\r
712 int klen, pem_password_cb *callback, void *u);\r
713 STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk,\r
714 pem_password_cb *cb, void *u);\r
715+#endif\r
716 \r
717 int PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type,\r
718 EVP_MD *md_type, unsigned char **ek, int *ekl,\r
719@@ -494,6 +497,7 @@ int i2d_PKCS8PrivateKey_nid_bio(BIO *bp, EVP_PKEY *x, int nid,\r
720 EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,\r
721 void *u);\r
722 \r
723+#ifndef OPENSSL_NO_FP_API\r
724 int i2d_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,\r
725 char *kstr, int klen,\r
726 pem_password_cb *cb, void *u);\r
727@@ -510,7 +514,7 @@ EVP_PKEY *d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,\r
728 int PEM_write_PKCS8PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,\r
729 char *kstr, int klen, pem_password_cb *cd,\r
730 void *u);\r
731-\r
732+#endif\r
733 EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x);\r
734 int PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x);\r
735 \r
736diff --git a/crypto/pem/pem_pk8.c b/crypto/pem/pem_pk8.c\r
737index 5747c73..fe465cc 100644\r
738--- a/crypto/pem/pem_pk8.c\r
739+++ b/crypto/pem/pem_pk8.c\r
740@@ -69,10 +69,12 @@\r
741 static int do_pk8pkey(BIO *bp, EVP_PKEY *x, int isder,\r
742 int nid, const EVP_CIPHER *enc,\r
743 char *kstr, int klen, pem_password_cb *cb, void *u);\r
744+\r
745+#ifndef OPENSSL_NO_FP_API\r
746 static int do_pk8pkey_fp(FILE *bp, EVP_PKEY *x, int isder,\r
747 int nid, const EVP_CIPHER *enc,\r
748 char *kstr, int klen, pem_password_cb *cb, void *u);\r
749-\r
750+#endif\r
751 /*\r
752 * These functions write a private key in PKCS#8 format: it is a "drop in"\r
753 * replacement for PEM_write_bio_PrivateKey() and friends. As usual if 'enc'\r
3f73ccb3 754diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c\r
503f6e38 755index c4d3724..fd531c9 100644\r
3f73ccb3
QL		 756--- a/crypto/pkcs7/pk7_smime.c\r
757+++ b/crypto/pkcs7/pk7_smime.c\r
758@@ -254,7 +254,8 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,\r
f93f78ea
QL		 759 STACK_OF(PKCS7_SIGNER_INFO) *sinfos;\r
760 PKCS7_SIGNER_INFO *si;\r
761 X509_STORE_CTX cert_ctx;\r
762- char buf[4096];\r
763+ char *buf = NULL;\r
764+ int bufsiz;\r
765 int i, j = 0, k, ret = 0;\r
65202874
QL		 766 BIO *p7bio = NULL;\r
767 BIO *tmpin = NULL, *tmpout = NULL;\r
503f6e38
QL		 768@@ -274,12 +275,29 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,\r
769 PKCS7err(PKCS7_F_PKCS7_VERIFY, PKCS7_R_NO_CONTENT);\r
65202874
QL		 770 return 0;\r
771 }\r
503f6e38
QL		 772+#if 0\r
773+ /*\r
774+ * NB: this test commented out because some versions of Netscape\r
775+ * illegally include zero length content when signing data. Also\r
776+ * Microsoft Authenticode includes a SpcIndirectDataContent data\r
777+ * structure which describes the content to be protected by the\r
778+ * signature, rather than directly embedding that content. So\r
779+ * Authenticode implementations are also expected to use\r
780+ * PKCS7_verify() with explicit external data, on non-detached\r
781+ * PKCS#7 signatures.\r
782+ *\r
783+ * In OpenSSL 1.1 a new flag PKCS7_NO_DUAL_CONTENT has been\r
784+ * introduced to disable this sanity check. For the 1.0.2 branch\r
785+ * this change is not acceptable, so the check remains completely\r
786+ * commented out (as it has been for a long time).\r
787+ */\r
788 \r
789 /* Check for data and content: two sets of data */\r
790 if (!PKCS7_get_detached(p7) && indata) {\r
791 PKCS7err(PKCS7_F_PKCS7_VERIFY, PKCS7_R_CONTENT_AND_DATA_PRESENT);\r
792 return 0;\r
793 }\r
794+#endif\r
65202874 795 \r
65202874
QL		 796 sinfos = PKCS7_get_signer_info(p7);\r
797 \r
503f6e38 798@@ -355,9 +373,14 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,\r
f93f78ea
QL		 799 } else\r
800 tmpout = out;\r
801 \r
802+ bufsiz = 4096;\r
803+ buf = OPENSSL_malloc(bufsiz);\r
804+ if (buf == NULL) {\r
805+ goto err;\r
806+ }\r
807 /* We now have to 'read' from p7bio to calculate digests etc. */\r
808 for (;;) {\r
809- i = BIO_read(p7bio, buf, sizeof(buf));\r
810+ i = BIO_read(p7bio, buf, bufsiz);\r
811 if (i <= 0)\r
812 break;\r
813 if (tmpout)\r
503f6e38 814@@ -394,6 +417,9 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,\r
65202874 815 }\r
f93f78ea 816 BIO_free_all(p7bio);\r
f93f78ea 817 sk_X509_free(signers);\r
f93f78ea 818+ if (buf != NULL) {\r
e6b2c991 819+ OPENSSL_free(buf);\r
f93f78ea 820+ }\r
f93f78ea
QL		 821 return ret;\r
822 }\r
65202874 823 \r
3f73ccb3
QL		 824diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c\r
825index 266111e..f60fac6 100644\r
826--- a/crypto/rand/rand_unix.c\r
827+++ b/crypto/rand/rand_unix.c\r
f93f78ea
QL		 828@@ -116,7 +116,7 @@\r
829 #include <openssl/rand.h>\r
830 #include "rand_lcl.h"\r
831 \r
832-#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE))\r
833+#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_UEFI))\r
834 \r
835 # include <sys/types.h>\r
836 # include <sys/time.h>\r
3f73ccb3 837@@ -439,7 +439,7 @@ int RAND_poll(void)\r
f93f78ea
QL		 838 * defined(OPENSSL_SYS_VXWORKS) ||\r
839 * defined(OPENSSL_SYS_NETWARE)) */\r
840 \r
841-#if defined(OPENSSL_SYS_VXWORKS)\r
842+#if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)\r
843 int RAND_poll(void)\r
844 {\r
845 return 0;\r
3f73ccb3
QL		 846diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c\r
847index 4e06218..f591f0f 100644\r
848--- a/crypto/rsa/rsa_ameth.c\r
849+++ b/crypto/rsa/rsa_ameth.c\r
f93f78ea
QL		 850@@ -68,10 +68,12 @@\r
851 #endif\r
852 #include "asn1_locl.h"\r
853 \r
854+#ifndef OPENSSL_NO_CMS\r
855 static int rsa_cms_sign(CMS_SignerInfo *si);\r
856 static int rsa_cms_verify(CMS_SignerInfo *si);\r
857 static int rsa_cms_decrypt(CMS_RecipientInfo *ri);\r
858 static int rsa_cms_encrypt(CMS_RecipientInfo *ri);\r
859+#endif\r
860 \r
861 static int rsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)\r
862 {\r
3f73ccb3 863@@ -665,6 +667,7 @@ static int rsa_pss_to_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pkctx,\r
f93f78ea
QL		 864 return rv;\r
865 }\r
866 \r
867+#ifndef OPENSSL_NO_CMS\r
868 static int rsa_cms_verify(CMS_SignerInfo *si)\r
869 {\r
870 int nid, nid2;\r
3f73ccb3 871@@ -683,6 +686,7 @@ static int rsa_cms_verify(CMS_SignerInfo *si)\r
f93f78ea
QL		 872 }\r
873 return 0;\r
874 }\r
875+#endif\r
876 \r
877 /*\r
878 * Customised RSA item verification routine. This is called when a signature\r
3f73ccb3 879@@ -705,6 +709,7 @@ static int rsa_item_verify(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,\r
f93f78ea
QL		 880 return -1;\r
881 }\r
882 \r
883+#ifndef OPENSSL_NO_CMS\r
884 static int rsa_cms_sign(CMS_SignerInfo *si)\r
885 {\r
886 int pad_mode = RSA_PKCS1_PADDING;\r
3f73ccb3 887@@ -729,6 +734,7 @@ static int rsa_cms_sign(CMS_SignerInfo *si)\r
f93f78ea
QL		 888 X509_ALGOR_set0(alg, OBJ_nid2obj(NID_rsassaPss), V_ASN1_SEQUENCE, os);\r
889 return 1;\r
890 }\r
891+#endif\r
892 \r
893 static int rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,\r
894 X509_ALGOR *alg1, X509_ALGOR *alg2,\r
3f73ccb3 895@@ -785,6 +791,7 @@ static RSA_OAEP_PARAMS *rsa_oaep_decode(const X509_ALGOR *alg,\r
f93f78ea
QL		 896 return pss;\r
897 }\r
898 \r
899+#ifndef OPENSSL_NO_CMS\r
900 static int rsa_cms_decrypt(CMS_RecipientInfo *ri)\r
901 {\r
902 EVP_PKEY_CTX *pkctx;\r
3f73ccb3 903@@ -857,7 +864,9 @@ static int rsa_cms_decrypt(CMS_RecipientInfo *ri)\r
f93f78ea
QL		 904 X509_ALGOR_free(maskHash);\r
905 return rv;\r
906 }\r
907+#endif\r
908 \r
909+#ifndef OPENSSL_NO_CMS\r
910 static int rsa_cms_encrypt(CMS_RecipientInfo *ri)\r
911 {\r
912 const EVP_MD *md, *mgf1md;\r
3f73ccb3 913@@ -920,6 +929,7 @@ static int rsa_cms_encrypt(CMS_RecipientInfo *ri)\r
f93f78ea
QL		 914 ASN1_STRING_free(os);\r
915 return rv;\r
916 }\r
917+#endif\r
918 \r
919 const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[] = {\r
920 {\r
ca6fa1fe
QL		 921diff --git a/crypto/srp/srp.h b/crypto/srp/srp.h\r
922index d072536..73b945f 100644\r
923--- a/crypto/srp/srp.h\r
924+++ b/crypto/srp/srp.h\r
925@@ -114,7 +114,9 @@ DECLARE_STACK_OF(SRP_gN)\r
926 \r
927 SRP_VBASE *SRP_VBASE_new(char *seed_key);\r
928 int SRP_VBASE_free(SRP_VBASE *vb);\r
929+#ifndef OPENSSL_NO_STDIO\r
930 int SRP_VBASE_init(SRP_VBASE *vb, char *verifier_file);\r
931+#endif\r
932 SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username);\r
933 char *SRP_create_verifier(const char *user, const char *pass, char **salt,\r
934 char **verifier, const char *N, const char *g);\r
935diff --git a/crypto/srp/srp_vfy.c b/crypto/srp/srp_vfy.c\r
936index a3f1a8a..3fbb186 100644\r
937--- a/crypto/srp/srp_vfy.c\r
938+++ b/crypto/srp/srp_vfy.c\r
939@@ -225,6 +225,7 @@ static int SRP_user_pwd_set_ids(SRP_user_pwd *vinfo, const char *id,\r
940 return (info == NULL || NULL != (vinfo->info = BUF_strdup(info)));\r
941 }\r
942 \r
943+#ifndef OPENSSL_NO_STDIO\r
944 static int SRP_user_pwd_set_sv(SRP_user_pwd *vinfo, const char *s,\r
945 const char *v)\r
946 {\r
947@@ -239,6 +240,7 @@ static int SRP_user_pwd_set_sv(SRP_user_pwd *vinfo, const char *s,\r
948 len = t_fromb64(tmp, s);\r
949 return ((vinfo->s = BN_bin2bn(tmp, len, NULL)) != NULL);\r
950 }\r
951+#endif\r
952 \r
953 static int SRP_user_pwd_set_sv_BN(SRP_user_pwd *vinfo, BIGNUM *s, BIGNUM *v)\r
954 {\r
955@@ -279,6 +281,7 @@ int SRP_VBASE_free(SRP_VBASE *vb)\r
956 return 0;\r
957 }\r
958 \r
959+#ifndef OPENSSL_NO_STDIO\r
960 static SRP_gN_cache *SRP_gN_new_init(const char *ch)\r
961 {\r
962 unsigned char tmp[MAX_LEN];\r
963@@ -310,6 +313,7 @@ static void SRP_gN_free(SRP_gN_cache *gN_cache)\r
964 BN_free(gN_cache->bn);\r
965 OPENSSL_free(gN_cache);\r
966 }\r
967+#endif\r
968 \r
969 static SRP_gN *SRP_get_gN_by_id(const char *id, STACK_OF(SRP_gN) *gN_tab)\r
970 {\r
971@@ -326,6 +330,7 @@ static SRP_gN *SRP_get_gN_by_id(const char *id, STACK_OF(SRP_gN) *gN_tab)\r
972 return SRP_get_default_gN(id);\r
973 }\r
974 \r
975+#ifndef OPENSSL_NO_STDIO\r
976 static BIGNUM *SRP_gN_place_bn(STACK_OF(SRP_gN_cache) *gN_cache, char *ch)\r
977 {\r
978 int i;\r
979@@ -467,6 +472,7 @@ int SRP_VBASE_init(SRP_VBASE *vb, char *verifier_file)\r
980 return error_code;\r
981 \r
982 }\r
983+#endif\r
984 \r
985 SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username)\r
986 {\r
987diff --git a/crypto/ts/ts.h b/crypto/ts/ts.h\r
988index 16eccbb..a9fe40e 100644\r
989--- a/crypto/ts/ts.h\r
990+++ b/crypto/ts/ts.h\r
991@@ -281,8 +281,10 @@ TS_REQ *d2i_TS_REQ(TS_REQ **a, const unsigned char **pp, long length);\r
992 \r
993 TS_REQ *TS_REQ_dup(TS_REQ *a);\r
994 \r
995+#ifndef OPENSSL_NO_FP_API\r
996 TS_REQ *d2i_TS_REQ_fp(FILE *fp, TS_REQ **a);\r
997 int i2d_TS_REQ_fp(FILE *fp, TS_REQ *a);\r
998+#endif\r
999 TS_REQ *d2i_TS_REQ_bio(BIO *fp, TS_REQ **a);\r
1000 int i2d_TS_REQ_bio(BIO *fp, TS_REQ *a);\r
1001 \r
1002@@ -294,10 +296,12 @@ TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT(TS_MSG_IMPRINT **a,\r
1003 \r
1004 TS_MSG_IMPRINT *TS_MSG_IMPRINT_dup(TS_MSG_IMPRINT *a);\r
1005 \r
1006+#ifndef OPENSSL_NO_FP_API\r
1007 TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT **a);\r
1008 int i2d_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT *a);\r
1009-TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT_bio(BIO *fp, TS_MSG_IMPRINT **a);\r
1010-int i2d_TS_MSG_IMPRINT_bio(BIO *fp, TS_MSG_IMPRINT *a);\r
1011+#endif\r
1012+TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT_bio(BIO *bio, TS_MSG_IMPRINT **a);\r
1013+int i2d_TS_MSG_IMPRINT_bio(BIO *bio, TS_MSG_IMPRINT *a);\r
1014 \r
1015 TS_RESP *TS_RESP_new(void);\r
1016 void TS_RESP_free(TS_RESP *a);\r
1017@@ -306,10 +310,12 @@ TS_RESP *d2i_TS_RESP(TS_RESP **a, const unsigned char **pp, long length);\r
1018 TS_TST_INFO *PKCS7_to_TS_TST_INFO(PKCS7 *token);\r
1019 TS_RESP *TS_RESP_dup(TS_RESP *a);\r
1020 \r
1021+#ifndef OPENSSL_NO_FP_API\r
1022 TS_RESP *d2i_TS_RESP_fp(FILE *fp, TS_RESP **a);\r
1023 int i2d_TS_RESP_fp(FILE *fp, TS_RESP *a);\r
1024-TS_RESP *d2i_TS_RESP_bio(BIO *fp, TS_RESP **a);\r
1025-int i2d_TS_RESP_bio(BIO *fp, TS_RESP *a);\r
1026+#endif\r
1027+TS_RESP *d2i_TS_RESP_bio(BIO *bio, TS_RESP **a);\r
1028+int i2d_TS_RESP_bio(BIO *bio, TS_RESP *a);\r
1029 \r
1030 TS_STATUS_INFO *TS_STATUS_INFO_new(void);\r
1031 void TS_STATUS_INFO_free(TS_STATUS_INFO *a);\r
1032@@ -325,10 +331,12 @@ TS_TST_INFO *d2i_TS_TST_INFO(TS_TST_INFO **a, const unsigned char **pp,\r
1033 long length);\r
1034 TS_TST_INFO *TS_TST_INFO_dup(TS_TST_INFO *a);\r
1035 \r
1036+#ifndef OPENSSL_NO_FP_API\r
1037 TS_TST_INFO *d2i_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO **a);\r
1038 int i2d_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO *a);\r
1039-TS_TST_INFO *d2i_TS_TST_INFO_bio(BIO *fp, TS_TST_INFO **a);\r
1040-int i2d_TS_TST_INFO_bio(BIO *fp, TS_TST_INFO *a);\r
1041+#endif\r
1042+TS_TST_INFO *d2i_TS_TST_INFO_bio(BIO *bio, TS_TST_INFO **a);\r
1043+int i2d_TS_TST_INFO_bio(BIO *bio, TS_TST_INFO *a);\r
1044 \r
1045 TS_ACCURACY *TS_ACCURACY_new(void);\r
1046 void TS_ACCURACY_free(TS_ACCURACY *a);\r
1047@@ -728,15 +736,18 @@ int TS_MSG_IMPRINT_print_bio(BIO *bio, TS_MSG_IMPRINT *msg);\r
1048 * ts/ts_conf.c\r
1049 */\r
1050 \r
1051+#ifndef OPENSSL_NO_STDIO\r
1052 X509 *TS_CONF_load_cert(const char *file);\r
1053 STACK_OF(X509) *TS_CONF_load_certs(const char *file);\r
1054 EVP_PKEY *TS_CONF_load_key(const char *file, const char *pass);\r
1055+#endif\r
1056 const char *TS_CONF_get_tsa_section(CONF *conf, const char *section);\r
1057 int TS_CONF_set_serial(CONF *conf, const char *section, TS_serial_cb cb,\r
1058 TS_RESP_CTX *ctx);\r
1059 int TS_CONF_set_crypto_device(CONF *conf, const char *section,\r
1060 const char *device);\r
1061 int TS_CONF_set_default_engine(const char *name);\r
1062+#ifndef OPENSSL_NO_STDIO\r
1063 int TS_CONF_set_signer_cert(CONF *conf, const char *section,\r
1064 const char *cert, TS_RESP_CTX *ctx);\r
1065 int TS_CONF_set_certs(CONF *conf, const char *section, const char *certs,\r
1066@@ -744,6 +755,7 @@ int TS_CONF_set_certs(CONF *conf, const char *section, const char *certs,\r
1067 int TS_CONF_set_signer_key(CONF *conf, const char *section,\r
1068 const char *key, const char *pass,\r
1069 TS_RESP_CTX *ctx);\r
1070+#endif\r
1071 int TS_CONF_set_def_policy(CONF *conf, const char *section,\r
1072 const char *policy, TS_RESP_CTX *ctx);\r
1073 int TS_CONF_set_policies(CONF *conf, const char *section, TS_RESP_CTX *ctx);\r
1074@@ -784,6 +796,11 @@ void ERR_load_TS_strings(void);\r
1075 # define TS_F_TS_CHECK_SIGNING_CERTS 103\r
1076 # define TS_F_TS_CHECK_STATUS_INFO 104\r
1077 # define TS_F_TS_COMPUTE_IMPRINT 145\r
1078+# define TS_F_TS_CONF_INVALID 151\r
1079+# define TS_F_TS_CONF_LOAD_CERT 153\r
1080+# define TS_F_TS_CONF_LOAD_CERTS 154\r
1081+# define TS_F_TS_CONF_LOAD_KEY 155\r
1082+# define TS_F_TS_CONF_LOOKUP_FAIL 152\r
1083 # define TS_F_TS_CONF_SET_DEFAULT_ENGINE 146\r
1084 # define TS_F_TS_GET_STATUS_TEXT 105\r
1085 # define TS_F_TS_MSG_IMPRINT_SET_ALGO 118\r
1086@@ -822,6 +839,8 @@ void ERR_load_TS_strings(void);\r
1087 /* Reason codes. */\r
1088 # define TS_R_BAD_PKCS7_TYPE 132\r
1089 # define TS_R_BAD_TYPE 133\r
1090+# define TS_R_CANNOT_LOAD_CERT 137\r
1091+# define TS_R_CANNOT_LOAD_KEY 138\r
1092 # define TS_R_CERTIFICATE_VERIFY_ERROR 100\r
1093 # define TS_R_COULD_NOT_SET_ENGINE 127\r
1094 # define TS_R_COULD_NOT_SET_TIME 115\r
1095@@ -854,6 +873,8 @@ void ERR_load_TS_strings(void);\r
1096 # define TS_R_UNACCEPTABLE_POLICY 125\r
1097 # define TS_R_UNSUPPORTED_MD_ALGORITHM 126\r
1098 # define TS_R_UNSUPPORTED_VERSION 113\r
1099+# define TS_R_VAR_BAD_VALUE 135\r
1100+# define TS_R_VAR_LOOKUP_FAILURE 136\r
1101 # define TS_R_WRONG_CONTENT_TYPE 114\r
1102 \r
1103 #ifdef __cplusplus\r
1104diff --git a/crypto/ts/ts_conf.c b/crypto/ts/ts_conf.c\r
1105index 4716b23..c4416ba 100644\r
1106--- a/crypto/ts/ts_conf.c\r
1107+++ b/crypto/ts/ts_conf.c\r
1108@@ -92,6 +92,7 @@\r
1109 \r
1110 /* Function definitions for certificate and key loading. */\r
1111 \r
1112+#ifndef OPENSSL_NO_STDIO\r
1113 X509 *TS_CONF_load_cert(const char *file)\r
1114 {\r
1115 BIO *cert = NULL;\r
1116@@ -102,7 +103,7 @@ X509 *TS_CONF_load_cert(const char *file)\r
1117 x = PEM_read_bio_X509_AUX(cert, NULL, NULL, NULL);\r
1118 end:\r
1119 if (x == NULL)\r
1120- fprintf(stderr, "unable to load certificate: %s\n", file);\r
1121+ TSerr(TS_F_TS_CONF_LOAD_CERT, TS_R_CANNOT_LOAD_CERT);\r
1122 BIO_free(cert);\r
1123 return x;\r
1124 }\r
1125@@ -129,7 +130,7 @@ STACK_OF(X509) *TS_CONF_load_certs(const char *file)\r
1126 }\r
1127 end:\r
1128 if (othercerts == NULL)\r
1129- fprintf(stderr, "unable to load certificates: %s\n", file);\r
1130+ TSerr(TS_F_TS_CONF_LOAD_CERTS, TS_R_CANNOT_LOAD_CERT);\r
1131 sk_X509_INFO_pop_free(allcerts, X509_INFO_free);\r
1132 BIO_free(certs);\r
1133 return othercerts;\r
1134@@ -145,21 +146,24 @@ EVP_PKEY *TS_CONF_load_key(const char *file, const char *pass)\r
1135 pkey = PEM_read_bio_PrivateKey(key, NULL, NULL, (char *)pass);\r
1136 end:\r
1137 if (pkey == NULL)\r
1138- fprintf(stderr, "unable to load private key: %s\n", file);\r
1139+ TSerr(TS_F_TS_CONF_LOAD_KEY, TS_R_CANNOT_LOAD_KEY);\r
1140 BIO_free(key);\r
1141 return pkey;\r
1142 }\r
1143+#endif /* !OPENSSL_NO_STDIO */\r
1144 \r
1145 /* Function definitions for handling configuration options. */\r
1146 \r
1147 static void TS_CONF_lookup_fail(const char *name, const char *tag)\r
1148 {\r
1149- fprintf(stderr, "variable lookup failed for %s::%s\n", name, tag);\r
1150+ TSerr(TS_F_TS_CONF_LOOKUP_FAIL, TS_R_VAR_LOOKUP_FAILURE);\r
1151+ ERR_add_error_data(3, name, "::", tag);\r
1152 }\r
1153 \r
1154 static void TS_CONF_invalid(const char *name, const char *tag)\r
1155 {\r
1156- fprintf(stderr, "invalid variable value for %s::%s\n", name, tag);\r
1157+ TSerr(TS_F_TS_CONF_INVALID, TS_R_VAR_BAD_VALUE);\r
1158+ ERR_add_error_data(3, name, "::", tag);\r
1159 }\r
1160 \r
1161 const char *TS_CONF_get_tsa_section(CONF *conf, const char *section)\r
1162@@ -237,6 +241,7 @@ int TS_CONF_set_default_engine(const char *name)\r
1163 \r
1164 #endif\r
1165 \r
1166+#ifndef OPENSSL_NO_STDIO\r
1167 int TS_CONF_set_signer_cert(CONF *conf, const char *section,\r
1168 const char *cert, TS_RESP_CTX *ctx)\r
1169 {\r
1170@@ -302,6 +307,7 @@ int TS_CONF_set_signer_key(CONF *conf, const char *section,\r
1171 EVP_PKEY_free(key_obj);\r
1172 return ret;\r
1173 }\r
1174+#endif /* !OPENSSL_NO_STDIO */\r
1175 \r
1176 int TS_CONF_set_def_policy(CONF *conf, const char *section,\r
1177 const char *policy, TS_RESP_CTX *ctx)\r
1178diff --git a/crypto/ts/ts_err.c b/crypto/ts/ts_err.c\r
1179index ff1abf4..3f5b78f 100644\r
1180--- a/crypto/ts/ts_err.c\r
1181+++ b/crypto/ts/ts_err.c\r
1182@@ -1,6 +1,6 @@\r
1183 /* crypto/ts/ts_err.c */\r
1184 /* ====================================================================\r
1185- * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved.\r
1186+ * Copyright (c) 1999-2015 The OpenSSL Project. All rights reserved.\r
1187 *\r
1188 * Redistribution and use in source and binary forms, with or without\r
1189 * modification, are permitted provided that the following conditions\r
1190@@ -87,6 +87,11 @@ static ERR_STRING_DATA TS_str_functs[] = {\r
1191 {ERR_FUNC(TS_F_TS_CHECK_SIGNING_CERTS), "TS_CHECK_SIGNING_CERTS"},\r
1192 {ERR_FUNC(TS_F_TS_CHECK_STATUS_INFO), "TS_CHECK_STATUS_INFO"},\r
1193 {ERR_FUNC(TS_F_TS_COMPUTE_IMPRINT), "TS_COMPUTE_IMPRINT"},\r
1194+ {ERR_FUNC(TS_F_TS_CONF_INVALID), "ts_CONF_invalid"},\r
1195+ {ERR_FUNC(TS_F_TS_CONF_LOAD_CERT), "TS_CONF_load_cert"},\r
1196+ {ERR_FUNC(TS_F_TS_CONF_LOAD_CERTS), "TS_CONF_load_certs"},\r
1197+ {ERR_FUNC(TS_F_TS_CONF_LOAD_KEY), "TS_CONF_load_key"},\r
1198+ {ERR_FUNC(TS_F_TS_CONF_LOOKUP_FAIL), "ts_CONF_lookup_fail"},\r
1199 {ERR_FUNC(TS_F_TS_CONF_SET_DEFAULT_ENGINE), "TS_CONF_set_default_engine"},\r
1200 {ERR_FUNC(TS_F_TS_GET_STATUS_TEXT), "TS_GET_STATUS_TEXT"},\r
1201 {ERR_FUNC(TS_F_TS_MSG_IMPRINT_SET_ALGO), "TS_MSG_IMPRINT_set_algo"},\r
1202@@ -132,6 +137,8 @@ static ERR_STRING_DATA TS_str_functs[] = {\r
1203 static ERR_STRING_DATA TS_str_reasons[] = {\r
1204 {ERR_REASON(TS_R_BAD_PKCS7_TYPE), "bad pkcs7 type"},\r
1205 {ERR_REASON(TS_R_BAD_TYPE), "bad type"},\r
1206+ {ERR_REASON(TS_R_CANNOT_LOAD_CERT), "cannot load certificate"},\r
1207+ {ERR_REASON(TS_R_CANNOT_LOAD_KEY), "cannot load private key"},\r
1208 {ERR_REASON(TS_R_CERTIFICATE_VERIFY_ERROR), "certificate verify error"},\r
1209 {ERR_REASON(TS_R_COULD_NOT_SET_ENGINE), "could not set engine"},\r
1210 {ERR_REASON(TS_R_COULD_NOT_SET_TIME), "could not set time"},\r
1211@@ -170,6 +177,8 @@ static ERR_STRING_DATA TS_str_reasons[] = {\r
1212 {ERR_REASON(TS_R_UNACCEPTABLE_POLICY), "unacceptable policy"},\r
1213 {ERR_REASON(TS_R_UNSUPPORTED_MD_ALGORITHM), "unsupported md algorithm"},\r
1214 {ERR_REASON(TS_R_UNSUPPORTED_VERSION), "unsupported version"},\r
1215+ {ERR_REASON(TS_R_VAR_BAD_VALUE), "var bad value"},\r
1216+ {ERR_REASON(TS_R_VAR_LOOKUP_FAILURE), "cannot find config variable"},\r
1217 {ERR_REASON(TS_R_WRONG_CONTENT_TYPE), "wrong content type"},\r
1218 {0, NULL}\r
1219 };\r
1220diff --git a/crypto/ui/ui_util.c b/crypto/ui/ui_util.c\r
1221index 0f29011..80dd40e 100644\r
1222--- a/crypto/ui/ui_util.c\r
1223+++ b/crypto/ui/ui_util.c\r
1224@@ -56,6 +56,10 @@\r
1225 #include <string.h>\r
1226 #include "ui_locl.h"\r
1227 \r
1228+#ifndef BUFSIZ\r
1229+#define BUFSIZ 256\r
1230+#endif\r
1231+\r
1232 int UI_UTIL_read_pw_string(char *buf, int length, const char *prompt,\r
1233 int verify)\r
1234 {\r
1235diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c\r
1236index 9ee8f8d..64b052e 100644\r
1237--- a/crypto/x509/by_dir.c\r
1238+++ b/crypto/x509/by_dir.c\r
1239@@ -69,6 +69,8 @@\r
1240 # include <sys/stat.h>\r
1241 #endif\r
1242 \r
1243+#ifndef OPENSSL_NO_STDIO\r
1244+\r
1245 #include <openssl/lhash.h>\r
1246 #include <openssl/x509.h>\r
1247 \r
1248@@ -434,3 +436,5 @@ static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name,\r
1249 BUF_MEM_free(b);\r
1250 return (ok);\r
1251 }\r
1252+\r
1253+#endif /* OPENSSL_NO_STDIO */\r
3f73ccb3
QL		 1254diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c\r
1255index 0429767..7ddc21c 100644\r
1256--- a/crypto/x509/x509_vfy.c\r
1257+++ b/crypto/x509/x509_vfy.c\r
1258@@ -940,6 +940,8 @@ static int check_crl_time(X509_STORE_CTX *ctx, X509_CRL *crl, int notify)\r
de0408be
DW		 1259 ctx->current_crl = crl;\r
1260 if (ctx->param->flags & X509_V_FLAG_USE_CHECK_TIME)\r
1261 ptime = &ctx->param->check_time;\r
1262+ else if (ctx->param->flags & X509_V_FLAG_NO_CHECK_TIME)\r
1263+ return 1;\r
1264 else\r
1265 ptime = NULL;\r
f93f78ea 1266 \r
3f73ccb3 1267@@ -1663,6 +1665,8 @@ static int check_cert_time(X509_STORE_CTX *ctx, X509 *x)\r
f93f78ea 1268 \r
de0408be
DW		 1269 if (ctx->param->flags & X509_V_FLAG_USE_CHECK_TIME)\r
1270 ptime = &ctx->param->check_time;\r
1271+ else if (ctx->param->flags & X509_V_FLAG_NO_CHECK_TIME)\r
1272+ return 1;\r
1273 else\r
1274 ptime = NULL;\r
f93f78ea 1275 \r
3f73ccb3 1276diff --git a/crypto/x509/x509_vfy.h b/crypto/x509/x509_vfy.h\r
ca6fa1fe 1277index 2663e1c..3790ef5 100644\r
3f73ccb3
QL		 1278--- a/crypto/x509/x509_vfy.h\r
1279+++ b/crypto/x509/x509_vfy.h\r
1280@@ -438,6 +438,8 @@ void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth);\r
de0408be
DW		 1281 * will force the behaviour to match that of previous versions.\r
1282 */\r
1283 # define X509_V_FLAG_NO_ALT_CHAINS 0x100000\r
1284+/* Do not check certificate/CRL validity against current time */\r
1285+# define X509_V_FLAG_NO_CHECK_TIME 0x200000\r
f93f78ea 1286 \r
de0408be
DW		 1287 # define X509_VP_FLAG_DEFAULT 0x1\r
1288 # define X509_VP_FLAG_OVERWRITE 0x2\r
ca6fa1fe
QL		 1289@@ -490,9 +492,10 @@ void X509_STORE_CTX_cleanup(X509_STORE_CTX *ctx);\r
1290 X509_STORE *X509_STORE_CTX_get0_store(X509_STORE_CTX *ctx);\r
1291 \r
1292 X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m);\r
1293-\r
1294+#ifndef OPENSSL_NO_STDIO\r
1295 X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir(void);\r
1296 X509_LOOKUP_METHOD *X509_LOOKUP_file(void);\r
1297+#endif\r
1298 \r
1299 int X509_STORE_add_cert(X509_STORE *ctx, X509 *x);\r
1300 int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x);\r
3f73ccb3
QL		 1301diff --git a/crypto/x509v3/ext_dat.h b/crypto/x509v3/ext_dat.h\r
1302index c3a6fce..01edd2a 100644\r
1303--- a/crypto/x509v3/ext_dat.h\r
1304+++ b/crypto/x509v3/ext_dat.h\r
1305@@ -127,8 +127,10 @@ static const X509V3_EXT_METHOD *standard_exts[] = {\r
f93f78ea
QL		 1306 &v3_idp,\r
1307 &v3_alt[2],\r
1308 &v3_freshest_crl,\r
1309+#ifndef OPENSSL_SYS_UEFI\r
1310 &v3_ct_scts[0],\r
1311 &v3_ct_scts[1],\r
1312+#endif\r
1313 };\r
1314 \r
1315 /* Number of standard extensions */\r
ca6fa1fe
QL		 1316diff --git a/crypto/x509v3/v3_pci.c b/crypto/x509v3/v3_pci.c\r
1317index 34cad53..12f12a7 100644\r
1318--- a/crypto/x509v3/v3_pci.c\r
1319+++ b/crypto/x509v3/v3_pci.c\r
1320@@ -149,6 +149,7 @@ static int process_pci_value(CONF_VALUE *val,\r
1321 goto err;\r
1322 }\r
1323 OPENSSL_free(tmp_data2);\r
1324+#ifndef OPENSSL_NO_STDIO\r
1325 } else if (strncmp(val->value, "file:", 5) == 0) {\r
1326 unsigned char buf[2048];\r
1327 int n;\r
1328@@ -181,6 +182,7 @@ static int process_pci_value(CONF_VALUE *val,\r
1329 X509V3_conf_err(val);\r
1330 goto err;\r
1331 }\r
1332+#endif /* !OPENSSL_NO_STDIO */\r
1333 } else if (strncmp(val->value, "text:", 5) == 0) {\r
1334 val_len = strlen(val->value + 5);\r
1335 tmp_data = OPENSSL_realloc((*policy)->data,\r
1336diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h\r
1337index f5c6156..a2e78aa 100644\r
1338--- a/crypto/x509v3/x509v3.h\r
1339+++ b/crypto/x509v3/x509v3.h\r
1340@@ -688,8 +688,9 @@ void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent,\r
1341 int ml);\r
1342 int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag,\r
1343 int indent);\r
1344+#ifndef OPENSSL_NO_FP_API\r
1345 int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag, int indent);\r
1346-\r
1347+#endif\r
1348 int X509V3_extensions_print(BIO *out, char *title,\r
1349 STACK_OF(X509_EXTENSION) *exts,\r
1350 unsigned long flag, int indent);\r
e578aa19
QL		 1351diff --git a/demos/engines/cluster_labs/hw_cluster_labs_err.h b/demos/engines/cluster_labs/hw_cluster_labs_err.h\r
1352index 3300e11..e9e58d5 100644\r
1353--- a/demos/engines/cluster_labs/hw_cluster_labs_err.h\r
1354+++ b/demos/engines/cluster_labs/hw_cluster_labs_err.h\r
1355@@ -67,7 +67,7 @@ extern "C" {\r
1356 static void ERR_load_CL_strings(void);\r
1357 static void ERR_unload_CL_strings(void);\r
1358 static void ERR_CL_error(int function, int reason, char *file, int line);\r
1359-# define CLerr(f,r) ERR_CL_error((f),(r),__FILE__,__LINE__)\r
1360+# define CLerr(f,r) ERR_CL_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
1361 \r
1362 /* Error codes for the CL functions. */\r
1363 \r
1364diff --git a/demos/engines/ibmca/hw_ibmca_err.h b/demos/engines/ibmca/hw_ibmca_err.h\r
1365index c17e0c9..10d0212 100644\r
1366--- a/demos/engines/ibmca/hw_ibmca_err.h\r
1367+++ b/demos/engines/ibmca/hw_ibmca_err.h\r
1368@@ -67,7 +67,7 @@ extern "C" {\r
1369 static void ERR_load_IBMCA_strings(void);\r
1370 static void ERR_unload_IBMCA_strings(void);\r
1371 static void ERR_IBMCA_error(int function, int reason, char *file, int line);\r
1372-# define IBMCAerr(f,r) ERR_IBMCA_error((f),(r),__FILE__,__LINE__)\r
1373+# define IBMCAerr(f,r) ERR_IBMCA_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
1374 \r
1375 /* Error codes for the IBMCA functions. */\r
1376 \r
1377diff --git a/demos/engines/rsaref/rsaref_err.h b/demos/engines/rsaref/rsaref_err.h\r
1378index 4356815..598836f 100644\r
1379--- a/demos/engines/rsaref/rsaref_err.h\r
1380+++ b/demos/engines/rsaref/rsaref_err.h\r
1381@@ -68,7 +68,7 @@ extern "C" {\r
1382 static void ERR_load_RSAREF_strings(void);\r
1383 static void ERR_unload_RSAREF_strings(void);\r
1384 static void ERR_RSAREF_error(int function, int reason, char *file, int line);\r
1385-# define RSAREFerr(f,r) ERR_RSAREF_error((f),(r),__FILE__,__LINE__)\r
1386+# define RSAREFerr(f,r) ERR_RSAREF_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
1387 /* Error codes for the RSAREF functions. */\r
1388 \r
1389 /* Function codes. */\r
1390diff --git a/demos/engines/zencod/hw_zencod_err.h b/demos/engines/zencod/hw_zencod_err.h\r
1391index f4a8358..94d3293 100644\r
1392--- a/demos/engines/zencod/hw_zencod_err.h\r
1393+++ b/demos/engines/zencod/hw_zencod_err.h\r
1394@@ -67,7 +67,7 @@ extern "C" {\r
1395 static void ERR_load_ZENCOD_strings(void);\r
1396 static void ERR_unload_ZENCOD_strings(void);\r
1397 static void ERR_ZENCOD_error(int function, int reason, char *file, int line);\r
1398-# define ZENCODerr(f,r) ERR_ZENCOD_error((f),(r),__FILE__,__LINE__)\r
1399+# define ZENCODerr(f,r) ERR_ZENCOD_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
1400 \r
1401 /* Error codes for the ZENCOD functions. */\r
1402 \r
1403diff --git a/doc/crypto/threads.pod b/doc/crypto/threads.pod\r
1404index dc0e939..fe123bb 100644\r
1405--- a/doc/crypto/threads.pod\r
1406+++ b/doc/crypto/threads.pod\r
1407@@ -51,15 +51,15 @@ CRYPTO_destroy_dynlockid, CRYPTO_lock - OpenSSL thread support\r
1408 void CRYPTO_lock(int mode, int n, const char *file, int line);\r
1409 \r
1410 #define CRYPTO_w_lock(type) \\r
1411- CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)\r
1412+ CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,OPENSSL_FILE,OPENSSL_LINE)\r
1413 #define CRYPTO_w_unlock(type) \\r
1414- CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)\r
1415+ CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,OPENSSL_FILE,OPENSSL_LINE)\r
1416 #define CRYPTO_r_lock(type) \\r
1417- CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)\r
1418+ CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,OPENSSL_FILE,OPENSSL_LINE)\r
1419 #define CRYPTO_r_unlock(type) \\r
1420- CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)\r
1421+ CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,OPENSSL_FILE,OPENSSL_LINE)\r
1422 #define CRYPTO_add(addr,amount,type) \\r
1423- CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)\r
1424+ CRYPTO_add_lock(addr,amount,type,OPENSSL_FILE,OPENSSL_LINE)\r
1425 \r
1426 =head1 DESCRIPTION\r
1427 \r
3f73ccb3
QL		 1428diff --git a/e_os.h b/e_os.h\r
1429index 1fa36c1..3e9dae2 100644\r
1430--- a/e_os.h\r
1431+++ b/e_os.h\r
1432@@ -136,7 +136,7 @@ extern "C" {\r
97468ab9
DW		 1433 # define MSDOS\r
1434 # endif\r
1435 \r
1436-# if defined(MSDOS) && !defined(GETPID_IS_MEANINGLESS)\r
1437+# if (defined(MSDOS) || defined(OPENSSL_SYS_UEFI)) && !defined(GETPID_IS_MEANINGLESS)\r
1438 # define GETPID_IS_MEANINGLESS\r
1439 # endif\r
1440 \r
3f73ccb3
QL		 1441diff --git a/e_os2.h b/e_os2.h\r
1442index 7be9989..909e22f 100644\r
1443--- a/e_os2.h\r
1444+++ b/e_os2.h\r
1445@@ -97,7 +97,14 @@ extern "C" {\r
3b21958b
DW		 1446 * For 32 bit environment, there seems to be the CygWin environment and then\r
1447 * all the others that try to do the same thing Microsoft does...\r
1448 */\r
1449-# if defined(OPENSSL_SYSNAME_UWIN)\r
1450+/*\r
1451+ * UEFI lives here because it might be built with a Microsoft toolchain and\r
1452+ * we need to avoid the false positive match on Windows.\r
1453+ */\r
1454+# if defined(OPENSSL_SYSNAME_UEFI)\r
1455+# undef OPENSSL_SYS_UNIX\r
1456+# define OPENSSL_SYS_UEFI\r
1457+# elif defined(OPENSSL_SYSNAME_UWIN)\r
1458 # undef OPENSSL_SYS_UNIX\r
1459 # define OPENSSL_SYS_WIN32_UWIN\r
1460 # else\r
e578aa19
QL		 1461diff --git a/engines/ccgost/e_gost_err.h b/engines/ccgost/e_gost_err.h\r
1462index a2018ec..9eacdcf 100644\r
1463--- a/engines/ccgost/e_gost_err.h\r
1464+++ b/engines/ccgost/e_gost_err.h\r
1465@@ -67,7 +67,7 @@ extern "C" {\r
1466 void ERR_load_GOST_strings(void);\r
1467 void ERR_unload_GOST_strings(void);\r
1468 void ERR_GOST_error(int function, int reason, char *file, int line);\r
1469-# define GOSTerr(f,r) ERR_GOST_error((f),(r),__FILE__,__LINE__)\r
1470+# define GOSTerr(f,r) ERR_GOST_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
1471 \r
1472 /* Error codes for the GOST functions. */\r
1473 \r
1474diff --git a/engines/e_4758cca_err.h b/engines/e_4758cca_err.h\r
1475index 2f29d96..47a2635 100644\r
1476--- a/engines/e_4758cca_err.h\r
1477+++ b/engines/e_4758cca_err.h\r
1478@@ -67,7 +67,7 @@ extern "C" {\r
1479 static void ERR_load_CCA4758_strings(void);\r
1480 static void ERR_unload_CCA4758_strings(void);\r
1481 static void ERR_CCA4758_error(int function, int reason, char *file, int line);\r
1482-# define CCA4758err(f,r) ERR_CCA4758_error((f),(r),__FILE__,__LINE__)\r
1483+# define CCA4758err(f,r) ERR_CCA4758_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
1484 \r
1485 /* Error codes for the CCA4758 functions. */\r
1486 \r
1487diff --git a/engines/e_aep_err.h b/engines/e_aep_err.h\r
1488index 2ed0114..1f8fa5b 100644\r
1489--- a/engines/e_aep_err.h\r
1490+++ b/engines/e_aep_err.h\r
1491@@ -67,7 +67,7 @@ extern "C" {\r
1492 static void ERR_load_AEPHK_strings(void);\r
1493 static void ERR_unload_AEPHK_strings(void);\r
1494 static void ERR_AEPHK_error(int function, int reason, char *file, int line);\r
1495-# define AEPHKerr(f,r) ERR_AEPHK_error((f),(r),__FILE__,__LINE__)\r
1496+# define AEPHKerr(f,r) ERR_AEPHK_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
1497 \r
1498 /* Error codes for the AEPHK functions. */\r
1499 \r
1500diff --git a/engines/e_atalla_err.h b/engines/e_atalla_err.h\r
1501index 7b71eff..d958496 100644\r
1502--- a/engines/e_atalla_err.h\r
1503+++ b/engines/e_atalla_err.h\r
1504@@ -67,7 +67,7 @@ extern "C" {\r
1505 static void ERR_load_ATALLA_strings(void);\r
1506 static void ERR_unload_ATALLA_strings(void);\r
1507 static void ERR_ATALLA_error(int function, int reason, char *file, int line);\r
1508-# define ATALLAerr(f,r) ERR_ATALLA_error((f),(r),__FILE__,__LINE__)\r
1509+# define ATALLAerr(f,r) ERR_ATALLA_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
1510 \r
1511 /* Error codes for the ATALLA functions. */\r
1512 \r
1513diff --git a/engines/e_capi_err.h b/engines/e_capi_err.h\r
1514index b5d06dc..cfe46b1 100644\r
1515--- a/engines/e_capi_err.h\r
1516+++ b/engines/e_capi_err.h\r
1517@@ -67,7 +67,7 @@ extern "C" {\r
1518 static void ERR_load_CAPI_strings(void);\r
1519 static void ERR_unload_CAPI_strings(void);\r
1520 static void ERR_CAPI_error(int function, int reason, char *file, int line);\r
1521-# define CAPIerr(f,r) ERR_CAPI_error((f),(r),__FILE__,__LINE__)\r
1522+# define CAPIerr(f,r) ERR_CAPI_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
1523 \r
1524 /* Error codes for the CAPI functions. */\r
1525 \r
1526diff --git a/engines/e_chil_err.h b/engines/e_chil_err.h\r
1527index d86a4ce..3d961b9 100644\r
1528--- a/engines/e_chil_err.h\r
1529+++ b/engines/e_chil_err.h\r
1530@@ -67,7 +67,7 @@ extern "C" {\r
1531 static void ERR_load_HWCRHK_strings(void);\r
1532 static void ERR_unload_HWCRHK_strings(void);\r
1533 static void ERR_HWCRHK_error(int function, int reason, char *file, int line);\r
1534-# define HWCRHKerr(f,r) ERR_HWCRHK_error((f),(r),__FILE__,__LINE__)\r
1535+# define HWCRHKerr(f,r) ERR_HWCRHK_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
1536 \r
1537 /* Error codes for the HWCRHK functions. */\r
1538 \r
1539diff --git a/engines/e_cswift_err.h b/engines/e_cswift_err.h\r
1540index fde3a82..7c20691 100644\r
1541--- a/engines/e_cswift_err.h\r
1542+++ b/engines/e_cswift_err.h\r
1543@@ -67,7 +67,7 @@ extern "C" {\r
1544 static void ERR_load_CSWIFT_strings(void);\r
1545 static void ERR_unload_CSWIFT_strings(void);\r
1546 static void ERR_CSWIFT_error(int function, int reason, char *file, int line);\r
1547-# define CSWIFTerr(f,r) ERR_CSWIFT_error((f),(r),__FILE__,__LINE__)\r
1548+# define CSWIFTerr(f,r) ERR_CSWIFT_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
1549 \r
1550 /* Error codes for the CSWIFT functions. */\r
1551 \r
1552diff --git a/engines/e_gmp_err.h b/engines/e_gmp_err.h\r
1553index 637abbc..ccaf3da 100644\r
1554--- a/engines/e_gmp_err.h\r
1555+++ b/engines/e_gmp_err.h\r
1556@@ -67,7 +67,7 @@ extern "C" {\r
1557 static void ERR_load_GMP_strings(void);\r
1558 static void ERR_unload_GMP_strings(void);\r
1559 static void ERR_GMP_error(int function, int reason, char *file, int line);\r
1560-# define GMPerr(f,r) ERR_GMP_error((f),(r),__FILE__,__LINE__)\r
1561+# define GMPerr(f,r) ERR_GMP_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
1562 \r
1563 /* Error codes for the GMP functions. */\r
1564 \r
1565diff --git a/engines/e_nuron_err.h b/engines/e_nuron_err.h\r
1566index aa7849c..e607d3e 100644\r
1567--- a/engines/e_nuron_err.h\r
1568+++ b/engines/e_nuron_err.h\r
1569@@ -67,7 +67,7 @@ extern "C" {\r
1570 static void ERR_load_NURON_strings(void);\r
1571 static void ERR_unload_NURON_strings(void);\r
1572 static void ERR_NURON_error(int function, int reason, char *file, int line);\r
1573-# define NURONerr(f,r) ERR_NURON_error((f),(r),__FILE__,__LINE__)\r
1574+# define NURONerr(f,r) ERR_NURON_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
1575 \r
1576 /* Error codes for the NURON functions. */\r
1577 \r
1578diff --git a/engines/e_sureware_err.h b/engines/e_sureware_err.h\r
1579index bef8623..54f2848 100644\r
1580--- a/engines/e_sureware_err.h\r
1581+++ b/engines/e_sureware_err.h\r
1582@@ -68,7 +68,7 @@ static void ERR_load_SUREWARE_strings(void);\r
1583 static void ERR_unload_SUREWARE_strings(void);\r
1584 static void ERR_SUREWARE_error(int function, int reason, char *file,\r
1585 int line);\r
1586-# define SUREWAREerr(f,r) ERR_SUREWARE_error((f),(r),__FILE__,__LINE__)\r
1587+# define SUREWAREerr(f,r) ERR_SUREWARE_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
1588 \r
1589 /* Error codes for the SUREWARE functions. */\r
1590 \r
1591diff --git a/engines/e_ubsec_err.h b/engines/e_ubsec_err.h\r
1592index c8aec7c..67110ed 100644\r
1593--- a/engines/e_ubsec_err.h\r
1594+++ b/engines/e_ubsec_err.h\r
1595@@ -67,7 +67,7 @@ extern "C" {\r
1596 static void ERR_load_UBSEC_strings(void);\r
1597 static void ERR_unload_UBSEC_strings(void);\r
1598 static void ERR_UBSEC_error(int function, int reason, char *file, int line);\r
1599-# define UBSECerr(f,r) ERR_UBSEC_error((f),(r),__FILE__,__LINE__)\r
1600+# define UBSECerr(f,r) ERR_UBSEC_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
1601 \r
1602 /* Error codes for the UBSEC functions. */\r
1603 \r
1604diff --git a/ssl/d1_both.c b/ssl/d1_both.c\r
1605index d1fc716..d5f661a 100644\r
1606--- a/ssl/d1_both.c\r
1607+++ b/ssl/d1_both.c\r
1608@@ -1053,7 +1053,7 @@ int dtls1_send_change_cipher_spec(SSL *s, int a, int b)\r
1609 int dtls1_read_failed(SSL *s, int code)\r
1610 {\r
1611 if (code > 0) {\r
1612- fprintf(stderr, "invalid state reached %s:%d", __FILE__, __LINE__);\r
1613+ fprintf(stderr, "dtls1_read_failed(); invalid state reached\n");\r
1614 return 1;\r
1615 }\r
1616 \r
1617diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c\r
1618index 35cc27c..a1f5335 100644\r
1619--- a/ssl/ssl_asn1.c\r
1620+++ b/ssl/ssl_asn1.c\r
1621@@ -418,7 +418,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,\r
1622 if (ssl_version == SSL2_VERSION) {\r
1623 if (os.length != 3) {\r
1624 c.error = SSL_R_CIPHER_CODE_WRONG_LENGTH;\r
1625- c.line = __LINE__;\r
1626+ c.line = OPENSSL_LINE;\r
1627 goto err;\r
1628 }\r
1629 id = 0x02000000L |\r
1630@@ -429,14 +429,14 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,\r
1631 || ssl_version == DTLS1_BAD_VER) {\r
1632 if (os.length != 2) {\r
1633 c.error = SSL_R_CIPHER_CODE_WRONG_LENGTH;\r
1634- c.line = __LINE__;\r
1635+ c.line = OPENSSL_LINE;\r
1636 goto err;\r
1637 }\r
1638 id = 0x03000000L |\r
1639 ((unsigned long)os.data[0] << 8L) | (unsigned long)os.data[1];\r
1640 } else {\r
1641 c.error = SSL_R_UNKNOWN_SSL_VERSION;\r
1642- c.line = __LINE__;\r
1643+ c.line = OPENSSL_LINE;\r
1644 goto err;\r
1645 }\r
1646 \r
1647@@ -526,7 +526,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,\r
1648 if (os.data != NULL) {\r
1649 if (os.length > SSL_MAX_SID_CTX_LENGTH) {\r
1650 c.error = SSL_R_BAD_LENGTH;\r
1651- c.line = __LINE__;\r
1652+ c.line = OPENSSL_LINE;\r
1653 goto err;\r
1654 } else {\r
1655 ret->sid_ctx_length = os.length;\r
ca6fa1fe
QL		 1656diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c\r
1657index a73f866..d534c0a 100644\r
1658--- a/ssl/ssl_cert.c\r
1659+++ b/ssl/ssl_cert.c\r
1660@@ -855,12 +855,13 @@ int SSL_CTX_add_client_CA(SSL_CTX *ctx, X509 *x)\r
1661 return (add_client_CA(&(ctx->client_CA), x));\r
1662 }\r
1663 \r
1664+#ifndef OPENSSL_NO_STDIO\r
1665+\r
1666 static int xname_cmp(const X509_NAME *const *a, const X509_NAME *const *b)\r
1667 {\r
1668 return (X509_NAME_cmp(*a, *b));\r
1669 }\r
1670 \r
1671-#ifndef OPENSSL_NO_STDIO\r
1672 /**\r
1673 * Load CA certs from a file into a ::STACK. Note that it is somewhat misnamed;\r
1674 * it doesn't really have anything to do with clients (except that a common use\r
1675@@ -928,7 +929,6 @@ STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file)\r
1676 ERR_clear_error();\r
1677 return (ret);\r
1678 }\r
1679-#endif\r
1680 \r
1681 /**\r
1682 * Add a file of certs to a stack.\r
1683@@ -1048,6 +1048,7 @@ int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,\r
1684 CRYPTO_w_unlock(CRYPTO_LOCK_READDIR);\r
1685 return ret;\r
1686 }\r
1687+#endif /* !OPENSSL_NO_STDIO */\r
1688 \r
1689 /* Add a certificate to a BUF_MEM structure */\r
1690 \r
1691diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c\r
1692index 5478840..c2ad7c9 100644\r
1693--- a/ssl/ssl_conf.c\r
1694+++ b/ssl/ssl_conf.c\r
1695@@ -362,6 +362,7 @@ static int cmd_Options(SSL_CONF_CTX *cctx, const char *value)\r
1696 return CONF_parse_list(value, ',', 1, ssl_set_option_list, cctx);\r
1697 }\r
1698 \r
1699+#ifndef OPENSSL_NO_STDIO\r
1700 static int cmd_Certificate(SSL_CONF_CTX *cctx, const char *value)\r
1701 {\r
1702 int rv = 1;\r
1703@@ -428,7 +429,9 @@ static int cmd_DHParameters(SSL_CONF_CTX *cctx, const char *value)\r
1704 BIO_free(in);\r
1705 return rv > 0;\r
1706 }\r
1707-#endif\r
1708+#endif /* !OPENSSL_NO_DH */\r
1709+#endif /* !OPENSSL_NO_STDIO */\r
1710+\r
1711 typedef struct {\r
1712 int (*cmd) (SSL_CONF_CTX *cctx, const char *value);\r
1713 const char *str_file;\r
1714@@ -454,12 +457,14 @@ static const ssl_conf_cmd_tbl ssl_conf_cmds[] = {\r
1715 SSL_CONF_CMD_STRING(CipherString, "cipher"),\r
1716 SSL_CONF_CMD_STRING(Protocol, NULL),\r
1717 SSL_CONF_CMD_STRING(Options, NULL),\r
1718+#ifndef OPENSSL_NO_STDIO\r
1719 SSL_CONF_CMD(Certificate, "cert", SSL_CONF_TYPE_FILE),\r
1720 SSL_CONF_CMD(PrivateKey, "key", SSL_CONF_TYPE_FILE),\r
1721 SSL_CONF_CMD(ServerInfoFile, NULL, SSL_CONF_TYPE_FILE),\r
1722 #ifndef OPENSSL_NO_DH\r
1723 SSL_CONF_CMD(DHParameters, "dhparam", SSL_CONF_TYPE_FILE)\r
1724 #endif\r
1725+#endif\r
1726 };\r
1727 \r
1728 static int ssl_conf_cmd_skip_prefix(SSL_CONF_CTX *cctx, const char **pcmd)\r
e578aa19
QL		 1729diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c\r
1730index 514fcb3..2a54cc9 100644\r
1731--- a/ssl/t1_enc.c\r
1732+++ b/ssl/t1_enc.c\r
1733@@ -780,9 +780,7 @@ int tls1_enc(SSL *s, int send)\r
1734 * we can't write into the input stream: Can this ever\r
1735 * happen?? (steve)\r
1736 */\r
1737- fprintf(stderr,\r
1738- "%s:%d: rec->data != rec->input\n",\r
1739- __FILE__, __LINE__);\r
1740+ fprintf(stderr, "tls1_enc: rec->data != rec->input\n");\r
1741 else if (RAND_bytes(rec->input, ivlen) <= 0)\r
1742 return -1;\r
1743 }\r
1744diff --git a/util/mkerr.pl b/util/mkerr.pl\r
1745index 09ebebe..cd57ade 100644\r
1746--- a/util/mkerr.pl\r
1747+++ b/util/mkerr.pl\r
1748@@ -89,7 +89,7 @@ Options:\r
1749 void ERR_load_<LIB>_strings(void);\r
1750 void ERR_unload_<LIB>_strings(void);\r
1751 void ERR_<LIB>_error(int f, int r, char *fn, int ln);\r
1752- #define <LIB>err(f,r) ERR_<LIB>_error(f,r,__FILE__,__LINE__)\r
1753+ #define <LIB>err(f,r) ERR_<LIB>_error(f,r,OPENSSL_FILE,OPENSSL_LINE)\r
1754 while the code facilitates the use of these in an environment\r
1755 where the error support routines are dynamically loaded at \r
1756 runtime.\r
1757@@ -474,7 +474,7 @@ EOF\r
1758 ${staticloader}void ERR_load_${lib}_strings(void);\r
1759 ${staticloader}void ERR_unload_${lib}_strings(void);\r
1760 ${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line);\r
1761-# define ${lib}err(f,r) ERR_${lib}_error((f),(r),__FILE__,__LINE__)\r
1762+# define ${lib}err(f,r) ERR_${lib}_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
1763 \r
1764 EOF\r
1765 }\r
EFI Development Kit II mirror for PVE