diff options
author | Zachary Ware <zachary.ware@gmail.com> | 2016-06-15 22:13:28 (GMT) |
---|---|---|
committer | Zachary Ware <zachary.ware@gmail.com> | 2016-06-15 22:13:28 (GMT) |
commit | 42d4b9c22c0ccd54e93dcc491b51d47ac0dea932 (patch) | |
tree | 011b2fc10fb660c59c82eb519a0e57c3eb8024de /PCbuild | |
parent | f7c562439b4aca9bd58689a32e035b9199818d0d (diff) | |
download | cpython-42d4b9c22c0ccd54e93dcc491b51d47ac0dea932.zip cpython-42d4b9c22c0ccd54e93dcc491b51d47ac0dea932.tar.gz cpython-42d4b9c22c0ccd54e93dcc491b51d47ac0dea932.tar.bz2 |
Issue #26930: Update Windows build to OpenSSL 1.0.2h
Diffstat (limited to 'PCbuild')
-rw-r--r-- | PCbuild/get_externals.bat | 2 | ||||
-rw-r--r-- | PCbuild/python.props | 2 | ||||
-rw-r--r-- | PCbuild/readme.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 63ba282..9b2a084 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -54,7 +54,7 @@ echo.Fetching external libraries... set libraries=
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% openssl-1.0.2g
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2h
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% tk-8.6.4.2
diff --git a/PCbuild/python.props b/PCbuild/python.props index 07acfab..843771d 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -41,7 +41,7 @@ <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> <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 Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir> <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index e68cc5c..d45eb27 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -169,7 +169,7 @@ _lzma Homepage:
http://tukaani.org/xz/
_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
Homepage:
http://www.openssl.org/
|