Commit bba2ba18 authored by Steve Dower's avatar Steve Dower Committed by Benjamin Peterson

bpo-33148: Update Windows build to use OpenSSL 1.0.2o

closes https://github.com/python/cpython/pull/6474
parent 01a0fd4a
...@@ -47,7 +47,7 @@ rem files in both this dir and PC\VS9.0 ...@@ -47,7 +47,7 @@ rem files in both this dir and PC\VS9.0
set libraries= set libraries=
set libraries=%libraries% bzip2-1.0.6 set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeBsddb%"=="false" set libraries=%libraries% bsddb-4.7.25.0 if NOT "%IncludeBsddb%"=="false" set libraries=%libraries% bsddb-4.7.25.0
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2k if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2o
set libraries=%libraries% sqlite-3.14.2.0 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% tcl-8.5.19.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.19.0 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.19.0
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<sqlite3Dir>$(ExternalsDir)sqlite-3.14.2.0\</sqlite3Dir> <sqlite3Dir>$(ExternalsDir)sqlite-3.14.2.0\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
<bsddbDir>$(ExternalsDir)bsddb-4.7.25.0</bsddbDir> <bsddbDir>$(ExternalsDir)bsddb-4.7.25.0</bsddbDir>
<opensslDir>$(ExternalsDir)openssl-1.0.2k\</opensslDir> <opensslDir>$(ExternalsDir)openssl-1.0.2o\</opensslDir>
<opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir> <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
<opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir> <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
......
...@@ -192,7 +192,7 @@ _bz2 ...@@ -192,7 +192,7 @@ _bz2
Homepage: Homepage:
http://www.bzip.org/ http://www.bzip.org/
_ssl _ssl
Python wrapper for version 1.0.2k of the OpenSSL secure sockets Python wrapper for version 1.0.2o of the OpenSSL secure sockets
library, which is built by ssl.vcxproj library, which is built by ssl.vcxproj
Homepage: Homepage:
http://www.openssl.org/ http://www.openssl.org/
......
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