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

[benjamin.peterson]

https://hg.python.org/cpython/rev/1addc4f0f10c
changeset:   94354:1addc4f0f10c
branch:      2.7
parent:      94348:c087ac6fc171
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
@@ -2148,6 +2148,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,
@@ -2172,7 +2173,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