Commit 8fb09ada authored by Zachary Ware's avatar Zachary Ware

Issue #28248: Update Windows build to use OpenSSL 1.0.2j

parent 829d4fbb
...@@ -230,6 +230,8 @@ Tests ...@@ -230,6 +230,8 @@ Tests
Build Build
----- -----
- Issue #28248: Update Windows build to use OpenSSL 1.0.2j.
- Issue #28258: Fixed build with Estonian locale (distclean target in - Issue #28258: Fixed build with Estonian locale (distclean target in
Makefile). Patch by Arfrever Frehtes Taifersar Arahesis. Makefile). Patch by Arfrever Frehtes Taifersar Arahesis.
......
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
/> />
<UserMacro <UserMacro
Name="opensslDir" Name="opensslDir"
Value="$(externalsDir)\openssl-1.0.2h" Value="$(externalsDir)\openssl-1.0.2j"
/> />
<UserMacro <UserMacro
Name="tcltkDir" Name="tcltkDir"
......
...@@ -132,7 +132,7 @@ _ssl ...@@ -132,7 +132,7 @@ _ssl
Get the source code through Get the source code through
svn export http://svn.python.org/projects/external/openssl-1.0.2h svn export http://svn.python.org/projects/external/openssl-1.0.2j
** NOTE: if you use the PCbuild\get_externals.bat approach for ** NOTE: if you use the PCbuild\get_externals.bat approach for
obtaining external sources then you don't need to manually get the source obtaining external sources then you don't need to manually get the source
......
...@@ -58,7 +58,7 @@ set libraries= ...@@ -58,7 +58,7 @@ set libraries=
set libraries=%libraries% bzip2-1.0.6 set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeBsddb%"=="false" set libraries=%libraries% db-4.7.25.0 if NOT "%IncludeBsddb%"=="false" set libraries=%libraries% db-4.7.25.0
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06 if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2h if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2j
set libraries=%libraries% sqlite-3.8.11.0 set libraries=%libraries% sqlite-3.8.11.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.15.0 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.15.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.15.0 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.15.0
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir> <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
<bsddbDir>$(ExternalsDir)db-4.7.25.0</bsddbDir> <bsddbDir>$(ExternalsDir)db-4.7.25.0</bsddbDir>
<opensslDir>$(ExternalsDir)openssl-1.0.2h\</opensslDir> <opensslDir>$(ExternalsDir)openssl-1.0.2j\</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>
......
...@@ -183,7 +183,7 @@ _bz2 ...@@ -183,7 +183,7 @@ _bz2
Homepage: Homepage:
http://www.bzip.org/ http://www.bzip.org/
_ssl _ssl
Python wrapper for version 1.0.2h of the OpenSSL secure sockets Python wrapper for version 1.0.2j 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