Commit 3c8bd22b authored by Steve Dower's avatar Steve Dower Committed by GitHub

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

parent 2632df4c
......@@ -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.2p
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2q
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
......
......@@ -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" />
......
......@@ -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.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>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment