8000 bpo-40164: Update Windows OpenSSL to 1.1.1g (GH-20834) · python/cpython@617af99 · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit 617af99

Browse files
zoobasrinivasreddy
zooba
and
srinivasreddy
authored
bpo-40164: Update Windows OpenSSL to 1.1.1g (GH-20834)
Co-authored-by: Srinivas Reddy Thatiparthy (శ్రీనివాస్ రెడ్డి తాటిపర్తి) <thatiparthysreenivas@gmail.com>
1 parent 0abb70e commit 617af99

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
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.1f
64+
openssl_version: 1.1.1g
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.1f
121+
openssl_version: 1.1.1g
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.1f
64+
openssl_version: 1.1.1g
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.1f
121+
openssl_version: 1.1.1g
122122

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

‎Misc/NEWS.d/next/Windows/2020-06-12-13-13-44.bpo-40164.SPrSn5.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Updates Windows OpenSSL to 1.1.1g

‎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.6
52-
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1f
52+
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1g
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.1f
75+
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1g
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.6\</bz2Dir>
5151
<lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
52-
<opensslDir>$(ExternalsDir)openssl-1.1.1f\</opensslDir>
53-
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1f\$(ArchName)\</opensslOutDir>
52+
<opensslDir>$(ExternalsDir)openssl-1.1.1g\</opensslDir>
53+
<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1g\$(ArchName)\</opensslOutDir>
5454
<opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
5555
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
5656
<zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir>

0 commit comments

Comments
 (0)
0