diff options
| author | Christian Heimes <christian@python.org> | 2018-02-24 21:12:40 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-24 21:12:40 (GMT) |
| commit | 6cdb7954b0a578d899e4b78b868ea59eef08480a (patch) | |
| tree | 8e84ffb724490814d5d01858162bfde792646f59 /Modules/clinic | |
| parent | 141c5e8c2437a9fed95a04c81e400ef725592a17 (diff) | |
| download | cpython-6cdb7954b0a578d899e4b78b868ea59eef08480a.zip cpython-6cdb7954b0a578d899e4b78b868ea59eef08480a.tar.gz cpython-6cdb7954b0a578d899e4b78b868ea59eef08480a.tar.bz2 | |
bpo-30622: Improve NPN support detection (#5859)
The ssl module now detects missing NPN support in LibreSSL.
Co-Authored-By: Bernard Spil <brnrd@FreeBSD.org>
Signed-off-by: Christian Heimes <christian@python.org>
Diffstat (limited to 'Modules/clinic')
| -rw-r--r-- | Modules/clinic/_ssl.c.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h index 5b6c4af..1ee1bfb 100644 --- a/Modules/clinic/_ssl.c.h +++ b/Modules/clinic/_ssl.c.h @@ -132,7 +132,7 @@ _ssl__SSLSocket_version(PySSLSocket *self, PyObject *Py_UNUSED(ignored)) return _ssl__SSLSocket_version_impl(self); } -#if (defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG)) +#if defined(HAVE_NPN) PyDoc_STRVAR(_ssl__SSLSocket_selected_npn_protocol__doc__, "selected_npn_protocol($self, /)\n" @@ -151,7 +151,7 @@ _ssl__SSLSocket_selected_npn_protocol(PySSLSocket *self, PyObject *Py_UNUSED(ign return _ssl__SSLSocket_selected_npn_protocol_impl(self); } -#endif /* (defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG)) */ +#endif /* defined(HAVE_NPN) */ #if defined(HAVE_ALPN) @@ -1175,4 +1175,4 @@ exit: #ifndef _SSL_ENUM_CRLS_METHODDEF #define _SSL_ENUM_CRLS_METHODDEF #endif /* !defined(_SSL_ENUM_CRLS_METHODDEF) */ -/*[clinic end generated code: output=d987411caeb106e7 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=a00fef6a470cfc2c input=a9049054013a1b77]*/ |