[Python-checkins] cpython: ifdef our way to compatibility with old openssl (closes #23335)

Wed Jan 28 18:07:09 CET 2015

https://hg.python.org/cpython/rev/16f982f93a47
changeset: 94353:16f982f93a47
user: Benjamin Peterson <benjamin at python.org>
date: Wed Jan 28 12:06:39 2015 -0500
summary:
 ifdef our way to compatibility with old openssl (closes #23335)
files:
 Modules/_ssl.c | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -2275,6 +2275,7 @@
 Py_RETURN_NONE;
 }
 
+#ifdef OPENSSL_NPN_NEGOTIATED
 static int
 do_protocol_selection(int alpn, unsigned char **out, unsigned char *outlen,
 const unsigned char *server_protocols, unsigned int server_protocols_len,
@@ -2299,7 +2300,6 @@
 return SSL_TLSEXT_ERR_OK;
 }
 
-#ifdef OPENSSL_NPN_NEGOTIATED
 /* this callback gets passed to SSL_CTX_set_next_protos_advertise_cb */
 static int
 _advertiseNPN_cb(SSL *s,
-- 
Repository URL: https://hg.python.org/cpython
