bpo-29572: Update Windows build to OpenSSL 1.0.2k (GH-444) · python/cpython@f9a6516 (original) (raw)

6 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -112,6 +112,8 @@ Documentation
112 112 Build
113 113 -----
114 114
115 +- bpo-29572: Update Windows build and OS X installers to use OpenSSL 1.0.2k.
116 +
115 117 - Issue #28768: Fix implicit declaration of function _setmode. Patch by
116 118 Masayuki Yamamoto
117 119
Original file line number Diff line number Diff line change
@@ -82,7 +82,7 @@
82 82 />
83 83 <UserMacro
84 84 Name="opensslDir"
85 - Value="$(externalsDir)\openssl-1.0.2j"
85 + Value="$(externalsDir)\openssl-1.0.2k"
86 86 />
87 87 <UserMacro
88 88 Name="tcltkDir"
Original file line number Diff line number Diff line change
@@ -132,7 +132,7 @@ _ssl
132 132
133 133 Get the source code through
134 134
135 - svn export http://svn.python.org/projects/external/openssl-1.0.2j
135 + svn export http://svn.python.org/projects/external/openssl-1.0.2k
136 136
137 137 ** NOTE: if you use the PCbuild\get_externals.bat approach for
138 138 obtaining external sources then you don't need to manually get the source
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@ set libraries=
58 58 set libraries=%libraries% bzip2-1.0.6
59 59 if NOT "%IncludeBsddb%"=="false" set libraries=%libraries% db-4.7.25.0
60 60 if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06
61 -if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2j
61 +if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2k
62 62 set libraries=%libraries% sqlite-3.8.11.0
63 63 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.15.0
64 64 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.15.0
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@
35 35 <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir>
36 36 <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
37 37 <bsddbDir>$(ExternalsDir)db-4.7.25.0</bsddbDir>
38 - <opensslDir>$(ExternalsDir)openssl-1.0.2j\</opensslDir>
38 + <opensslDir>$(ExternalsDir)openssl-1.0.2k\</opensslDir>
39 39 <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
40 40 <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
41 41 <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
Original file line number Diff line number Diff line change
@@ -183,7 +183,7 @@ _bz2
183 183 Homepage:
184 184 http://www.bzip.org/
185 185 _ssl
186 - Python wrapper for version 1.0.2j of the OpenSSL secure sockets
186 + Python wrapper for version 1.0.2k of the OpenSSL secure sockets
187 187 library, which is built by ssl.vcxproj
188 188 Homepage:
189 189 http://www.openssl.org/