traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-38117: Updates bundled OpenSSL to 1.0.2t (GH-16178)

This commit is contained in:
Steve Dower 2019-09-16 13:07:40 +01:00 committed by GitHub
parent 68d8c12297
commit d8903416d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Windows/2019-09-16-12-47-12.bpo-38117.JaiB0X.rst Normal file
View File

@ -0,0 +1 @@
Updates bundled OpenSSL to 1.0.2t

6
PCbuild/get_external.py
View File

@ -1,12 +1,16 @@
#!/usr/bin/env python3
# We do not need to import built modules from PCbuild (duh), so
# filter those out here to save Steve from debugging it yet again.
import sys
sys.path[:] = [p for p in sys.path if p and 'PCbuild' not in p]
import argparse
import os
import pathlib
import zipfile
from urllib.request import urlretrieve
def fetch_zip(commit_hash, zip_dir, *, org='python', binary=False, verbose):
repo = f'cpython-{"bin" if binary else "source"}-deps'
url = f'https://github.com/{org}/{repo}/archive/{commit_hash}.zip'

2
PCbuild/get_externals.bat
View File

@ -47,7 +47,7 @@ rem files in both this dir and PC\VS9.0
set libraries=
set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeBsddb%"=="false" set libraries=%libraries% bsddb-4.7.25.0
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2s
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2t
set libraries=%libraries% sqlite-3.28.0.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.19.0
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.19.0

2
PCbuild/python.props
View File

@ -35,7 +35,7 @@
<sqlite3Dir>$(ExternalsDir)sqlite-3.28.0.0\</sqlite3Dir>
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
<bsddbDir>$(ExternalsDir)bsddb-4.7.25.0</bsddbDir>
<opensslDir>$(ExternalsDir)openssl-1.0.2s\</opensslDir>
<opensslDir>$(ExternalsDir)openssl-1.0.2t\</opensslDir>
<opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
<opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>