Skip to content

Commit d890341

Browse files
authored
bpo-38117: Updates bundled OpenSSL to 1.0.2t (GH-16178)
1 parent 68d8c12 commit d890341

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Updates bundled OpenSSL to 1.0.2t

PCbuild/get_external.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
#!/usr/bin/env python3
22

3+
# We do not need to import built modules from PCbuild (duh), so
4+
# filter those out here to save Steve from debugging it yet again.
5+
import sys
6+
sys.path[:] = [p for p in sys.path if p and 'PCbuild' not in p]
7+
38
import argparse
49
import os
510
import pathlib
611
import zipfile
712
from urllib.request import urlretrieve
813

9-
1014
def fetch_zip(commit_hash, zip_dir, *, org='python', binary=False, verbose):
1115
repo = f'cpython-{"bin" if binary else "source"}-deps'
1216
url = f'https://github.com/{org}/{repo}/archive/{commit_hash}.zip'

PCbuild/get_externals.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ rem files in both this dir and PC\VS9.0
4747
set libraries=
4848
set libraries=%libraries% bzip2-1.0.6
4949
if NOT "%IncludeBsddb%"=="false" set libraries=%libraries% bsddb-4.7.25.0
50-
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2s
50+
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2t
5151
set libraries=%libraries% sqlite-3.28.0.0
5252
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.19.0
5353
if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.19.0

PCbuild/python.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<sqlite3Dir>$(ExternalsDir)sqlite-3.28.0.0\</sqlite3Dir>
3636
<bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
3737
<bsddbDir>$(ExternalsDir)bsddb-4.7.25.0</bsddbDir>
38-
<opensslDir>$(ExternalsDir)openssl-1.0.2s\</opensslDir>
38+
<opensslDir>$(ExternalsDir)openssl-1.0.2t\</opensslDir>
3939
<opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
4040
<opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
4141
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>

0 commit comments

Comments
 (0)