Skip to content

Commit b620446

Browse files
ned-deilyned-deily
authored
bpo-47024: Update Windows builds and macOS installer build to use OpenSSL 1.1.1n. (GH-31911)
1 parent 5263afe commit b620446

File tree

9 files changed

+15
-14
lines changed

9 files changed

+15
-14
lines changed

‎.azure-pipelines/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
variables:
6262
testRunTitle: '$(build.sourceBranchName)-linux'
6363
testRunPlatform: linux
64-
openssl_version: 1.1.1g
64+
openssl_version: 1.1.1n
6565

6666
steps:
6767
- template: ./posix-steps.yml
@@ -118,7 +118,7 @@ jobs:
118118
variables:
119119
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
120120
testRunPlatform: linux-coverage
121-
openssl_version: 1.1.1g
121+
openssl_version: 1.1.1n
122122

123123
steps:
124124
- template: ./posix-steps.yml

‎.azure-pipelines/pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
variables:
6262
testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
6363
testRunPlatform: linux
64-
openssl_version: 1.1.1g
64+
openssl_version: 1.1.1n
6565

6666
steps:
6767
- template: ./posix-steps.yml
@@ -118,7 +118,7 @@ jobs:
118118
variables:
119119
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
120120
testRunPlatform: linux-coverage
121-
openssl_version: 1.1.1g
121+
openssl_version: 1.1.1n
122122

123123
steps:
124124
- template: ./posix-steps.yml

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
needs: check_source
7878
if: needs.check_source.outputs.run_tests == 'true'
7979
env:
80-
OPENSSL_VER: 1.1.1f
80+
OPENSSL_VER: 1.1.1n
8181
steps:
8282
- uses: actions/checkout@v2
8383
- name: Install Dependencies

‎.github/workflows/coverage.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
name: 'Ubuntu (Coverage)'
2424
runs-on: ubuntu-latest
2525
env:
26-
OPENSSL_VER: 1.1.1f
26+
OPENSSL_VER: 1.1.1n
2727
steps:
2828
- uses: actions/checkout@v2
2929
- name: Install Dependencies

‎Mac/BuildScript/build-installer.py‎

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

210210
result.extend([
211211
dict(
212-
name="OpenSSL 1.1.1g",
213-
url="https://www.openssl.org/source/openssl-1.1.1g.tar.gz",
214-
checksum='76766e98997660138cdaf13a187bd234',
212+
name="OpenSSL 1.1.1n",
213+
url="https://www.openssl.org/source/openssl-1.1.1n.tar.gz",
214+
checksum='2aad5635f9bb338bc2c6b7d19cbc9676',
215215
buildrecipe=build_universal_openssl,
216216
configure=None,
217217
install=None,

‎Misc/NEWS.d/next/Build/2022-03-15-11-53-10.bpo-47024.p3PjRy.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update Windows builds and macOS installer build to use OpenSSL 1.1.1n.

‎PCbuild/get_externals.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ echo.Fetching external libraries...
4949

5050
set libraries=
5151
set libraries=%libraries% bzip2-1.0.8
52-
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1g
52+
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1n
5353
set libraries=%libraries% sqlite-3.31.1.0
5454
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.9.0
5555
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.9.0
@@ -72,7 +72,7 @@ for %%e in (%libraries%) do (
7272
echo.Fetching external binaries...
7373

7474
set binaries=
75-
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1g
75+
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1n
7676
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.9.0
7777
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
7878

‎PCbuild/python.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
<sqlite3Dir>$(ExternalsDir)sqlite-3.31.1.0\</sqlite3Dir>
5050
<bz2Dir>$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
5151
<lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
52-
<opensslDir>$(ExternalsDir)openssl-1.1.1g\</opensslDir>
53-
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1g\$(ArchName)\</opensslOutDir>
52+
<opensslDir>$(ExternalsDir)openssl-1.1.1n\</opensslDir>
53+
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1n\$(ArchName)\</opensslOutDir>
5454
<opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
5555
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
5656
<zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir>

‎Tools/ssl/multissltests.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
]
4949

5050
OPENSSL_RECENT_VERSIONS = [
51-
"1.1.1g",
51+
"1.1.1n",
5252
# "3.0.0-alpha2"
5353
]
5454

0 commit comments

Comments
 (0)