From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 28 Jan 2015 17:06:39 +0000 (-0500)
Subject: ifdef our way to compatibility with old openssl (closes #23335)
X-Git-Tag: v3.5.0a1~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c54de477595a09e4e40497738882212c374f0227;p=thirdparty%2FPython%2Fcpython.git

ifdef our way to compatibility with old openssl (closes #23335)
---

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 3faca0a2cc5c..437d2b26c89d 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -2275,6 +2275,7 @@ set_ciphers(PySSLContext *self, PyObject *args)
     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 @@ do_protocol_selection(int alpn, unsigned char **out, unsigned char *outlen,
     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,