[proxy] web.archive.org — ← back | site home | direct (HTTPS) ↗ | proxy home | ◑ dark◐ light
/ cpython Public
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bpo-34710: fix SSL module build #9347

Merged
merged 1 commit into from Sep 17, 2018
Merged

bpo-34710: fix SSL module build #9347

merged 1 commit into from Sep 17, 2018

Conversation

Copy link
Contributor

commodo commented Sep 17, 2018 •
edited by bedevere-bot

Not sure if this fails on all SSL versions. This was found while building
OpenWrt with Python 3.7.0 on x86 & OpenSSL 1.0.2p.

The dh.h header is included in several files, but it doesn't seem to be
included in the ones that are included in _ssl.c (as far as I could
tell).

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

https://bugs.python.org/issue34710

bpo-34710: fix SSL module build
8e8962f 
Not sure if this fails on all SSL versions. This was found while building
OpenWrt with Python 3.7.0 on x86 & OpenSSL 1.0.2p.

The `dh.h` header is included in several files, but it doesn't seem to be
included in the ones that are included in `_ssl.c` (as far as I could
tell).

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Copy link
Contributor Author

commodo commented Sep 17, 2018

Changelog v1 -> v2:

  • added NEWS entry via blurb tool

tiran approved these changes Sep 17, 2018
View changes
Copy link
Member

tiran left a comment

LGTM, thanks!

tiran merged commit b3a271f into python:master Sep 17, 2018
Copy link
Contributor

miss-islington commented Sep 17, 2018

Thanks @commodo for the PR, and @tiran for merging it 🌮🎉.. I'm working now to backport this PR to: 2.7, 3.6, 3.7.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 17, 2018
bpo-34710: fix SSL module build (pythonGH-9347)
395875c 
Include ``openssl/dh.h`` header file to fix implicit function declaration of ``DH_free()``.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit b3a271f)

Co-authored-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Copy link

bedevere-bot commented Sep 17, 2018

GH-9351 is a backport of this pull request to the 3.7 branch.

Copy link

bedevere-bot commented Sep 17, 2018

GH-9352 is a backport of this pull request to the 3.6 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 17, 2018
bpo-34710: fix SSL module build (pythonGH-9347)
4b1a238 
Include ``openssl/dh.h`` header file to fix implicit function declaration of ``DH_free()``.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit b3a271f)

Co-authored-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Copy link
Contributor

miss-islington commented Sep 17, 2018

Sorry, @commodo and @tiran, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker b3a271fc0ce3e13e427be8914decfc205a220ca8 2.7

Copy link
Contributor Author

commodo commented Sep 17, 2018

That was fast.
Thanks :)

@tiran - are you doing the cherry-pick to 2.7 or shall I ?

commodo mentioned this pull request Sep 17, 2018
Merged
tiran pushed a commit to tiran/cpython that referenced this pull request Sep 17, 2018
[2.7] bpo-34710: fix SSL module build (pythonGH-9347)
c9b1928 
Include ``openssl/dh.h`` header file to fix implicit function declaration of ``DH_free()``.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>.
(cherry picked from commit b3a271f)

Co-authored-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Copy link

bedevere-bot commented Sep 17, 2018

GH-9353 is a backport of this pull request to the 2.7 branch.

Copy link
Member

tiran commented Sep 17, 2018

@commodo I took care of the backport

miss-islington added a commit that referenced this pull request Sep 17, 2018
bpo-34710: fix SSL module build (GH-9347)
e2c0aea 
Include ``openssl/dh.h`` header file to fix implicit function declaration of ``DH_free()``.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit b3a271f)

Co-authored-by: Alexandru Ardelean <ardeleanalex@gmail.com>
miss-islington added a commit that referenced this pull request Sep 17, 2018
bpo-34710: fix SSL module build (GH-9347)
fff869e 
Include ``openssl/dh.h`` header file to fix implicit function declaration of ``DH_free()``.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit b3a271f)

Co-authored-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Copy link
Contributor Author

commodo commented Sep 17, 2018

Cool
Thanks :)

miss-islington pushed a commit that referenced this pull request Sep 17, 2018
[2.7] bpo-34710: fix SSL module build (GH-9347) (GH-9353)
5f883fc 
Include ``openssl/dh.h`` header file to fix implicit function declaration of ``DH_free()``.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>.
(cherry picked from commit b3a271f)

Co-authored-by: Alexandru Ardelean <ardeleanalex@gmail.com>



https://bugs.python.org/issue34710
yahya-abou-imran pushed a commit to yahya-abou-imran/cpython that referenced this pull request Nov 2, 2018
bpo-34710: fix SSL module build (pythonGH-9347)
798d0e7 
Include ``openssl/dh.h`` header file to fix implicit function declaration of ``DH_free()``.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
jefferyto mentioned this pull request Jan 14, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

tiran

Assignees

tiran

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants