Skip to content

gh-123418: Update OpenSSL to 3.0.15 on Windows #123673

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

Merged
merged 2 commits into from
Sep 4, 2024

Conversation

zware
Copy link
Member

@zware zware commented Sep 4, 2024

@zware zware requested a review from a team as a code owner September 4, 2024 15:01
@zware zware added type-security A security issue OS-windows needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes dependencies Pull requests that update a dependency file needs backport to 3.13 bugs and security fixes labels Sep 4, 2024
@zware zware self-assigned this Sep 4, 2024
@zware zware requested a review from zooba September 4, 2024 15:01
@sethmlarson
Copy link
Contributor

@zware These tags don't exist yet in the source-deps and bin-deps repositories, shall I create pull requests updating those places?

@zware
Copy link
Member Author

zware commented Sep 4, 2024

@zware These tags don't exist yet in the source-deps and bin-deps repositories, shall I create pull requests updating those places?

Right; I probably should have marked this as a draft :). Those updates will need to happen first; @zooba has historically been the only one able to update the binary builds, but if you have that capability now please go ahead!

@zware zware added the topic-SSL label Sep 4, 2024
@zooba
Copy link
Member

zooba commented Sep 4, 2024

Theoretically any of the release managers can do the builds now, but I'm on, so I'll do it.

@zooba
Copy link
Member

zooba commented Sep 4, 2024

The tag is updated so I restarted the CI checks.

@sethmlarson
Copy link
Contributor

@zware Since the dependency was updated the SBOM also needs to be regenerated, either run make regen-sbom locally or apply this diff to Misc/externals.spdx.json:

diff --git a/Misc/externals.spdx.json b/Misc/externals.spdx.json
index 758d4191005..f7aea9e8f99 100644
--- a/Misc/externals.spdx.json
+++ b/Misc/externals.spdx.json
@@ -70,21 +70,21 @@
       "checksums": [
         {
           "algorithm": "SHA256",
-          "checksumValue": "e6a77c273ebb284fedd8ea19b081fce74a9455936ffd47215f7c24713e2614b2"
+          "checksumValue": "1550c87996a0858474a9dd179deab2c55eb73726b9a140b32865b02fd3d8a86b"
         }
       ],
-      "downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/openssl-3.0.13.tar.gz",
+      "downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/openssl-3.0.15.tar.gz",
       "externalRefs": [
         {
           "referenceCategory": "SECURITY",
-          "referenceLocator": "cpe:2.3:a:openssl:openssl:3.0.13:*:*:*:*:*:*:*",
+          "referenceLocator": "cpe:2.3:a:openssl:openssl:3.0.15:*:*:*:*:*:*:*",
           "referenceType": "cpe23Type"
         }
       ],
       "licenseConcluded": "NOASSERTION",
       "name": "openssl",
       "primaryPackagePurpose": "SOURCE",
-      "versionInfo": "3.0.13"
+      "versionInfo": "3.0.15"
     },
     {
       "SPDXID": "SPDXRef-PACKAGE-sqlite",

@zware zware requested a review from sethmlarson as a code owner September 4, 2024 16:41
@zware zware enabled auto-merge (squash) September 4, 2024 17:06
@zware zware merged commit d2eafe2 into python:main Sep 4, 2024
34 checks passed
@zware zware deleted the bump_windows_openssl_3.0.15 branch September 4, 2024 17:08
@miss-islington-app
Copy link

Thanks @zware for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12, 3.13.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 4, 2024
@miss-islington-app
Copy link

Sorry, @zware, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker d2eafe2f48aac31aa8a152620bdfd0f2a274ee1d 3.12

@bedevere-app
Copy link

bedevere-app bot commented Sep 4, 2024

GH-123686 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Sep 4, 2024
@miss-islington-app
Copy link

Sorry, @zware, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker d2eafe2f48aac31aa8a152620bdfd0f2a274ee1d 3.11

@bedevere-app
Copy link

bedevere-app bot commented Sep 4, 2024

GH-123691 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.12 only security fixes label Sep 4, 2024
zware added a commit to zware/cpython that referenced this pull request Sep 4, 2024
zware added a commit to zware/cpython that referenced this pull request Sep 4, 2024
@bedevere-app
Copy link

bedevere-app bot commented Sep 4, 2024

GH-123692 is a backport of this pull request to the 3.11 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.11 only security fixes label Sep 4, 2024
ambv pushed a commit that referenced this pull request Sep 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file OS-windows topic-SSL type-security A security issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants