bpo-34631: Updated OpenSSL to 1.0.2s in Windows installer (GH-14161)

diff --git a/Misc/NEWS.d/next/Security/2019-06-17-08-43-19.bpo-34631.pJ8CGR.rst b/Misc/NEWS.d/next/Security/2019-06-17-08-43-19.bpo-34631.pJ8CGR.rst
new file mode 100644 (file)
index 0000000..41a972e
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2019-06-17-08-43-19.bpo-34631.pJ8CGR.rst
@@ -0,0 +1 @@
+Updated OpenSSL to 1.0.2s in Windows installer

diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index ed6a79f11db67f9d84d353491738ae0d0d8c583d..f0a4b9946d86c7c18998a357c0e92ed642c6ac59 100644 (file)
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -47,7 +47,7 @@ rem files in both this dir and PC\VS9.0
 set libraries=
 set libraries=%libraries%                                    bzip2-1.0.6
 if NOT "%IncludeBsddb%"=="false" set libraries=%libraries%   bsddb-4.7.25.0
-if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2q
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2s
 set libraries=%libraries%                                    sqlite-3.14.2.0
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.19.0
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.19.0

diff --git a/PCbuild/python.props b/PCbuild/python.props
index 6673ff31368e49cefb1ee2c99e223c01b78de6ba..b3dc1da3dffd5f0a892295a79478438e64f7a25f 100644 (file)
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -35,7 +35,7 @@
     <sqlite3Dir>$(ExternalsDir)sqlite-3.14.2.0\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
     <bsddbDir>$(ExternalsDir)bsddb-4.7.25.0</bsddbDir>
-    <opensslDir>$(ExternalsDir)openssl-1.0.2q\</opensslDir>
+    <opensslDir>$(ExternalsDir)openssl-1.0.2s\</opensslDir>
     <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
     <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
     <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 556a8f25ca983d38b21064b67795e1cfae1de930..ab4b6d0760a770a68dd1e37bfb8e820242ef5284 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -192,7 +192,7 @@ _bz2
     Homepage:
         http://www.bzip.org/
 _ssl
-    Python wrapper for version 1.0.2o of the OpenSSL secure sockets
+    Python wrapper for version 1.0.2s of the OpenSSL secure sockets
     library, which is built by ssl.vcxproj
     Homepage:
         http://www.openssl.org/