Skip to content

Commit bf99e19

Browse files
zoobagpsheadned-deily
authored
[3.9] gh-101726: Update the OpenSSL version to 1.1.1t (GH-101727) (GH-101751)
Fixes CVE-2023-0286 (High) and a couple of Medium security issues. https://www.openssl.org/news/secadv/20230207.txt Co-authored-by: Gregory P. Smith <[email protected]> Co-authored-by: Ned Deily <[email protected]>
1 parent c25b484 commit bf99e19

File tree

9 files changed

+37
-26
lines changed

9 files changed

+37
-26
lines changed

‎.azure-pipelines/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
variables:
5858
testRunTitle: '$(build.sourceBranchName)-linux'
5959
testRunPlatform: linux
60-
openssl_version: 1.1.1n
60+
openssl_version: 1.1.1t
6161

6262
steps:
6363
- template: ./posix-steps.yml
@@ -83,7 +83,7 @@ jobs:
8383
variables:
8484
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
8585
testRunPlatform: linux-coverage
86-
openssl_version: 1.1.1n
86+
openssl_version: 1.1.1t
8787

8888
steps:
8989
- template: ./posix-steps.yml

‎.azure-pipelines/pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
variables:
5858
testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
5959
testRunPlatform: linux
60-
openssl_version: 1.1.1n
60+
openssl_version: 1.1.1t
6161

6262
steps:
6363
- template: ./posix-steps.yml
@@ -83,7 +83,7 @@ jobs:
8383
variables:
8484
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
8585
testRunPlatform: linux-coverage
86-
openssl_version: 1.1.1n
86+
openssl_version: 1.1.1t
8787

8888
steps:
8989
- template: ./posix-steps.yml

‎.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ jobs:
165165
needs: check_source
166166
if: needs.check_source.outputs.run_tests == 'true'
167167
env:
168-
OPENSSL_VER: 1.1.1n
168+
OPENSSL_VER: 1.1.1t
169169
PYTHONSTRICTEXTENSIONBUILD: 1
170170
steps:
171171
- uses: actions/checkout@v3
@@ -207,7 +207,7 @@ jobs:
207207
strategy:
208208
fail-fast: false
209209
matrix:
210-
openssl_ver: [1.0.2u, 1.1.0l, 1.1.1n, 3.0.2]
210+
openssl_ver: [1.0.2u, 1.1.0l, 1.1.1t, 3.0.8, 3.1.0-beta1]
211211
env:
212212
OPENSSL_VER: ${{ matrix.openssl_ver }}
213213
MULTISSL_DIR: ${{ github.workspace }}/multissl

‎Mac/BuildScript/build-installer.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,9 @@ def library_recipes():
244244

245245
result.extend([
246246
dict(
247-
name="OpenSSL 1.1.1n",
248-
url="https://www.openssl.org/source/openssl-1.1.1n.tar.gz",
249-
checksum='2aad5635f9bb338bc2c6b7d19cbc9676',
247+
name="OpenSSL 1.1.1t",
248+
url="https://www.openssl.org/source/openssl-1.1.1t.tar.gz",
249+
checksum='1cfee919e0eac6be62c88c5ae8bcd91e',
250250
buildrecipe=build_universal_openssl,
251251
configure=None,
252252
install=None,

‎Misc/NEWS.d/next/Security/2023-02-08-22-03-04.gh-issue-101727.9P5eZz.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Updated the OpenSSL version used in Windows and macOS binary release builds
2+
to 1.1.1t to address CVE-2023-0286, CVE-2022-4303, and CVE-2022-4303 per
3+
`the OpenSSL 2023-02-07 security advisory
4+
<https://www.openssl.org/news/secadv/20230207.txt>`_.

‎PCbuild/get_externals.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ echo.Fetching external libraries...
5353
set libraries=
5454
set libraries=%libraries% bzip2-1.0.8
5555
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.3.0
56-
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1s
56+
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1t
5757
set libraries=%libraries% sqlite-3.37.2.0
5858
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.12.0
5959
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.12.0
@@ -77,7 +77,7 @@ echo.Fetching external binaries...
7777

7878
set binaries=
7979
if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi-3.3.0
80-
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1s
80+
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1t
8181
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.12.0
8282
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
8383

‎PCbuild/python.props

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,25 @@
5757
<ExternalsDir>$(EXTERNALS_DIR)</ExternalsDir>
5858
<ExternalsDir Condition="$(ExternalsDir) == ''">$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`))</ExternalsDir>
5959
<ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir>
60-
<sqlite3Dir>$(ExternalsDir)sqlite-3.37.2.0\</sqlite3Dir>
61-
<bz2Dir>$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
62-
<lzmaDir>$(ExternalsDir)xz-5.2.5\</lzmaDir>
63-
<libffiDir>$(ExternalsDir)libffi-3.3.0\</libffiDir>
64-
<libffiOutDir>$(ExternalsDir)libffi-3.3.0\$(ArchName)\</libffiOutDir>
65-
<libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir>
66-
<opensslDir>$(ExternalsDir)openssl-1.1.1s\</opensslDir>
67-
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1s\$(ArchName)\</opensslOutDir>
68-
<opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
69-
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
70-
<zlibDir>$(ExternalsDir)\zlib-1.2.12\</zlibDir>
71-
60+
</PropertyGroup>
61+
62+
<Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" />
63+
64+
<PropertyGroup>
65+
<sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.37.2.0\</sqlite3Dir>
66+
<bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
67+
<lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir>
68+
<libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.3.0\</libffiDir>
69+
<libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir>
70+
<libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir>
71+
<opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-1.1.1t\</opensslDir>
72+
<opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-1.1.1t\$(ArchName)\</opensslOutDir>
73+
<opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
74+
<nasmDir Condition="$(nasmDir) == ''">$(ExternalsDir)\nasm-2.11.06\</nasmDir>
75+
<zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.2.12\</zlibDir>
76+
</PropertyGroup>
77+
78+
<PropertyGroup>
7279
<!-- Suffix for all binaries when building for debug -->
7380
<PyDebugExt Condition="'$(PyDebugExt)' == '' and $(Configuration) == 'Debug'">_d</PyDebugExt>
7481

‎PCbuild/readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ _lzma
164164
Homepage:
165165
https://tukaani.org/xz/
166166
_ssl
167-
Python wrapper for version 1.1.1k of the OpenSSL secure sockets
167+
Python wrapper for version 1.1.1t of the OpenSSL secure sockets
168168
library, which is downloaded from our binaries repository at
169169
https://github.com/python/cpython-bin-deps.
170170

‎Tools/ssl/multissltests.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
]
5050

5151
OPENSSL_RECENT_VERSIONS = [
52-
"1.1.1n",
53-
"3.0.2"
52+
"1.1.1t",
53+
"3.0.8"
5454
]
5555

5656
LIBRESSL_OLD_VERSIONS = [

0 commit comments

Comments
 (0)