]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-34405: Updated to OpenSSL 1.0.2p for Windows builds. (GH-8776)
authorSteve Dower <steve.dower@microsoft.com>
Wed, 15 Aug 2018 20:29:39 +0000 (13:29 -0700)
committerGitHub <noreply@github.com>
Wed, 15 Aug 2018 20:29:39 +0000 (13:29 -0700)
Misc/NEWS.d/next/Security/2018-08-15-12-14-03.bpo-34405.R4IZGw.rst [new file with mode: 0644]
PCbuild/get_externals.bat
PCbuild/python.props

diff --git a/Misc/NEWS.d/next/Security/2018-08-15-12-14-03.bpo-34405.R4IZGw.rst b/Misc/NEWS.d/next/Security/2018-08-15-12-14-03.bpo-34405.R4IZGw.rst
new file mode 100644 (file)
index 0000000..13aad63
--- /dev/null
@@ -0,0 +1 @@
+Updated to OpenSSL 1.0.2p for Windows builds.
index cea2068d37b68da442e08fd8bee4c41fb7d61e62..aff44786b706f434b65ec8b97642579dfb6a0402 100644 (file)
@@ -41,7 +41,7 @@ echo.Fetching external libraries...
 
 set libraries=
 set libraries=%libraries%                                    bzip2-1.0.6
-if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2o
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2p
 set libraries=%libraries%                                    sqlite-3.21.0.0
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0
index 8c398a1f5018c3e31ffb275b47ac9462f0cb350e..570f7fa883458a5417819878293ec9c793fa3e29 100644 (file)
@@ -49,7 +49,7 @@
     <sqlite3Dir>$(ExternalsDir)sqlite-3.21.0.0\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
     <lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
-    <opensslDir>$(ExternalsDir)openssl-1.0.2o\</opensslDir>
+    <opensslDir>$(ExternalsDir)openssl-1.0.2p\</opensslDir>
     <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
     <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
     <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>