https://github.com/python/cpython/commit/e27406465fa9cef1d92f7962e41a8aaa9fb26765
commit: e27406465fa9cef1d92f7962e41a8aaa9fb26765
branch: 3.12
author: Zachary Ware <[email protected]>
committer: zware <[email protected]>
date: 2024-09-04T16:21:37-05:00
summary:
[3.12] gh-123418: Update OpenSSL to 3.0.15 on Windows (GH-123691)
(cherry picked from commit d2eafe2f48aac31aa8a152620bdfd0f2a274ee1d)
files:
A Misc/NEWS.d/next/Windows/2024-09-04-09-59-18.gh-issue-123418.QaMC12.rst
M Misc/externals.spdx.json
M PCbuild/get_externals.bat
M PCbuild/python.props
diff --git
a/Misc/NEWS.d/next/Windows/2024-09-04-09-59-18.gh-issue-123418.QaMC12.rst
b/Misc/NEWS.d/next/Windows/2024-09-04-09-59-18.gh-issue-123418.QaMC12.rst
new file mode 100644
index 00000000000000..c2b47dc40652dc
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2024-09-04-09-59-18.gh-issue-123418.QaMC12.rst
@@ -0,0 +1 @@
+Updated Windows build to use OpenSSL 3.0.15.
diff --git a/Misc/externals.spdx.json b/Misc/externals.spdx.json
index e905c2b907e736..6c711e74f94c79 100644
--- a/Misc/externals.spdx.json
+++ b/Misc/externals.spdx.json
@@ -48,21 +48,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",
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 1b741d6e49f28a..e0144bcdf18c10 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -53,7 +53,7 @@ echo.Fetching external libraries...
set libraries=
set libraries=%libraries% bzip2-1.0.8
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.4
-if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-3.0.13
+if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-3.0.15
set libraries=%libraries% sqlite-3.45.3.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries%
tcl-core-8.6.13.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.13.0
@@ -77,7 +77,7 @@ echo.Fetching external binaries...
set binaries=
if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi-3.4.4
-if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-3.0.13
+if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-3.0.15
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.13.0
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
diff --git a/PCbuild/python.props b/PCbuild/python.props
index d799948fa31188..b893960f99619f 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -74,8 +74,8 @@
<libffiDir Condition="$(libffiDir) ==
''">$(ExternalsDir)libffi-3.4.4\</libffiDir>
<libffiOutDir Condition="$(libffiOutDir) ==
''">$(libffiDir)$(ArchName)\</libffiOutDir>
<libffiIncludeDir Condition="$(libffiIncludeDir) ==
''">$(libffiOutDir)include</libffiIncludeDir>
- <opensslDir Condition="$(opensslDir) ==
''">$(ExternalsDir)openssl-3.0.13\</opensslDir>
- <opensslOutDir Condition="$(opensslOutDir) ==
''">$(ExternalsDir)openssl-bin-3.0.13\$(ArchName)\</opensslOutDir>
+ <opensslDir Condition="$(opensslDir) ==
''">$(ExternalsDir)openssl-3.0.15\</opensslDir>
+ <opensslOutDir Condition="$(opensslOutDir) ==
''">$(ExternalsDir)openssl-bin-3.0.15\$(ArchName)\</opensslOutDir>
<opensslIncludeDir Condition="$(opensslIncludeDir) ==
''">$(opensslOutDir)include</opensslIncludeDir>
<nasmDir Condition="$(nasmDir) ==
''">$(ExternalsDir)\nasm-2.11.06\</nasmDir>
<zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.3.1\</zlibDir>
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
