Commit d8e3a8af authored by Steve Dower's avatar Steve Dower Committed by GitHub

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

parent 722733e9
Updated OpenSSL to 1.0.2s in Windows installer
......@@ -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
......
......@@ -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>
......
......@@ -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/
......
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