Kaydet (Commit) 0915360b authored tarafından Christian Heimes's avatar Christian Heimes Kaydeden (comit) GitHub

bpo-28182: restore backwards compatibility (#3464)

b3ad0e51 broke backwards compatibility with OpenSSL < 1.0.2.
Signed-off-by: 's avatarChristian Heimes <christian@python.org>
üst db610e90
...@@ -485,18 +485,23 @@ fill_and_set_sslerror(PySSLSocket *sslsock, PyObject *type, int ssl_errno, ...@@ -485,18 +485,23 @@ fill_and_set_sslerror(PySSLSocket *sslsock, PyObject *type, int ssl_errno,
} }
switch (verify_code) { switch (verify_code) {
#ifdef X509_V_ERR_HOSTNAME_MISMATCH
/* OpenSSL >= 1.0.2, LibreSSL >= 2.5.3 */
case X509_V_ERR_HOSTNAME_MISMATCH: case X509_V_ERR_HOSTNAME_MISMATCH:
verify_obj = PyUnicode_FromFormat( verify_obj = PyUnicode_FromFormat(
"Hostname mismatch, certificate is not valid for '%S'.", "Hostname mismatch, certificate is not valid for '%S'.",
sslsock->server_hostname sslsock->server_hostname
); );
break; break;
#endif
#ifdef X509_V_ERR_IP_ADDRESS_MISMATCH
case X509_V_ERR_IP_ADDRESS_MISMATCH: case X509_V_ERR_IP_ADDRESS_MISMATCH:
verify_obj = PyUnicode_FromFormat( verify_obj = PyUnicode_FromFormat(
"IP address mismatch, certificate is not valid for '%S'.", "IP address mismatch, certificate is not valid for '%S'.",
sslsock->server_hostname sslsock->server_hostname
); );
break; break;
#endif
default: default:
verify_str = X509_verify_cert_error_string(verify_code); verify_str = X509_verify_cert_error_string(verify_code);
if (verify_str != NULL) { if (verify_str != NULL) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment