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