[Python-checkins] bpo-28182: restore backwards compatibility (#3464)

Fri Sep 8 17:48:02 EDT 2017

https://github.com/python/cpython/commit/0915360b9ef765bf84d4471a8a079f48c49bad68
commit: 0915360b9ef765bf84d4471a8a079f48c49bad68
branch: master
author: Christian Heimes <christian at python.org>
committer: GitHub <noreply at github.com>
date: 2017年09月08日T14:47:58-07:00
summary:
bpo-28182: restore backwards compatibility (#3464)
b3ad0e5 broke backwards compatibility with OpenSSL < 1.0.2.
Signed-off-by: Christian Heimes <christian at python.org>
files:
M Modules/_ssl.c

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 5b27f2fda2c..5ec31a77365 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -485,18 +485,23 @@ fill_and_set_sslerror(PySSLSocket *sslsock, PyObject *type, int ssl_errno,
 }
 
 switch (verify_code) {
+#ifdef X509_V_ERR_HOSTNAME_MISMATCH
+ /* OpenSSL >= 1.0.2, LibreSSL >= 2.5.3 */
 case X509_V_ERR_HOSTNAME_MISMATCH:
 verify_obj = PyUnicode_FromFormat(
 "Hostname mismatch, certificate is not valid for '%S'.",
 sslsock->server_hostname
 );
 break;
+#endif
+#ifdef X509_V_ERR_IP_ADDRESS_MISMATCH
 case X509_V_ERR_IP_ADDRESS_MISMATCH:
 verify_obj = PyUnicode_FromFormat(
 "IP address mismatch, certificate is not valid for '%S'.",
 sslsock->server_hostname
 );
 break;
+#endif
 default:
 verify_str = X509_verify_cert_error_string(verify_code);
 if (verify_str != NULL) {
