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
a268edd6
Commit
a268edd6
authored
Jun 17, 2019
by
Steve Dower
Committed by
GitHub
Jun 17, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-34631: Updated OpenSSL to 1.1.1c in Windows installer (GH-14163)
parent
4acdbf11
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
5 deletions
+6
-5
Misc/NEWS.d/next/Security/2019-06-17-09-34-25.bpo-34631.DBfM4j.rst
....d/next/Security/2019-06-17-09-34-25.bpo-34631.DBfM4j.rst
+1
-0
PCbuild/get_externals.bat
PCbuild/get_externals.bat
+2
-2
PCbuild/python.props
PCbuild/python.props
+2
-2
PCbuild/readme.txt
PCbuild/readme.txt
+1
-1
No files found.
Misc/NEWS.d/next/Security/2019-06-17-09-34-25.bpo-34631.DBfM4j.rst
0 → 100644
View file @
a268edd6
Updated OpenSSL to 1.1.1c in Windows installer
PCbuild/get_externals.bat
View file @
a268edd6
...
@@ -53,7 +53,7 @@ echo.Fetching external libraries...
...
@@ -53,7 +53,7 @@ echo.Fetching external libraries...
set
libraries
=
set
libraries
=
set
libraries
=
%libraries%
bzip2
-
1
.0.6
set
libraries
=
%libraries%
bzip2
-
1
.0.6
if
NOT
"
%IncludeLibffiSrc%
"
==
"false"
set
libraries
=
%libraries%
libffi
-
3
.3.0
-rc
0
-r
1
if
NOT
"
%IncludeLibffiSrc%
"
==
"false"
set
libraries
=
%libraries%
libffi
-
3
.3.0
-rc
0
-r
1
if
NOT
"
%IncludeSSLSrc%
"
==
"false"
set
libraries
=
%libraries%
openssl
-
1
.1.1
b
if
NOT
"
%IncludeSSLSrc%
"
==
"false"
set
libraries
=
%libraries%
openssl
-
1
.1.1
c
set
libraries
=
%libraries%
sqlite
-
3
.21.0.0
set
libraries
=
%libraries%
sqlite
-
3
.21.0.0
if
NOT
"
%IncludeTkinterSrc%
"
==
"false"
set
libraries
=
%libraries%
tcl
-core
-
8
.6.9.0
if
NOT
"
%IncludeTkinterSrc%
"
==
"false"
set
libraries
=
%libraries%
tcl
-core
-
8
.6.9.0
if
NOT
"
%IncludeTkinterSrc%
"
==
"false"
set
libraries
=
%libraries%
tk
-
8
.6.9.0
if
NOT
"
%IncludeTkinterSrc%
"
==
"false"
set
libraries
=
%libraries%
tk
-
8
.6.9.0
...
@@ -77,7 +77,7 @@ echo.Fetching external binaries...
...
@@ -77,7 +77,7 @@ echo.Fetching external binaries...
set
binaries
=
set
binaries
=
if
NOT
"
%IncludeLibffi%
"
==
"false"
set
binaries
=
%binaries%
libffi
if
NOT
"
%IncludeLibffi%
"
==
"false"
set
binaries
=
%binaries%
libffi
if
NOT
"
%IncludeSSL%
"
==
"false"
set
binaries
=
%binaries%
openssl
-bin
-
1
.1.1
b
if
NOT
"
%IncludeSSL%
"
==
"false"
set
binaries
=
%binaries%
openssl
-bin
-
1
.1.1
c
if
NOT
"
%IncludeTkinter%
"
==
"false"
set
binaries
=
%binaries%
tcltk
-
8
.6.9.0
if
NOT
"
%IncludeTkinter%
"
==
"false"
set
binaries
=
%binaries%
tcltk
-
8
.6.9.0
if
NOT
"
%IncludeSSLSrc%
"
==
"false"
set
binaries
=
%binaries%
nasm
-
2
.11.06
if
NOT
"
%IncludeSSLSrc%
"
==
"false"
set
binaries
=
%binaries%
nasm
-
2
.11.06
...
...
PCbuild/python.props
View file @
a268edd6
...
@@ -62,8 +62,8 @@
...
@@ -62,8 +62,8 @@
<libffiDir>
$(ExternalsDir)libffi\
</libffiDir>
<libffiDir>
$(ExternalsDir)libffi\
</libffiDir>
<libffiOutDir>
$(ExternalsDir)libffi\$(ArchName)\
</libffiOutDir>
<libffiOutDir>
$(ExternalsDir)libffi\$(ArchName)\
</libffiOutDir>
<libffiIncludeDir>
$(libffiOutDir)include
</libffiIncludeDir>
<libffiIncludeDir>
$(libffiOutDir)include
</libffiIncludeDir>
<opensslDir>
$(ExternalsDir)openssl-1.1.1
b
\
</opensslDir>
<opensslDir>
$(ExternalsDir)openssl-1.1.1
c
\
</opensslDir>
<opensslOutDir>
$(ExternalsDir)openssl-bin-1.1.1
b
\$(ArchName)\
</opensslOutDir>
<opensslOutDir>
$(ExternalsDir)openssl-bin-1.1.1
c
\$(ArchName)\
</opensslOutDir>
<opensslIncludeDir>
$(opensslOutDir)include
</opensslIncludeDir>
<opensslIncludeDir>
$(opensslOutDir)include
</opensslIncludeDir>
<nasmDir>
$(ExternalsDir)\nasm-2.11.06\
</nasmDir>
<nasmDir>
$(ExternalsDir)\nasm-2.11.06\
</nasmDir>
<zlibDir>
$(ExternalsDir)\zlib-1.2.11\
</zlibDir>
<zlibDir>
$(ExternalsDir)\zlib-1.2.11\
</zlibDir>
...
...
PCbuild/readme.txt
View file @
a268edd6
...
@@ -165,7 +165,7 @@ _lzma
...
@@ -165,7 +165,7 @@ _lzma
Homepage:
Homepage:
http://tukaani.org/xz/
http://tukaani.org/xz/
_ssl
_ssl
Python wrapper for version 1.1.1
b
of the OpenSSL secure sockets
Python wrapper for version 1.1.1
c
of the OpenSSL secure sockets
library, which is downloaded from our binaries repository at
library, which is downloaded from our binaries repository at
https://github.com/python/cpython-bin-deps.
https://github.com/python/cpython-bin-deps.
...
...
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