merge

Misc/NEWS

@@ -59,6 +59,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #19682: Fix compatibility issue with old version of OpenSSL that
+  was introduced by Issue #18379.
+
 - Issue #14455: plistlib now supports binary plists and has an updated API.
 
 - Issue #19633: Fixed writing not compressed 16- and 32-bit wave files on

Modules/_ssl.c

@@ -1024,9 +1024,15 @@ _get_crl_dp(X509 *certificate) {
     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;
     }