Skip to content

Commit 32a4501

Browse files
tirantiran
authored
[3.10] gh-94682: Build and test with OpenSSL 1.1.1q (gh-94683) (gh-96391)
Co-authored-by: Christian Heimes <christian@python.org>
1 parent 928a692 commit 32a4501

File tree

9 files changed

+26
-19
lines changed

9 files changed

+26
-19
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.1q
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.1q
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.1q
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.1q
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
@@ -190,7 +190,7 @@ jobs:
190190
needs: check_source
191191
if: needs.check_source.outputs.run_tests == 'true'
192192
env:
193-
OPENSSL_VER: 1.1.1n
193+
OPENSSL_VER: 1.1.1q
194194
PYTHONSTRICTEXTENSIONBUILD: 1
195195
steps:
196196
- uses: actions/checkout@v3
@@ -234,7 +234,7 @@ jobs:
234234
strategy:
235235
fail-fast: false
236236
matrix:
237-
openssl_ver: [1.1.1n, 3.0.2]
237+
openssl_ver: [1.1.1q, 3.0.5]
238238
env:
239239
OPENSSL_VER: ${{ matrix.openssl_ver }}
240240
MULTISSL_DIR: ${{ github.workspace }}/multissl

‎Mac/BuildScript/build-installer.py‎

Lines changed: 12 additions & 6 deletions
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.1n",
250-
url="https://www.openssl.org/source/openssl-1.1.1n.tar.gz",
251-
checksum='2aad5635f9bb338bc2c6b7d19cbc9676',
249+
name="OpenSSL 1.1.1q",
250+
url="https://www.openssl.org/source/openssl-1.1.1q.tar.gz",
251+
checksum='d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca',
252252
buildrecipe=build_universal_openssl,
253253
configure=None,
254254
install=None,
@@ -793,10 +793,16 @@ def verifyThirdPartyFile(url, checksum, fname):
793793
print("Downloading %s"%(name,))
794794
downloadURL(url, fname)
795795
print("Archive for %s stored as %s"%(name, fname))
796+
if len(checksum) == 32:
797+
algo = 'md5'
798+
elif len(checksum) == 64:
799+
algo = 'sha256'
800+
else:
801+
raise ValueError(checksum)
796802
if os.system(
797-
'MD5=$(openssl md5 %s) ; test "${MD5##*= }" = "%s"'
798-
% (shellQuote(fname), checksum) ):
799-
fatal('MD5 checksum mismatch for file %s' % fname)
803+
'CHECKSUM=$(openssl %s %s) ; test "${CHECKSUM##*= }" = "%s"'
804+
% (algo, shellQuote(fname), checksum) ):
805+
fatal('%s checksum mismatch for file %s' % (algo, fname))
800806

801807
def build_universal_openssl(basedir, archList):
802808
"""

‎Misc/NEWS.d/next/Build/2022-07-08-10-28-23.gh-issue-94682.ZtGt_0.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Build and test with OpenSSL 1.1.1q

‎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.1n
56+
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1q
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.1n
80+
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1q
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
<libffiDir>$(ExternalsDir)libffi-3.3.0\</libffiDir>
6464
<libffiOutDir>$(ExternalsDir)libffi-3.3.0\$(ArchName)\</libffiOutDir>
6565
<libffiIncludeDir>$(libffiOutDir)include</libffiIncludeDir>
66-
<opensslDir>$(ExternalsDir)openssl-1.1.1n\</opensslDir>
67-
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1n\$(ArchName)\</opensslOutDir>
66+
<opensslDir>$(ExternalsDir)openssl-1.1.1q\</opensslDir>
67+
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1q\$(ArchName)\</opensslOutDir>
6868
<opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
6969
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
7070
<zlibDir>$(ExternalsDir)\zlib-1.2.12\</zlibDir>

‎PCbuild/readme.txt‎

Lines changed: 1 addition & 1 deletion
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.1k of the OpenSSL secure sockets
170+
Python wrapper for version 1.1.1q 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‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
]
4848

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

5454
LIBRESSL_OLD_VERSIONS = [

0 commit comments

Comments
 (0)