From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 14 Apr 2018 00:52:02 +0000 (-0700)
Subject: bpo-33184: Update Windows installer to OpenSSL 1.1.0h (GH-6463)
X-Git-Tag: v3.7.0b4~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df958ff28af9c5c4563fd1b050f04f0e9745ab80;p=thirdparty%2FPython%2Fcpython.git

bpo-33184: Update Windows installer to OpenSSL 1.1.0h (GH-6463)

(cherry picked from commit b1dc07509f78b354e83f5f4a902f1ff80c7bb05d)

Co-authored-by: Steve Dower <steve.dower@microsoft.com>
---

diff --git a/Misc/NEWS.d/next/Windows/2018-04-13-11-28-55.bpo-33184.7YhqQE.rst b/Misc/NEWS.d/next/Windows/2018-04-13-11-28-55.bpo-33184.7YhqQE.rst
new file mode 100644
index 000000000000..ca47a9811088
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2018-04-13-11-28-55.bpo-33184.7YhqQE.rst
@@ -0,0 +1 @@
+Update Windows installer to use OpenSSL 1.1.0h.
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 6d3075171889..f4bde044cfd3 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -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.0f
+if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-1.1.0h
 set libraries=%libraries%                                       sqlite-3.21.0.0
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.8.0
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.8.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.0f
+if NOT "%IncludeSSL%"=="false"     set binaries=%binaries% openssl-bin-1.1.0h
 if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.8.0
 if NOT "%IncludeSSLSrc%"=="false"  set binaries=%binaries% nasm-2.11.06
 
diff --git a/PCbuild/python.props b/PCbuild/python.props
index f9433133a87b..f7adaf47db66 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -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.0f\</opensslDir>
-    <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.0f\$(ArchName)\</opensslOutDir>
+    <opensslDir>$(ExternalsDir)openssl-1.1.0h\</opensslDir>
+    <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.0h\$(ArchName)\</opensslOutDir>
     <opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>
     <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
     <zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir>
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index d28435b4c4d7..1f2fb929efd9 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.0.2k of the OpenSSL secure sockets
+    Python wrapper for version 1.1.0h of the OpenSSL secure sockets
     library, which is downloaded from our binaries repository at
     https://github.com/python/cpython-bin-deps.