Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
22f2d2ef
Commit
22f2d2ef
authored
Aug 06, 2014
by
Zachary Ware
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #22160: Update OpenSSL to 1.0.1i for the Windows build.
parent
1241c47a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
Misc/NEWS
Misc/NEWS
+2
-2
PCbuild/pyproject.props
PCbuild/pyproject.props
+1
-1
Tools/buildbot/external-common.bat
Tools/buildbot/external-common.bat
+4
-4
No files found.
Misc/NEWS
View file @
22f2d2ef
...
...
@@ -283,8 +283,8 @@ Tests
Windows
-------
- Issue #21671, CVE-2014-0224: The bundled version of OpenSSL has been
updated to 1.0.1
h
.
- Issue #21671,
#22160,
CVE-2014-0224: The bundled version of OpenSSL has been
updated to 1.0.1
i
.
- Issue #10747: Use versioned labels in the Windows start menu.
Patch by Olive Kilburn.
...
...
PCbuild/pyproject.props
View file @
22f2d2ef
...
...
@@ -20,7 +20,7 @@
<sqlite3Dir>
$(externalsDir)\sqlite-3.8.3.1
</sqlite3Dir>
<bz2Dir>
$(externalsDir)\bzip2-1.0.6
</bz2Dir>
<lzmaDir>
$(externalsDir)\xz-5.0.5
</lzmaDir>
<opensslDir>
$(externalsDir)\openssl-1.0.1
h
</opensslDir>
<opensslDir>
$(externalsDir)\openssl-1.0.1
i
</opensslDir>
<tcltkDir>
$(externalsDir)\tcltk
</tcltkDir>
<tcltk64Dir>
$(externalsDir)\tcltk64
</tcltk64Dir>
<tcltkLib>
$(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib
</tcltkLib>
...
...
Tools/buildbot/external-common.bat
View file @
22f2d2ef
...
...
@@ -11,7 +11,7 @@ cd ..
@rem
if
exist
tk
-
8
.6.1.0
rd
/s/q
tk
-
8
.6.1.0
@rem
if
exist
tix
-
8
.4.3.4
rd
/s/q
tix
-
8
.4.3.4
@rem
if
exist
db
-
4
.4.20
rd
/s/q
db
-
4
.4.20
@rem
if
exist
openssl
-
1
.0.1
h
rd
/s/q
openssl
-
1
.0.1h
@rem
if
exist
openssl
-
1
.0.1
i
rd
/s/q
openssl
-
1
.0.1i
@rem
if
exist
sqlite
-
3
.7.12
rd
/s/q
sqlite
-
3
.7.12
@rem
bzip
...
...
@@ -21,9 +21,9 @@ if not exist bzip2-1.0.6 (
)
@rem
OpenSSL
if
not
exist
openssl
-
1
.0.1
h
(
rd
/s/q
openssl
-
1
.0.1
g
svn
export
http
://svn.python.org/projects/external/openssl
-
1
.0.1
h
if
not
exist
openssl
-
1
.0.1
i
(
rd
/s/q
openssl
-
1
.0.1
h
svn
export
http
://svn.python.org/projects/external/openssl
-
1
.0.1
i
)
@rem
tcl
/tk
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment