bpo-29572: Update Windows build to OpenSSL 1.0.2k (GH-443) · python/cpython@dd2000c (original) (raw)
4 files changed
lines changed
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -127,6 +127,11 @@ Tests | ||
127 | 127 | determine the candidate encoding for the test regex (allowing it to correctly |
128 | 128 | skip the test when the default locale encoding is a multi-byte encoding) |
129 | 129 | |
130 | +Build | |
131 | +----- | |
132 | + | |
133 | +- bpo-29572: Update Windows build and OS X installers to use OpenSSL 1.0.2k. | |
134 | + | |
130 | 135 | |
131 | 136 | What's New in Python 3.5.3? |
132 | 137 | =========================== |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -54,7 +54,7 @@ echo.Fetching external libraries... | ||
54 | 54 | set libraries= |
55 | 55 | set libraries=%libraries% bzip2-1.0.6 |
56 | 56 | if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06 |
57 | -if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2j | |
57 | +if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2k | |
58 | 58 | set libraries=%libraries% sqlite-3.8.11.0 |
59 | 59 | if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.4.2 |
60 | 60 | if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -46,7 +46,7 @@ | ||
46 | 46 | <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir> |
47 | 47 | <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> |
48 | 48 | <lzmaDir>$(ExternalsDir)xz-5.0.5\</lzmaDir> |
49 | - <opensslDir>$(ExternalsDir)openssl-1.0.2j\</opensslDir> | |
49 | + <opensslDir>$(ExternalsDir)openssl-1.0.2k\</opensslDir> | |
50 | 50 | <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir> |
51 | 51 | <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir> |
52 | 52 | <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -169,7 +169,7 @@ _lzma | ||
169 | 169 | Homepage: |
170 | 170 | http://tukaani.org/xz/ |
171 | 171 | _ssl |
172 | - Python wrapper for version 1.0.2j of the OpenSSL secure sockets | |
172 | + Python wrapper for version 1.0.2k of the OpenSSL secure sockets | |
173 | 173 | library, which is built by ssl.vcxproj |
174 | 174 | Homepage: |
175 | 175 | http://www.openssl.org/ |