(original) (raw)

changeset: 87311:40bfddda43d4 parent: 87307:eec4758e3a45 user: Christian Heimes christian@cheimes.de date: Thu Nov 21 16:26:51 2013 +0100 files: Misc/NEWS Modules/_ssl.c description: Issue #19682: Fix compatibility issue with old version of OpenSSL that was introduced by Issue #18379. diff -r eec4758e3a45 -r 40bfddda43d4 Misc/NEWS --- a/Misc/NEWS Thu Nov 21 10:25:09 2013 +0100 +++ b/Misc/NEWS Thu Nov 21 16:26:51 2013 +0100 @@ -59,6 +59,9 @@ Library ------- +- Issue #19682: Fix compatibility issue with old version of OpenSSL that + was introduced by Issue #18379. + - Issue #19633: Fixed writing not compressed 16- and 32-bit wave files on big-endian platforms. diff -r eec4758e3a45 -r 40bfddda43d4 Modules/_ssl.c --- a/Modules/_ssl.c Thu Nov 21 10:25:09 2013 +0100 +++ b/Modules/_ssl.c Thu Nov 21 16:26:51 2013 +0100 @@ -1024,9 +1024,15 @@ int i, j, result; PyObject *lst; +#if OPENSSL_VERSION_NUMBER < 0x10001000L + dps = X509_get_ext_d2i(certificate, NID_crl_distribution_points, + NULL, NULL); +#else /* Calls x509v3_cache_extensions and sets up crldp */ X509_check_ca(certificate); dps = certificate->crldp; +#endif + if (dps == NULL) { return Py_None; } /christian@cheimes.de