]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-34631: Updated OpenSSL to 1.1.1c in Windows installer (GH-14163)
authorSteve Dower <steve.dower@python.org>
Mon, 17 Jun 2019 22:26:43 +0000 (15:26 -0700)
committerGitHub <noreply@github.com>
Mon, 17 Jun 2019 22:26:43 +0000 (15:26 -0700)
Misc/NEWS.d/next/Security/2019-06-17-09-34-25.bpo-34631.DBfM4j.rst [new file with mode: 0644]
PCbuild/get_externals.bat
PCbuild/python.props
PCbuild/readme.txt

diff --git a/Misc/NEWS.d/next/Security/2019-06-17-09-34-25.bpo-34631.DBfM4j.rst b/Misc/NEWS.d/next/Security/2019-06-17-09-34-25.bpo-34631.DBfM4j.rst
new file mode 100644 (file)
index 0000000..90aa301
--- /dev/null
@@ -0,0 +1 @@
+Updated OpenSSL to 1.1.1c in Windows installer
index 27722bb9c4d69fcadcd4f0c38710804aeed9fe9d..3f70653b2ec45aa2f9ee4ed3ff6a74c1e0253f93 100644 (file)
@@ -49,7 +49,7 @@ echo.Fetching external libraries...
 
 set libraries=
 set libraries=%libraries%                                       bzip2-1.0.6
-if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-1.1.1b
+if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-1.1.1c
 set libraries=%libraries%                                       sqlite-3.21.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
@@ -72,7 +72,7 @@ for %%e in (%libraries%) do (
 echo.Fetching external binaries...
 
 set binaries=
-if NOT "%IncludeSSL%"=="false"     set binaries=%binaries% openssl-bin-1.1.1b
+if NOT "%IncludeSSL%"=="false"     set binaries=%binaries% openssl-bin-1.1.1c
 if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.9.0
 if NOT "%IncludeSSLSrc%"=="false"  set binaries=%binaries% nasm-2.11.06
 
index 58877ee0669813da0969eb3182de51f07d0298b1..2dd01fda8fd55b2a9222732b7119055ddb830f58 100644 (file)
@@ -49,8 +49,8 @@
     <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.1.1b\</opensslDir>
-    <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1b\$(ArchName)\</opensslOutDir>
+    <opensslDir>$(ExternalsDir)openssl-1.1.1c\</opensslDir>
+    <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1c\$(ArchName)\</opensslOutDir>
     <opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
     <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
     <zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir>
index c44722b98887a835066cea155048c536b2ad0dfc..8f759361fd7ad7f0ab8d2a25c1d28b18eb4b802a 100644 (file)
@@ -165,7 +165,7 @@ _lzma
     Homepage:
         http://tukaani.org/xz/
 _ssl
-    Python wrapper for version 1.1.1b of the OpenSSL secure sockets
+    Python wrapper for version 1.1.1c of the OpenSSL secure sockets
     library, which is downloaded from our binaries repository at
     https://github.com/python/cpython-bin-deps.