Skip to content

[2.7] bpo-35264: Modules/_ssl.c: fix build with OpenSSL 1.1.0 - #10570

Merged
miss-islington merged 1 commit into
python:2.7from
commodo:python-2-7-fix-ssl-build
Sep 11, 2019
Merged

miss-islington merged 1 commit into
python:2.7from
commodo:python-2-7-fix-ssl-build

Conversation

@commodo

@commodo commodo commented Nov 16, 2018 •

Copy link
Copy Markdown
Contributor

Fixes a build error with OpenSSL 1.1.0. There is already code in the
_ssl.c that handles all the weird cases of the NPN config macros (with
various OpenSSL & LibreSSL versions).
That code will provide a HAVE_NPN variable, which should be used in the
rest of the code to check whether (or what) to compile regarding NPN.

This change adds HAVE_NPN in the remaining places where it should have been
placed.

Signed-off-by: Alexandru Ardelean ardeleanalex@gmail.com

https://bugs.python.org/issue35264

Automerge-Triggered-By: @tiran

Fixes a build error with OpenSSL 1.1.0. There is already code in the
`_ssl.c` that handles all the weird cases of the NPN config macros (with
various OpenSSL & LibreSSL versions).
That code will provide a HAVE_NPN variable, which should be used in the
rest of the code to check whether (or what) to compile regarding NPN.

This change adds HAVE_NPN in the remaining places where it should have been
placed.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
@commodo commodo changed the title bpo-35264: Modules/_ssl.c: fix build with OpenSSL 1.1.0 [2.7] bpo-35264: Modules/_ssl.c: fix build with OpenSSL 1.1.0 Nov 16, 2018
@miss-islington
miss-islington merged commit 0d63669 into python:2.7 Sep 11, 2019
@commodo
commodo deleted the python-2-7-fix-ssl-build branch September 12, 2019 06:58
@commodo

commodo commented Sep 12, 2019

Copy link
Copy Markdown
Contributor Author

Thanks :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants