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