Skip to content

/ cpython

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-43631: Update to OpenSSL 1.1.1k #25024

Merged
merged 2 commits into from Mar 30, 2021
Merged

bpo-43631: Update to OpenSSL 1.1.1k #25024

merged 2 commits into from Mar 30, 2021
+17 −16

Conversation

@tiran
Copy link
Member

@tiran tiran commented Mar 26, 2021 •
edited

  • Build OpenSSL 1.1.1k for macOS
  • Build OpenSSL 1.1.1k for Windows

I have also updated multissl tester and various CI configurations to use latest OpenSSL. The versions were all over the place.

Signed-off-by: Christian Heimes christian@python.org

https://bugs.python.org/issue43631

Automerge-Triggered-By: GH:tiran
@tiran tiran requested review from zooba and ned-deily Mar 26, 2021
@tiran
bpo-43631: Update to OpenSSL 1.1.1k
Loading status checks…
041cd4e 
Signed-off-by: Christian Heimes <christian@python.org>
@tiran tiran force-pushed the tiran:bpo-43631-openssl-1.1.1k branch from a9cd05b to 041cd4e Mar 29, 2021
@tiran tiran marked this pull request as ready for review Mar 29, 2021
@tiran tiran requested review from python/macos-team as code owners Mar 29, 2021
@ned-deily
Update tarball checksum
Verified
This commit was signed with the committer’s verified signature.
ned-deily Ned Deily
GPG key ID: 2D347EA6AA65421D Learn about signing commits
Loading status checks…
c14f459
@ned-deily
ned-deily approved these changes Mar 29, 2021
View changes
Copy link
Member

@ned-deily ned-deily left a comment •
edited

I only reviewed the macOS build changes and they looked OK with the addition of the tarball checksum update which I just pushed to the PR. Thanks for making the change.
@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Mar 30, 2021

@tiran: Status check is done, and it's a success ✅ .
@miss-islington miss-islington merged commit a54fc68 into python:master Mar 30, 2021
11 checks passed
11 checks passed
Docs
Details
Check for source changes
Details
Check if generated files are up to date
Details
Windows (x86)
Details
Windows (x64) Windows (x64)
Details
macOS
Details
Ubuntu
Details
Azure Pipelines PR #20210329.44 succeeded
Details
Travis CI - Pull Request Build Passed
Details
bedevere/issue-number Issue number 43631 found
Details
bedevere/news News entry found in Misc/NEWS.d
@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Mar 30, 2021

Thanks @tiran for the PR 🌮🎉.. I'm working now to backport this PR to: 3.6, 3.7, 3.8, 3.9.
🐍🍒⛏🤖
@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Mar 30, 2021

Sorry @tiran, I had trouble checking out the 3.9 backport branch.
Please backport using cherry_picker on command line.
cherry_picker a54fc683f237d8f0b6e999a63aa9b8c0a45b7fef 3.9
@miss-islington miss-islington self-assigned this Mar 30, 2021
@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Mar 30, 2021

Sorry, @tiran, I could not cleanly backport this to 3.8 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker a54fc683f237d8f0b6e999a63aa9b8c0a45b7fef 3.8
@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Mar 30, 2021

Sorry @tiran, I had trouble checking out the 3.7 backport branch.
Please backport using cherry_picker on command line.
cherry_picker a54fc683f237d8f0b6e999a63aa9b8c0a45b7fef 3.7
@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Mar 30, 2021

Sorry, @tiran, I could not cleanly backport this to 3.6 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker a54fc683f237d8f0b6e999a63aa9b8c0a45b7fef 3.6
tiran added a commit to tiran/cpython that referenced this pull request Mar 30, 2021
@tiran
[3.9] bpo-43631: Update to OpenSSL 1.1.1k (pythonGH-25024)
c133e73 
- [x] Build OpenSSL 1.1.1k for macOS
- [x] Build OpenSSL 1.1.1k for Windows

I have also updated multissl tester and various CI configurations to use latest OpenSSL. The versions were all over the place.

Signed-off-by: Christian Heimes <christian@python.org>

Automerge-Triggered-By: GH:tiran.
(cherry picked from commit a54fc68)

Co-authored-by: Christian Heimes <christian@python.org>
@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented Mar 30, 2021

GH-25088 is a backport of this pull request to the 3.9 branch.
@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented Mar 30, 2021

GH-25089 is a backport of this pull request to the 3.8 branch.
tiran added a commit to tiran/cpython that referenced this pull request Mar 30, 2021
@tiran
[3.8] bpo-43631: Update to OpenSSL 1.1.1k (pythonGH-25024)
c2bd785 
- [x] Build OpenSSL 1.1.1k for macOS
- [x] Build OpenSSL 1.1.1k for Windows

I have also updated multissl tester and various CI configurations to use latest OpenSSL. The versions were all over the place.

Signed-off-by: Christian Heimes <christian@python.org>

Automerge-Triggered-By: GH:tiran.
(cherry picked from commit a54fc68)

Co-authored-by: Christian Heimes <christian@python.org>
miss-islington pushed a commit that referenced this pull request Mar 30, 2021
@tiran
[3.8] bpo-43631: Update to OpenSSL 1.1.1k (GH-25024) (GH-25089)
Verified
This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
9ac2630 
Signed-off-by: Christian Heimes <christian@python.org>

Automerge-Triggered-By: GH:tiran.
(cherry picked from commit a54fc68)

Co-authored-by: Christian Heimes <christian@python.org>
miss-islington pushed a commit that referenced this pull request Mar 30, 2021
@tiran
[3.9] bpo-43631: Update to OpenSSL 1.1.1k (GH-25024) (GH-25088)
Verified
This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
cd82d59 
Signed-off-by: Christian Heimes <christian@python.org>

Automerge-Triggered-By: GH:tiran.
(cherry picked from commit a54fc68)

Co-authored-by: Christian Heimes <christian@python.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ned-deily ned-deily

@zooba zooba

@python/windows-team windows-team

Assignees

@miss-islington miss-islington

Labels
🤖 automerge CLA signed needs backport to 3.6 needs backport to 3.7
Projects
None yet
Milestone
No milestone
5 participants
@tiran @miss-islington @bedevere-bot @ned-deily @the-knights-who-say-ni