Commit 28ac4536 authored by Zachary Ware's avatar Zachary Ware

Issue #26930: Update Windows build to OpenSSL 1.0.2h

parent 1a13057b
...@@ -10,8 +10,17 @@ Release date: 2016-06-26 ...@@ -10,8 +10,17 @@ Release date: 2016-06-26
Core and Builtins Core and Builtins
----------------- -----------------
Library - Issue #26930: Update Windows builds to use OpenSSL 1.0.2h.
-------
Tests
-----
- Issue #26867: Ubuntu's openssl OP_NO_SSLv3 is forced on by default; fix test.
IDLE
----
- Issue #27365: Allow non-ascii in idlelib/NEWS.txt - minimal part for 3.5.2.
What's New in Python 3.5.2 release candidate 1? What's New in Python 3.5.2 release candidate 1?
......
...@@ -54,7 +54,7 @@ echo.Fetching external libraries... ...@@ -54,7 +54,7 @@ echo.Fetching external libraries...
set libraries= set libraries=
set libraries=%libraries% bzip2-1.0.6 set libraries=%libraries% bzip2-1.0.6
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.2g if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2h
set libraries=%libraries% sqlite-3.8.11.0 set libraries=%libraries% sqlite-3.8.11.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.4.2 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.4.2
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,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>
<lzmaDir>$(ExternalsDir)xz-5.0.5\</lzmaDir> <lzmaDir>$(ExternalsDir)xz-5.0.5\</lzmaDir>
<opensslDir>$(ExternalsDir)openssl-1.0.2g\</opensslDir> <opensslDir>$(ExternalsDir)openssl-1.0.2h\</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>
......
...@@ -169,7 +169,7 @@ _lzma ...@@ -169,7 +169,7 @@ _lzma
Homepage: Homepage:
http://tukaani.org/xz/ http://tukaani.org/xz/
_ssl _ssl
Python wrapper for version 1.0.2g of the OpenSSL secure sockets Python wrapper for version 1.0.2h 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