mirror of https://github.com/python/cpython
Upgrade OpenSSL to 1.0.1c
This commit is contained in:
parent
dcd1c0c627
commit
e01eb4cc80
|
@ -135,6 +135,8 @@ Tools/Demos
|
|||
Build
|
||||
-----
|
||||
|
||||
- Upgrade Windows library versions: bzip 1.0.6, OpenSSL 1.0.1c.
|
||||
|
||||
- Issue #14693: Under non-Windows platforms, hashlib's fallback modules are
|
||||
always compiled, even if OpenSSL is present at build time.
|
||||
|
||||
|
|
|
@ -153,9 +153,9 @@ _ssl
|
|||
|
||||
Unpack into the "dist" directory, retaining the folder name from
|
||||
the archive - for example, the latest stable OpenSSL will install as
|
||||
dist/openssl-1.0.0j
|
||||
dist/openssl-1.0.1c
|
||||
|
||||
You need to use version 1.0.0j of OpenSSL.
|
||||
You need to use version 1.0.1c of OpenSSL.
|
||||
|
||||
You can install the NASM assembler from
|
||||
http://www.nasm.us/
|
||||
|
|
|
@ -58,7 +58,7 @@
|
|||
/>
|
||||
<UserMacro
|
||||
Name="opensslDir"
|
||||
Value="$(externalsDir)\openssl-1.0.0j"
|
||||
Value="$(externalsDir)\openssl-1.0.1c"
|
||||
/>
|
||||
<UserMacro
|
||||
Name="tcltkDir"
|
||||
|
|
|
@ -62,7 +62,7 @@
|
|||
/>
|
||||
<UserMacro
|
||||
Name="opensslDir"
|
||||
Value="$(externalsDir)\openssl-1.0.0j"
|
||||
Value="$(externalsDir)\openssl-1.0.1c"
|
||||
/>
|
||||
<UserMacro
|
||||
Name="tcltkDir"
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<sqlite3Dir>$(externalsDir)\sqlite-3.7.12</sqlite3Dir>
|
||||
<bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
|
||||
<lzmaDir>$(externalsDir)\xz-5.0.3</lzmaDir>
|
||||
<opensslDir>$(externalsDir)\openssl-1.0.0j</opensslDir>
|
||||
<opensslDir>$(externalsDir)\openssl-1.0.1c</opensslDir>
|
||||
<tcltkDir>$(externalsDir)\tcltk</tcltkDir>
|
||||
<tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
|
||||
<tcltkLib>$(tcltkDir)\lib\tcl85.lib;$(tcltkDir)\lib\tk85.lib</tcltkLib>
|
||||
|
|
|
@ -148,7 +148,7 @@ _ssl
|
|||
|
||||
Get the source code through
|
||||
|
||||
svn export http://svn.python.org/projects/external/openssl-1.0.0j
|
||||
svn export http://svn.python.org/projects/external/openssl-1.0.1c
|
||||
|
||||
** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for
|
||||
obtaining external sources then you don't need to manually get the source
|
||||
|
|
|
@ -14,7 +14,7 @@ cd ..
|
|||
@rem if exist tk8.4.16 rd /s/q tk8.4.16
|
||||
@rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1
|
||||
@rem if exist db-4.4.20 rd /s/q db-4.4.20
|
||||
@rem if exist openssl-1.0.0j rd /s/q openssl-1.0.0j
|
||||
@rem if exist openssl-1.0.1c rd /s/q openssl-1.0.1c
|
||||
@rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12
|
||||
|
||||
@rem bzip
|
||||
|
@ -24,7 +24,10 @@ if not exist bzip2-1.0.6 (
|
|||
)
|
||||
|
||||
@rem OpenSSL
|
||||
if not exist openssl-1.0.0j svn export http://svn.python.org/projects/external/openssl-1.0.0j
|
||||
if not exist openssl-1.0.0c (
|
||||
rd /s/q openssl-1.0.0j
|
||||
svn export http://svn.python.org/projects/external/openssl-1.0.0c
|
||||
)
|
||||
|
||||
@rem tcl/tk
|
||||
if not exist tcl-8.5.11.0 (
|
||||
|
|
Loading…
Reference in New Issue