bpo-29572: Update Windows build to OpenSSL 1.0.2k (GH-442) · python/cpython@03f7cb0 (original) (raw)
4 files changed
lines changed
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -276,6 +276,8 @@ Tests | ||
| 276 | 276 | Build |
| 277 | 277 | ----- |
| 278 | 278 | |
| 279 | +- bpo-29572: Update Windows build and OS X installers to use OpenSSL 1.0.2k. | |
| 280 | + | |
| 279 | 281 | - Issue #26851: Set Android compilation and link flags. |
| 280 | 282 | |
| 281 | 283 | - Issue #28768: Fix implicit declaration of function _setmode. Patch by |
| 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.14.2.0 |
| 59 | 59 | if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0 |
| 60 | 60 | if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -45,7 +45,7 @@ | ||
| 45 | 45 | <sqlite3Dir>$(ExternalsDir)sqlite-3.14.2.0\</sqlite3Dir> |
| 46 | 46 | <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> |
| 47 | 47 | <lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir> |
| 48 | - <opensslDir>$(ExternalsDir)openssl-1.0.2j\</opensslDir> | |
| 48 | + <opensslDir>$(ExternalsDir)openssl-1.0.2k\</opensslDir> | |
| 49 | 49 | <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir> |
| 50 | 50 | <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir> |
| 51 | 51 | <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/ |