Commit | Line | Data |
---|---|---|
f93f78ea QL |
1 | diff U3 crypto/bio/bio.h crypto/bio/bio.h\r |
2 | --- crypto/bio/bio.h Thu Jun 11 21:50:12 2015\r | |
3 | +++ crypto/bio/bio.h Fri Jun 12 11:00:52 2015\r | |
4 | @@ -646,10 +646,10 @@\r | |
5 | int BIO_asn1_get_suffix(BIO *b, asn1_ps_func **psuffix,\r | |
6 | asn1_ps_func **psuffix_free);\r | |
7 | \r | |
8 | -# ifndef OPENSSL_NO_FP_API\r | |
9 | BIO_METHOD *BIO_s_file(void);\r | |
10 | BIO *BIO_new_file(const char *filename, const char *mode);\r | |
11 | BIO *BIO_new_fp(FILE *stream, int close_flag);\r | |
12 | +# ifndef OPENSSL_NO_FP_API\r | |
13 | # define BIO_s_file_internal BIO_s_file\r | |
14 | # endif\r | |
15 | BIO *BIO_new(BIO_METHOD *type);\r | |
16 | diff U3 crypto/bio/bss_file.c crypto/bio/bss_file.c\r | |
17 | --- crypto/bio/bss_file.c Thu Jun 11 21:01:06 2015\r | |
18 | +++ crypto/bio/bss_file.c Fri Jun 12 11:01:28 2015\r | |
19 | @@ -460,6 +460,23 @@\r | |
20 | return (ret);\r | |
21 | }\r | |
22 | \r | |
23 | +# else\r | |
24 | +\r | |
25 | +BIO_METHOD *BIO_s_file(void)\r | |
26 | +{\r | |
27 | + return NULL;\r | |
28 | +}\r | |
29 | +\r | |
30 | +BIO *BIO_new_file(const char *filename, const char *mode)\r | |
31 | +{\r | |
32 | + return NULL;\r | |
33 | +}\r | |
34 | +\r | |
35 | +BIO *BIO_new_fp(FILE *stream, int close_flag)\r | |
36 | +{\r | |
37 | + return NULL;\r | |
38 | +}\r | |
39 | +\r | |
40 | # endif /* OPENSSL_NO_STDIO */\r | |
41 | \r | |
42 | #endif /* HEADER_BSS_FILE_C */\r | |
43 | diff U3 crypto/dh/dh_pmeth.c crypto/dh/dh_pmeth.c\r | |
44 | --- crypto/dh/dh_pmeth.c Thu Jun 11 21:50:12 2015\r | |
45 | +++ crypto/dh/dh_pmeth.c Fri Jun 12 11:08:48 2015\r | |
46 | @@ -449,6 +449,9 @@\r | |
47 | *keylen = ret;\r | |
48 | return 1;\r | |
49 | } else if (dctx->kdf_type == EVP_PKEY_DH_KDF_X9_42) {\r | |
50 | +#ifdef OPENSSL_NO_CMS\r | |
51 | + return 0;\r | |
52 | +#else\r | |
53 | unsigned char *Z = NULL;\r | |
54 | size_t Zlen = 0;\r | |
55 | if (!dctx->kdf_outlen || !dctx->kdf_oid)\r | |
56 | @@ -478,6 +481,7 @@\r | |
57 | OPENSSL_free(Z);\r | |
58 | }\r | |
59 | return ret;\r | |
60 | +#endif\r | |
61 | }\r | |
62 | return 1;\r | |
63 | }\r | |
64 | diff U3 crypto/pem/pem.h crypto/pem/pem.h\r | |
65 | --- crypto/pem/pem.h Thu Jun 11 21:50:12 2015\r | |
66 | +++ crypto/pem/pem.h Fri Jun 12 10:58:18 2015\r | |
67 | @@ -324,6 +324,7 @@\r | |
68 | \r | |
69 | # define DECLARE_PEM_read_fp(name, type) /**/\r | |
70 | # define DECLARE_PEM_write_fp(name, type) /**/\r | |
71 | +# define DECLARE_PEM_write_fp_const(name, type) /**/\r | |
72 | # define DECLARE_PEM_write_cb_fp(name, type) /**/\r | |
73 | # else\r | |
74 | \r | |
75 | diff U3 crypto/pkcs7/pk7_smime.c crypto/pkcs7/pk7_smime.c\r | |
76 | --- crypto/pkcs7/pk7_smime.c Thu Jun 11 21:01:06 2015\r | |
77 | +++ crypto/pkcs7/pk7_smime.c Fri Jun 12 11:23:38 2015\r | |
78 | @@ -254,7 +254,8 @@\r | |
79 | STACK_OF(PKCS7_SIGNER_INFO) *sinfos;\r | |
80 | PKCS7_SIGNER_INFO *si;\r | |
81 | X509_STORE_CTX cert_ctx;\r | |
82 | - char buf[4096];\r | |
83 | + char *buf = NULL;\r | |
84 | + int bufsiz;\r | |
85 | int i, j = 0, k, ret = 0;\r | |
86 | BIO *p7bio;\r | |
87 | BIO *tmpin, *tmpout;\r | |
88 | @@ -365,9 +366,14 @@\r | |
89 | } else\r | |
90 | tmpout = out;\r | |
91 | \r | |
92 | + bufsiz = 4096;\r | |
93 | + buf = OPENSSL_malloc(bufsiz);\r | |
94 | + if (buf == NULL) {\r | |
95 | + goto err;\r | |
96 | + }\r | |
97 | /* We now have to 'read' from p7bio to calculate digests etc. */\r | |
98 | for (;;) {\r | |
99 | - i = BIO_read(p7bio, buf, sizeof(buf));\r | |
100 | + i = BIO_read(p7bio, buf, bufsiz);\r | |
101 | if (i <= 0)\r | |
102 | break;\r | |
103 | if (tmpout)\r | |
104 | @@ -406,6 +412,10 @@\r | |
105 | BIO_free_all(p7bio);\r | |
106 | \r | |
107 | sk_X509_free(signers);\r | |
108 | +\r | |
109 | + if (buf != NULL) {\r | |
110 | + OPENSSL_free(buf);\r | |
111 | + }\r | |
112 | \r | |
113 | return ret;\r | |
114 | }\r | |
115 | diff U3 crypto/rand/rand_unix.c crypto/rand/rand_unix.c\r | |
116 | --- crypto/rand/rand_unix.c Thu Jun 11 21:01:06 2015\r | |
117 | +++ crypto/rand/rand_unix.c Fri Jun 12 10:51:21 2015\r | |
118 | @@ -116,7 +116,7 @@\r | |
119 | #include <openssl/rand.h>\r | |
120 | #include "rand_lcl.h"\r | |
121 | \r | |
122 | -#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 | |
123 | +#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 | |
124 | \r | |
125 | # include <sys/types.h>\r | |
126 | # include <sys/time.h>\r | |
127 | @@ -439,7 +439,7 @@\r | |
128 | * defined(OPENSSL_SYS_VXWORKS) ||\r | |
129 | * defined(OPENSSL_SYS_NETWARE)) */\r | |
130 | \r | |
131 | -#if defined(OPENSSL_SYS_VXWORKS)\r | |
132 | +#if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)\r | |
133 | int RAND_poll(void)\r | |
134 | {\r | |
135 | return 0;\r | |
136 | diff U3 crypto/rsa/rsa_ameth.c crypto/rsa/rsa_ameth.c\r | |
137 | --- crypto/rsa/rsa_ameth.c Thu Jun 11 21:50:12 2015\r | |
138 | +++ crypto/rsa/rsa_ameth.c Fri Jun 12 10:45:38 2015\r | |
139 | @@ -68,10 +68,12 @@\r | |
140 | #endif\r | |
141 | #include "asn1_locl.h"\r | |
142 | \r | |
143 | +#ifndef OPENSSL_NO_CMS\r | |
144 | static int rsa_cms_sign(CMS_SignerInfo *si);\r | |
145 | static int rsa_cms_verify(CMS_SignerInfo *si);\r | |
146 | static int rsa_cms_decrypt(CMS_RecipientInfo *ri);\r | |
147 | static int rsa_cms_encrypt(CMS_RecipientInfo *ri);\r | |
148 | +#endif\r | |
149 | \r | |
150 | static int rsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)\r | |
151 | {\r | |
152 | @@ -665,6 +667,7 @@\r | |
153 | return rv;\r | |
154 | }\r | |
155 | \r | |
156 | +#ifndef OPENSSL_NO_CMS\r | |
157 | static int rsa_cms_verify(CMS_SignerInfo *si)\r | |
158 | {\r | |
159 | int nid, nid2;\r | |
160 | @@ -683,6 +686,7 @@\r | |
161 | }\r | |
162 | return 0;\r | |
163 | }\r | |
164 | +#endif\r | |
165 | \r | |
166 | /*\r | |
167 | * Customised RSA item verification routine. This is called when a signature\r | |
168 | @@ -705,6 +709,7 @@\r | |
169 | return -1;\r | |
170 | }\r | |
171 | \r | |
172 | +#ifndef OPENSSL_NO_CMS\r | |
173 | static int rsa_cms_sign(CMS_SignerInfo *si)\r | |
174 | {\r | |
175 | int pad_mode = RSA_PKCS1_PADDING;\r | |
176 | @@ -729,6 +734,7 @@\r | |
177 | X509_ALGOR_set0(alg, OBJ_nid2obj(NID_rsassaPss), V_ASN1_SEQUENCE, os);\r | |
178 | return 1;\r | |
179 | }\r | |
180 | +#endif\r | |
181 | \r | |
182 | static int rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,\r | |
183 | X509_ALGOR *alg1, X509_ALGOR *alg2,\r | |
184 | @@ -785,6 +791,7 @@\r | |
185 | return pss;\r | |
186 | }\r | |
187 | \r | |
188 | +#ifndef OPENSSL_NO_CMS\r | |
189 | static int rsa_cms_decrypt(CMS_RecipientInfo *ri)\r | |
190 | {\r | |
191 | EVP_PKEY_CTX *pkctx;\r | |
192 | @@ -857,7 +864,9 @@\r | |
193 | X509_ALGOR_free(maskHash);\r | |
194 | return rv;\r | |
195 | }\r | |
196 | +#endif\r | |
197 | \r | |
198 | +#ifndef OPENSSL_NO_CMS\r | |
199 | static int rsa_cms_encrypt(CMS_RecipientInfo *ri)\r | |
200 | {\r | |
201 | const EVP_MD *md, *mgf1md;\r | |
202 | @@ -920,6 +929,7 @@\r | |
203 | ASN1_STRING_free(os);\r | |
204 | return rv;\r | |
205 | }\r | |
206 | +#endif\r | |
207 | \r | |
208 | const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[] = {\r | |
209 | {\r | |
210 | diff U3 crypto/x509/x509_vfy.c crypto/x509/x509_vfy.c\r | |
211 | --- crypto/x509/x509_vfy.c Thu Jun 11 21:52:58 2015\r | |
212 | +++ crypto/x509/x509_vfy.c Fri Jun 12 11:29:37 2015\r | |
de0408be DW |
213 | @@ -935,6 +935,8 @@\r |
214 | ctx->current_crl = crl;\r | |
215 | if (ctx->param->flags & X509_V_FLAG_USE_CHECK_TIME)\r | |
216 | ptime = &ctx->param->check_time;\r | |
217 | + else if (ctx->param->flags & X509_V_FLAG_NO_CHECK_TIME)\r | |
218 | + return 1;\r | |
219 | else\r | |
220 | ptime = NULL;\r | |
f93f78ea | 221 | \r |
de0408be | 222 | @@ -1658,6 +1660,8 @@\r |
f93f78ea | 223 | \r |
de0408be DW |
224 | if (ctx->param->flags & X509_V_FLAG_USE_CHECK_TIME)\r |
225 | ptime = &ctx->param->check_time;\r | |
226 | + else if (ctx->param->flags & X509_V_FLAG_NO_CHECK_TIME)\r | |
227 | + return 1;\r | |
228 | else\r | |
229 | ptime = NULL;\r | |
f93f78ea | 230 | \r |
de0408be DW |
231 | diff U3 crypto/x509/x509_vfy.h crypto/x509/x509_vfy.h\r |
232 | --- crypto/x509/x509_vfy.h Thu Jul 09 19:57:16 2015\r | |
233 | +++ crypto/x509/x509_vfy.h Thu Oct 29 14:05:57 2015\r | |
234 | @@ -438,6 +438,8 @@\r | |
235 | * will force the behaviour to match that of previous versions.\r | |
236 | */\r | |
237 | # define X509_V_FLAG_NO_ALT_CHAINS 0x100000\r | |
238 | +/* Do not check certificate/CRL validity against current time */\r | |
239 | +# define X509_V_FLAG_NO_CHECK_TIME 0x200000\r | |
f93f78ea | 240 | \r |
de0408be DW |
241 | # define X509_VP_FLAG_DEFAULT 0x1\r |
242 | # define X509_VP_FLAG_OVERWRITE 0x2\r | |
f93f78ea QL |
243 | diff U3 crypto/x509v3/ext_dat.h crypto/x509v3/ext_dat.h\r |
244 | --- crypto/x509v3/ext_dat.h Thu Jun 11 21:50:12 2015\r | |
245 | +++ crypto/x509v3/ext_dat.h Fri Jun 12 11:11:03 2015\r | |
246 | @@ -127,8 +127,10 @@\r | |
247 | &v3_idp,\r | |
248 | &v3_alt[2],\r | |
249 | &v3_freshest_crl,\r | |
250 | +#ifndef OPENSSL_SYS_UEFI\r | |
251 | &v3_ct_scts[0],\r | |
252 | &v3_ct_scts[1],\r | |
253 | +#endif\r | |
254 | };\r | |
255 | \r | |
256 | /* Number of standard extensions */\r | |
257 | diff U3 crypto/crypto.h crypto/crypto.h\r | |
258 | --- crypto/crypto.h Thu Jun 11 21:01:06 2015\r | |
259 | +++ crypto/crypto.h Fri Jun 12 11:33:27 2015\r | |
260 | @@ -235,15 +235,15 @@\r | |
261 | # ifndef OPENSSL_NO_LOCKING\r | |
262 | # ifndef CRYPTO_w_lock\r | |
263 | # define CRYPTO_w_lock(type) \\r | |
264 | - CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)\r | |
265 | + CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,NULL,0)\r | |
266 | # define CRYPTO_w_unlock(type) \\r | |
267 | - CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)\r | |
268 | + CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,NULL,0)\r | |
269 | # define CRYPTO_r_lock(type) \\r | |
270 | - CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)\r | |
271 | + CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,NULL,0)\r | |
272 | # define CRYPTO_r_unlock(type) \\r | |
273 | - CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)\r | |
274 | + CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,NULL,0)\r | |
275 | # define CRYPTO_add(addr,amount,type) \\r | |
276 | - CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)\r | |
277 | + CRYPTO_add_lock(addr,amount,type,NULL,0)\r | |
278 | # endif\r | |
279 | # else\r | |
280 | # define CRYPTO_w_lock(a)\r | |
281 | @@ -378,19 +378,19 @@\r | |
282 | # define MemCheck_off() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE)\r | |
283 | # define is_MemCheck_on() CRYPTO_is_mem_check_on()\r | |
284 | \r | |
285 | -# define OPENSSL_malloc(num) CRYPTO_malloc((int)num,__FILE__,__LINE__)\r | |
286 | -# define OPENSSL_strdup(str) CRYPTO_strdup((str),__FILE__,__LINE__)\r | |
287 | +# define OPENSSL_malloc(num) CRYPTO_malloc((int)num,NULL,0)\r | |
288 | +# define OPENSSL_strdup(str) CRYPTO_strdup((str),NULL,0)\r | |
289 | # define OPENSSL_realloc(addr,num) \\r | |
290 | - CRYPTO_realloc((char *)addr,(int)num,__FILE__,__LINE__)\r | |
291 | + CRYPTO_realloc((char *)addr,(int)num,NULL,0)\r | |
292 | # define OPENSSL_realloc_clean(addr,old_num,num) \\r | |
293 | - CRYPTO_realloc_clean(addr,old_num,num,__FILE__,__LINE__)\r | |
294 | + CRYPTO_realloc_clean(addr,old_num,num,NULL,0)\r | |
295 | # define OPENSSL_remalloc(addr,num) \\r | |
296 | - CRYPTO_remalloc((char **)addr,(int)num,__FILE__,__LINE__)\r | |
297 | + CRYPTO_remalloc((char **)addr,(int)num,NULL,0)\r | |
298 | # define OPENSSL_freeFunc CRYPTO_free\r | |
299 | # define OPENSSL_free(addr) CRYPTO_free(addr)\r | |
300 | \r | |
301 | # define OPENSSL_malloc_locked(num) \\r | |
302 | - CRYPTO_malloc_locked((int)num,__FILE__,__LINE__)\r | |
303 | + CRYPTO_malloc_locked((int)num,NULL,0)\r | |
304 | # define OPENSSL_free_locked(addr) CRYPTO_free_locked(addr)\r | |
305 | \r | |
306 | const char *SSLeay_version(int type);\r | |
307 | @@ -545,7 +545,7 @@\r | |
308 | long CRYPTO_get_mem_debug_options(void);\r | |
309 | \r | |
310 | # define CRYPTO_push_info(info) \\r | |
311 | - CRYPTO_push_info_(info, __FILE__, __LINE__);\r | |
312 | + CRYPTO_push_info_(info, NULL, 0);\r | |
313 | int CRYPTO_push_info_(const char *info, const char *file, int line);\r | |
314 | int CRYPTO_pop_info(void);\r | |
315 | int CRYPTO_remove_all_info(void);\r | |
316 | @@ -588,7 +588,7 @@\r | |
317 | \r | |
318 | /* die if we have to */\r | |
319 | void OpenSSLDie(const char *file, int line, const char *assertion);\r | |
320 | -# define OPENSSL_assert(e) (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1))\r | |
321 | +# define OPENSSL_assert(e) (void)((e) ? 0 : (OpenSSLDie(NULL, 0, #e),1))\r | |
322 | \r | |
323 | unsigned long *OPENSSL_ia32cap_loc(void);\r | |
324 | # define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))\r | |
325 | @@ -605,14 +605,14 @@\r | |
326 | # define fips_md_init_ctx(alg, cx) \\r | |
327 | int alg##_Init(cx##_CTX *c) \\r | |
328 | { \\r | |
329 | - if (FIPS_mode()) OpenSSLDie(__FILE__, __LINE__, \\r | |
330 | + if (FIPS_mode()) OpenSSLDie(NULL, 0, \\r | |
331 | "Low level API call to digest " #alg " forbidden in FIPS mode!"); \\r | |
332 | return private_##alg##_Init(c); \\r | |
333 | } \\r | |
334 | int private_##alg##_Init(cx##_CTX *c)\r | |
335 | \r | |
336 | # define fips_cipher_abort(alg) \\r | |
337 | - if (FIPS_mode()) OpenSSLDie(__FILE__, __LINE__, \\r | |
338 | + if (FIPS_mode()) OpenSSLDie(NULL, 0, \\r | |
339 | "Low level API call to cipher " #alg " forbidden in FIPS mode!")\r | |
340 | \r | |
341 | # else\r | |
342 | diff U3 crypto/opensslconf.h crypto/opensslconf.h\r | |
343 | --- crypto/opensslconf.h Thu Jun 11 21:55:38 2015\r | |
344 | +++ crypto/opensslconf.h Fri Jun 12 10:28:27 2015\r | |
3b21958b DW |
345 | @@ -5,6 +5,9 @@\r |
346 | extern "C" {\r | |
347 | #endif\r | |
348 | /* OpenSSL was configured with the following options: */\r | |
349 | +#ifndef OPENSSL_SYSNAME_UEFI\r | |
350 | +# define OPENSSL_SYSNAME_UEFI\r | |
f93f78ea | 351 | +#endif\r |
3b21958b DW |
352 | #ifndef OPENSSL_DOING_MAKEDEPEND\r |
353 | \r | |
354 | \r | |
355 | @@ -152,7 +155,7 @@\r | |
356 | #endif\r | |
f93f78ea QL |
357 | #endif\r |
358 | \r | |
3b21958b DW |
359 | -#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)\r |
360 | +#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) && !defined(OPENSSL_SYSNAME_UEFI)\r | |
361 | #define CONFIG_HEADER_BN_H\r | |
362 | #undef BN_LLONG\r | |
363 | \r | |
364 | diff U3 e_os2.h e_os2.h\r | |
365 | --- e_os2.h Thu Jul 09 19:57:16 2015\r | |
366 | +++ e_os2.h Thu Oct 29 15:08:19 2015\r | |
367 | @@ -97,7 +97,14 @@\r | |
368 | * For 32 bit environment, there seems to be the CygWin environment and then\r | |
369 | * all the others that try to do the same thing Microsoft does...\r | |
370 | */\r | |
371 | -# if defined(OPENSSL_SYSNAME_UWIN)\r | |
372 | +/*\r | |
373 | + * UEFI lives here because it might be built with a Microsoft toolchain and\r | |
374 | + * we need to avoid the false positive match on Windows.\r | |
375 | + */\r | |
376 | +# if defined(OPENSSL_SYSNAME_UEFI)\r | |
377 | +# undef OPENSSL_SYS_UNIX\r | |
378 | +# define OPENSSL_SYS_UEFI\r | |
379 | +# elif defined(OPENSSL_SYSNAME_UWIN)\r | |
380 | # undef OPENSSL_SYS_UNIX\r | |
381 | # define OPENSSL_SYS_WIN32_UWIN\r | |
382 | # else\r |