diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml
index 3feb85ae6561de8..0fe754bb071ea3d 100644
--- a/.azure-pipelines/ci.yml
+++ b/.azure-pipelines/ci.yml
@@ -57,7 +57,7 @@ jobs:
variables:
testRunTitle: '$(build.sourceBranchName)-linux'
testRunPlatform: linux
- openssl_version: 1.1.1g
+ openssl_version: 1.1.1k
steps:
- template: ./posix-steps.yml
@@ -83,7 +83,7 @@ jobs:
variables:
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
testRunPlatform: linux-coverage
- openssl_version: 1.1.1g
+ openssl_version: 1.1.1k
steps:
- template: ./posix-steps.yml
diff --git a/.azure-pipelines/pr.yml b/.azure-pipelines/pr.yml
index 2e94af35600cfc4..2d32e6d49bcc0e6 100644
--- a/.azure-pipelines/pr.yml
+++ b/.azure-pipelines/pr.yml
@@ -57,7 +57,7 @@ jobs:
variables:
testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
testRunPlatform: linux
- openssl_version: 1.1.1g
+ openssl_version: 1.1.1k
steps:
- template: ./posix-steps.yml
@@ -83,7 +83,7 @@ jobs:
variables:
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
testRunPlatform: linux-coverage
- openssl_version: 1.1.1g
+ openssl_version: 1.1.1k
steps:
- template: ./posix-steps.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 20d3040770f6d4e..cafe3d18bc3e74b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -118,7 +118,7 @@ jobs:
needs: check_source
if: needs.check_source.outputs.run_tests == 'true'
env:
- OPENSSL_VER: 1.1.1f
+ OPENSSL_VER: 1.1.1k
steps:
- uses: actions/checkout@v2
- name: Install Dependencies
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index bfb077b299474d9..5ec2e526ab84094 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -23,7 +23,7 @@ jobs:
name: 'Ubuntu (Coverage)'
runs-on: ubuntu-latest
env:
- OPENSSL_VER: 1.1.1f
+ OPENSSL_VER: 1.1.1k
steps:
- uses: actions/checkout@v2
- name: Install Dependencies
diff --git a/.travis.yml b/.travis.yml
index 39a3cf7e9296406..f347b258d50889b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ cache:
env:
global:
- - OPENSSL=1.1.1f
+ - OPENSSL=1.1.1k
- OPENSSL_DIR="$HOME/multissl/openssl/${OPENSSL}"
- PATH="${OPENSSL_DIR}/bin:$PATH"
- CFLAGS="-I${OPENSSL_DIR}/include"
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index f2717b614a74abf..a2d9a5e7454d500 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -209,9 +209,9 @@ def library_recipes():
result.extend([
dict(
- name="OpenSSL 1.1.1j",
- url="https://www.openssl.org/source/openssl-1.1.1j.tar.gz",
- checksum='cccaa064ed860a2b4d1303811bf5c682',
+ name="OpenSSL 1.1.1k",
+ url="https://www.openssl.org/source/openssl-1.1.1k.tar.gz",
+ checksum='c4e7d95f782b08116afa27b30393dd27',
buildrecipe=build_universal_openssl,
configure=None,
install=None,
diff --git a/Misc/NEWS.d/next/Build/2021-03-26-09-16-34.bpo-43631.msJyPi.rst b/Misc/NEWS.d/next/Build/2021-03-26-09-16-34.bpo-43631.msJyPi.rst
new file mode 100644
index 000000000000000..4de4905a6bb0824
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2021-03-26-09-16-34.bpo-43631.msJyPi.rst
@@ -0,0 +1 @@
+Update macOS, Windows, and CI to OpenSSL 1.1.1k.
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index a1d9a12a362e122..9f2731991855959 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -53,7 +53,7 @@ echo.Fetching external libraries...
set libraries=
set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.3.0-rc0-r1
-if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1i
+if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1k
set libraries=%libraries% sqlite-3.34.0.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.9.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.9.0
@@ -77,7 +77,7 @@ echo.Fetching external binaries...
set binaries=
if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi
-if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1i
+if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1k
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.9.0
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
diff --git a/PCbuild/python.props b/PCbuild/python.props
index 3fa774816a75304..5822ba13950f441 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -62,8 +62,8 @@
$(ExternalsDir)libffi\
$(ExternalsDir)libffi\$(ArchName)\
$(libffiOutDir)include
- $(ExternalsDir)openssl-1.1.1i\
- $(ExternalsDir)openssl-bin-1.1.1i\$(ArchName)\
+ $(ExternalsDir)openssl-1.1.1k\
+ $(ExternalsDir)openssl-bin-1.1.1k\$(ArchName)\
$(opensslOutDir)include
$(ExternalsDir)\nasm-2.11.06\
$(ExternalsDir)\zlib-1.2.11\
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 0b2aa59ecefabfa..d2dbc50690db797 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -165,7 +165,7 @@ _lzma
Homepage:
http://tukaani.org/xz/
_ssl
- Python wrapper for version 1.1.1i of the OpenSSL secure sockets
+ Python wrapper for version 1.1.1k of the OpenSSL secure sockets
library, which is downloaded from our binaries repository at
https://github.com/python/cpython-bin-deps.
diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
index 3818165a836fb1f..0db1b35804d412e 100755
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -48,8 +48,8 @@
]
OPENSSL_RECENT_VERSIONS = [
- "1.1.1g",
- # "3.0.0-alpha2"
+ "1.1.1k",
+ # "3.0.0-alpha12"
]
LIBRESSL_OLD_VERSIONS = [