Skip to content

Commit e8b72fc

Browse files
ned-deilyned-deily
authored
[3.8] bpo-47024: Update Windows builds and macOS installer build to use OpenSSL 1.1.1n. (GH-31912)
* bpo-47024: Update Windows builds and macOS installer build to use OpenSSL 1.1.1n. * Revert inadvertent sqlite downgrade
1 parent 7a315d8 commit e8b72fc

File tree

10 files changed

+16
-75
lines changed

10 files changed

+16
-75
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.1l
60+
openssl_version: 1.1.1n
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.1l
86+
openssl_version: 1.1.1n
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.1l
60+
openssl_version: 1.1.1n
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.1l
86+
openssl_version: 1.1.1n
8787

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

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ jobs:
143143
needs: check_source
144144
if: needs.check_source.outputs.run_tests == 'true'
145145
env:
146-
OPENSSL_VER: 1.1.1l
146+
OPENSSL_VER: 1.1.1n
147147
steps:
148148
- uses: actions/checkout@v2
149149
- 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.1k
26+
OPENSSL_VER: 1.1.1n
2727
steps:
2828
- uses: actions/checkout@v2
2929
- name: Install Dependencies

‎Mac/BuildScript/0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch‎

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎Mac/BuildScript/build-installer.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,10 +242,9 @@ def library_recipes():
242242

243243
result.extend([
244244
dict(
245-
name="OpenSSL 1.1.1l",
246-
url="https://www.openssl.org/source/openssl-1.1.1l.tar.gz",
247-
checksum='ac0d4387f3ba0ad741b0580dd45f6ff3',
248-
patches=['0001-Darwin-platform-allows-to-build-on-releases-before-Y.patch'],
245+
name="OpenSSL 1.1.1n",
246+
url="https://www.openssl.org/source/openssl-1.1.1n.tar.gz",
247+
checksum='2aad5635f9bb338bc2c6b7d19cbc9676',
249248
buildrecipe=build_universal_openssl,
250249
configure=None,
251250
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
@@ -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.1l
56+
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1n
5757
set libraries=%libraries% sqlite-3.35.5.0
5858
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.9.0
5959
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.9.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.1l
80+
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1n
8181
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.9.0
8282
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
8383

‎PCbuild/python.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
<libffiDir>$(ExternalsDir)libffi-3.3.0\</libffiDir>
6363
<libffiOutDir>$(ExternalsDir)libffi-3.3.0\$(ArchName)\</libffiOutDir>
6464
<libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir>
65-
<opensslDir>$(ExternalsDir)openssl-1.1.1l\</opensslDir>
66-
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1l\$(ArchName)\</opensslOutDir>
65+
<opensslDir>$(ExternalsDir)openssl-1.1.1n\</opensslDir>
66+
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1n\$(ArchName)\</opensslOutDir>
6767
<opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
6868
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
6969
<zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir>

‎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.1l",
53-
"3.0.0-beta1"
52+
"1.1.1n",
53+
"3.0.1"
5454
]
5555

5656
LIBRESSL_OLD_VERSIONS = [

0 commit comments

Comments
 (0)