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

benjaminp · benjaminp · commit c54de477595a · 2015-01-28T12:06:39.000-05:00
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -2275,6 +2275,7 @@ set_ciphers(PySSLContext self, PyObject args)`
`2275`	`2275`	`Py_RETURN_NONE;`
`2276`	`2276`	`}`
`2277`	`2277`
	`2278`	`+#ifdef OPENSSL_NPN_NEGOTIATED`
`2278`	`2279`	`static int`
`2279`	`2280`	`do_protocol_selection(int alpn, unsigned char *out, unsigned char outlen,`
`2280`	`2281`	`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,`
`2299`	`2300`	`return SSL_TLSEXT_ERR_OK;`
`2300`	`2301`	`}`
`2301`	`2302`
`2302`		`-#ifdef OPENSSL_NPN_NEGOTIATED`
`2303`	`2303`	`/* this callback gets passed to SSL_CTX_set_next_protos_advertise_cb */`
`2304`	`2304`	`static int`
`2305`	`2305`	`_advertiseNPN_cb(SSL *s,`