ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-28 09:38:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge 3.4 (#25578)

Browse source
This commit is contained in:
Benjamin Peterson 2015-11-14 15:14:42 -08:00
commit fcc2e71e99
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Modules/_ssl.c
View file

@ -1017,7 +1017,10 @@ _get_aia_uri(X509 *certificate, int nid) {
AUTHORITY_INFO_ACCESS *info;
info = X509_get_ext_d2i(certificate, NID_info_access, NULL, NULL);
if ((info == NULL) || (sk_ACCESS_DESCRIPTION_num(info) == 0)) {
if (info == NULL)
return Py_None;
if (sk_ACCESS_DESCRIPTION_num(info) == 0) {
AUTHORITY_INFO_ACCESS_free(info);
return Py_None;
}
@ -3967,7 +3970,7 @@ _ssl_get_default_verify_paths_impl(PyModuleDef *module)
else if ((target = PyUnicode_DecodeFSDefault(tmp)) == NULL) { \
target = PyBytes_FromString(tmp); } \
if (!target) goto error; \
}
}
CONVERT(X509_get_default_cert_file_env(), ofile_env);
CONVERT(X509_get_default_cert_file(), ofile);