bpo-35401: Updates Windows build to OpenSSL 1.0.2q (GH-11089)

diff --git a/Misc/NEWS.d/next/Windows/2018-12-10-15-01-13.bpo-35401.9L1onG.rst b/Misc/NEWS.d/next/Windows/2018-12-10-15-01-13.bpo-35401.9L1onG.rst
new file mode 100644 (file)
index 0000000..a804473
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2018-12-10-15-01-13.bpo-35401.9L1onG.rst
@@ -0,0 +1 @@
+Updates Windows build to OpenSSL 1.0.2q

diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index aff44786b706f434b65ec8b97642579dfb6a0402..016ecdd752b1b308c4514ce1d41d8f38c8c455f1 100644 (file)
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -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.2p
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2q
 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

diff --git a/PCbuild/libeay.vcxproj b/PCbuild/libeay.vcxproj
index 9662cd4b71509aa59a76aab3867ac0ccabb50d02..31591bc13508aabefe61ef3dcf595870a4812d62 100644 (file)
--- a/PCbuild/libeay.vcxproj
+++ b/PCbuild/libeay.vcxproj
@@ -533,6 +533,7 @@
     <!--
     <ClCompile Include="$(opensslDir)crypto\fips_ers.c" />
     -->
+    <ClCompile Include="$(opensslDir)crypto\getenv.c" />
     <ClCompile Include="$(opensslDir)crypto\hmac\hm_ameth.c" />
     <ClCompile Include="$(opensslDir)crypto\hmac\hm_pmeth.c" />
     <ClCompile Include="$(opensslDir)crypto\hmac\hmac.c" />
@@ -725,9 +726,7 @@
     <ClCompile Include="$(opensslDir)crypto\ui\ui_lib.c" />
     <ClCompile Include="$(opensslDir)crypto\ui\ui_openssl.c" />
     <ClCompile Include="$(opensslDir)crypto\ui\ui_util.c" />
-    <!--
     <ClCompile Include="$(opensslDir)crypto\uid.c" />
-    -->
     <ClCompile Include="$(opensslDir)crypto\whrlpool\wp_dgst.c" />
     <ClCompile Include="$(opensslDir)crypto\x509\by_dir.c" />
     <ClCompile Include="$(opensslDir)crypto\x509\by_file.c" />

diff --git a/PCbuild/python.props b/PCbuild/python.props
index b29669b732b14740d8c1960e6770a96634e2620d..3022ca50c247a2366ee5fb3c8599c7a740f222f0 100644 (file)
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -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.2p\</opensslDir>
+    <opensslDir>$(ExternalsDir)openssl-1.0.2q\</opensslDir>
     <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
     <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
     <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>