Skip to content

Commit b8149a9

Browse files
zoobagpshead
andauthored
gh-101726: Update the OpenSSL version to 1.1.1t (GH-101727)
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]>
1 parent 9889de3 commit b8149a9

File tree

9 files changed

+20
-16
lines changed

9 files changed

+20
-16
lines changed

.azure-pipelines/ci.yml

+2-2
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.1q
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.1q
86+
openssl_version: 1.1.1t
8787

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

.azure-pipelines/pr.yml

+2-2
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.1q
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.1q
86+
openssl_version: 1.1.1t
8787

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

.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ jobs:
196196
needs: check_source
197197
if: needs.check_source.outputs.run_tests == 'true'
198198
env:
199-
OPENSSL_VER: 1.1.1q
199+
OPENSSL_VER: 1.1.1t
200200
PYTHONSTRICTEXTENSIONBUILD: 1
201201
steps:
202202
- uses: actions/checkout@v3
@@ -240,7 +240,7 @@ jobs:
240240
strategy:
241241
fail-fast: false
242242
matrix:
243-
openssl_ver: [1.1.1q, 3.0.5]
243+
openssl_ver: [1.1.1t, 3.0.8, 3.1.0-beta1]
244244
env:
245245
OPENSSL_VER: ${{ matrix.openssl_ver }}
246246
MULTISSL_DIR: ${{ github.workspace }}/multissl

Mac/BuildScript/build-installer.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,9 @@ def library_recipes():
246246

247247
result.extend([
248248
dict(
249-
name="OpenSSL 1.1.1s",
250-
url="https://www.openssl.org/source/openssl-1.1.1s.tar.gz",
251-
checksum='c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa',
249+
name="OpenSSL 1.1.1t",
250+
url="https://www.openssl.org/source/openssl-1.1.1t.tar.gz",
251+
checksum='8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b',
252252
buildrecipe=build_universal_openssl,
253253
configure=None,
254254
install=None,
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

+2-2
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.39.4.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

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
<libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.3.0\</libffiDir>
7171
<libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir>
7272
<libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir>
73-
<opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-1.1.1s\</opensslDir>
74-
<opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-1.1.1s\$(ArchName)\</opensslOutDir>
73+
<opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-1.1.1t\</opensslDir>
74+
<opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-1.1.1t\$(ArchName)\</opensslOutDir>
7575
<opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
7676
<nasmDir Condition="$(nasmDir) == ''">$(ExternalsDir)\nasm-2.11.06\</nasmDir>
7777
<zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.2.13\</zlibDir>

PCbuild/readme.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ _lzma
167167
Homepage:
168168
https://tukaani.org/xz/
169169
_ssl
170-
Python wrapper for version 1.1.1q of the OpenSSL secure sockets
170+
Python wrapper for version 1.1.1t of the OpenSSL secure sockets
171171
library, which is downloaded from our binaries repository at
172172
https://github.com/python/cpython-bin-deps.
173173

Tools/ssl/multissltests.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
]
4848

4949
OPENSSL_RECENT_VERSIONS = [
50-
"1.1.1q",
51-
"3.0.5"
50+
"1.1.1t",
51+
"3.0.8"
5252
]
5353

5454
LIBRESSL_OLD_VERSIONS = [

0 commit comments

Comments
 (0)