Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions cpython-unix/build-cpython.sh
Original file line number Diff line number Diff line change
Expand Up @@ -752,14 +752,6 @@ elif [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_11}" ]; then
patch -p1 -i "${ROOT}/patch-getpath-use-base_executable-for-executable_dir.patch"
fi

# Cherry-pick python/cpython#100373 from 3.12 onto 3.10/3.11 to fix DER parsing with OpenSSL 3.5.7.
# The old implementation does heuristics on the error codes returned from the ASN.1 parser, which
# have changed slightly in openssl/openssl#30986 (commit 738688d762 in 3.5.7). The new
# implementation does a better job of parsing and avoids the heuristics in the first place.
if [ -n "${PYTHON_MEETS_MAXIMUM_VERSION_3_11}" ]; then
patch -p1 -i "${ROOT}/patch-python-der-eof-parsing.patch"
fi

# We patched configure.ac above. Reflect those changes.
autoconf

Expand Down
77 changes: 0 additions & 77 deletions cpython-unix/patch-python-der-eof-parsing.patch

This file was deleted.

12 changes: 0 additions & 12 deletions cpython-windows/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -1527,18 +1527,6 @@ def build_cpython(
cpython_source_path = td / ("Python-%s" % python_version)
pcbuild_path = cpython_source_path / "PCbuild"

# Cherry-pick python/cpython#100373 from 3.12 onto 3.10/3.11 to fix DER
# parsing with OpenSSL 3.5.7. The old implementation does heuristics
# on the error codes returned from the ASN.1 parser, which have changed
# slightly in openssl/openssl#30986 (commit 738688d762 in 3.5.7). The
# new implementation does a better job of parsing and avoids the
# heuristics in the first place.
if meets_python_maximum_version(python_version, "3.11"):
apply_source_patch(
cpython_source_path,
SUPPORT / "patch-python-der-eof-parsing.patch",
)

out_dir = td / "out"

build_dir = out_dir / "python" / "build"
Expand Down
77 changes: 0 additions & 77 deletions cpython-windows/patch-python-der-eof-parsing.patch

This file was deleted.

24 changes: 12 additions & 12 deletions pythonbuild/downloads.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,28 +48,28 @@
"license_file": "LICENSE.bzip2.txt",
},
"cpython-3.10": {
"url": "https://www.python.org/ftp/python/3.10.20/Python-3.10.20.tar.xz",
"size": 19868028,
"sha256": "de6517421601e39a9a3bc3e1bc4c7b2f239297423ee05e282598c83ec0647505",
"version": "3.10.20",
"url": "https://www.python.org/ftp/python/3.10.21/Python-3.10.21.tar.xz",
"size": 19896516,
"sha256": "a0da1e72132e950154eca0f6f47d5db828454700de20e5113667940d81e0db04",
"version": "3.10.21",
"licenses": ["Python-2.0", "CNRI-Python"],
"license_file": "LICENSE.cpython.txt",
"python_tag": "cp310",
},
"cpython-3.11": {
"url": "https://www.python.org/ftp/python/3.11.15/Python-3.11.15.tar.xz",
"size": 20332596,
"sha256": "272179ddd9a2e41a0fc8e42e33dfbdca0b3711aa5abf372d3f2d51543d09b625",
"version": "3.11.15",
"url": "https://www.python.org/ftp/python/3.11.16/Python-3.11.16.tar.xz",
"size": 20328716,
"sha256": "91bcdebfdde239a003ae93738a7fce0f9230fee5c4bc2b86f6e6e8c6f98aabe8",
"version": "3.11.16",
"licenses": ["Python-2.0", "CNRI-Python"],
"license_file": "LICENSE.cpython.txt",
"python_tag": "cp311",
},
"cpython-3.12": {
"url": "https://www.python.org/ftp/python/3.12.13/Python-3.12.13.tar.xz",
"size": 20801708,
"sha256": "c08bc65a81971c1dd5783182826503369466c7e67374d1646519adf05207b684",
"version": "3.12.13",
"url": "https://www.python.org/ftp/python/3.12.14/Python-3.12.14.tar.xz",
"size": 20820300,
"sha256": "5c8462af5790baf43a321a1559dbe0db06d1be4300fb85fb53c40060668e548a",
"version": "3.12.14",
"licenses": ["Python-2.0", "CNRI-Python"],
"license_file": "LICENSE.cpython.txt",
"python_tag": "cp312",
Expand Down
Loading