Skip to content

Commit 8c82682

Browse files
authored
Merge branch 'main' into clinic-bool-c_default
2 parents a54469c + 5f2ba15 commit 8c82682

30 files changed

+824
-578
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ repos:
1111
args: [--exit-non-zero-on-fix]
1212
files: ^Lib/test/
1313
- id: ruff
14-
name: Run Ruff (lint) on Tools/build/check_warnings.py
14+
name: Run Ruff (lint) on Tools/build/
1515
args: [--exit-non-zero-on-fix, --config=Tools/build/.ruff.toml]
16-
files: ^Tools/build/check_warnings.py
16+
files: ^Tools/build/
1717
- id: ruff
1818
name: Run Ruff (lint) on Argument Clinic
1919
args: [--exit-non-zero-on-fix, --config=Tools/clinic/.ruff.toml]

Doc/library/hashlib.rst

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@
2020

2121
--------------
2222

23-
This module implements a common interface to many different secure hash and
24-
message digest algorithms. Included are the FIPS secure hash algorithms SHA1,
25-
SHA224, SHA256, SHA384, SHA512, (defined in `the FIPS 180-4 standard`_),
26-
the SHA-3 series (defined in `the FIPS 202 standard`_) as well as RSA's MD5
27-
algorithm (defined in internet :rfc:`1321`). The terms "secure hash" and
28-
"message digest" are interchangeable. Older algorithms were called message
29-
digests. The modern term is secure hash.
23+
This module implements a common interface to many different hash algorithms.
24+
Included are the FIPS secure hash algorithms SHA224, SHA256, SHA384, SHA512,
25+
(defined in `the FIPS 180-4 standard`_), the SHA-3 series (defined in `the FIPS
26+
202 standard`_) as well as the legacy algorithms SHA1 (`formerly part of FIPS`_)
27+
and the MD5 algorithm (defined in internet :rfc:`1321`).
3028

3129
.. note::
3230

@@ -812,6 +810,7 @@ Domain Dedication 1.0 Universal:
812810
.. _the FIPS 180-4 standard: https://csrc.nist.gov/pubs/fips/180-4/upd1/final
813811
.. _the FIPS 202 standard: https://csrc.nist.gov/pubs/fips/202/final
814812
.. _HACL\* project: https://github.com/hacl-star/hacl-star
813+
.. _formerly part of FIPS: https://csrc.nist.gov/news/2023/decision-to-revise-fips-180-4
815814

816815

817816
.. _hashlib-seealso:

Include/internal/pycore_interp_structs.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ struct _is {
754754
* and should be placed at the beginning. */
755755
struct _ceval_state ceval;
756756

757-
/* This structure is carefully allocated so that it's correctly aligned
757+
/* This structure is carefully allocated so that it's correctly aligned
758758
* to avoid undefined behaviors during LOAD and STORE. The '_malloced'
759759
* field stores the allocated pointer address that will later be freed.
760760
*/
@@ -941,18 +941,18 @@ struct _is {
941941

942942
Py_ssize_t _interactive_src_count;
943943

944-
/* the initial PyInterpreterState.threads.head */
945-
_PyThreadStateImpl _initial_thread;
946-
// _initial_thread should be the last field of PyInterpreterState.
947-
// See https://github.com/python/cpython/issues/127117.
948-
949944
#if !defined(Py_GIL_DISABLED) && defined(Py_STACKREF_DEBUG)
950945
uint64_t next_stackref;
951946
_Py_hashtable_t *open_stackrefs_table;
952947
# ifdef Py_STACKREF_CLOSE_DEBUG
953948
_Py_hashtable_t *closed_stackrefs_table;
954949
# endif
955950
#endif
951+
952+
/* the initial PyInterpreterState.threads.head */
953+
_PyThreadStateImpl _initial_thread;
954+
// _initial_thread should be the last field of PyInterpreterState.
955+
// See https://github.com/python/cpython/issues/127117.
956956
};
957957

958958

Lib/_pyrepl/__main__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Important: don't add things to this module, as they will end up in the REPL's
22
# default globals. Use _pyrepl.main instead.
33

4+
# Avoid caching this file by linecache and incorrectly report tracebacks.
5+
# See https://github.com/python/cpython/issues/129098.
6+
__spec__ = __loader__ = None
7+
48
if __name__ == "__main__":
59
from .main import interactive_console as __pyrepl_interactive_console
610
__pyrepl_interactive_console()

Lib/test/test_pyrepl/test_pyrepl.py

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
from unittest import TestCase, skipUnless, skipIf
1212
from unittest.mock import patch
1313
from test.support import force_not_colorized, make_clean_env
14-
from test.support import SHORT_TIMEOUT
14+
from test.support import SHORT_TIMEOUT, STDLIB_DIR
1515
from test.support.import_helper import import_module
16-
from test.support.os_helper import unlink
16+
from test.support.os_helper import EnvironmentVarGuard, unlink
1717

1818
from .support import (
1919
FakeConsole,
@@ -1217,6 +1217,31 @@ def test_python_basic_repl(self):
12171217
self.assertNotIn("Exception", output)
12181218
self.assertNotIn("Traceback", output)
12191219

1220+
@force_not_colorized
1221+
def test_no_pyrepl_source_in_exc(self):
1222+
# Avoid using _pyrepl/__main__.py in traceback reports
1223+
# See https://github.com/python/cpython/issues/129098.
1224+
pyrepl_main_file = os.path.join(STDLIB_DIR, "_pyrepl", "__main__.py")
1225+
self.assertTrue(os.path.exists(pyrepl_main_file), pyrepl_main_file)
1226+
with open(pyrepl_main_file) as fp:
1227+
excluded_lines = fp.readlines()
1228+
excluded_lines = list(filter(None, map(str.strip, excluded_lines)))
1229+
1230+
for filename in ['?', 'unknown-filename', '<foo>', '<...>']:
1231+
self._test_no_pyrepl_source_in_exc(filename, excluded_lines)
1232+
1233+
def _test_no_pyrepl_source_in_exc(self, filename, excluded_lines):
1234+
with EnvironmentVarGuard() as env, self.subTest(filename=filename):
1235+
env.unset("PYTHON_BASIC_REPL")
1236+
commands = (f"eval(compile('spam', {filename!r}, 'eval'))\n"
1237+
f"exit()\n")
1238+
output, _ = self.run_repl(commands, env=env)
1239+
self.assertIn("Traceback (most recent call last)", output)
1240+
self.assertIn("NameError: name 'spam' is not defined", output)
1241+
for line in excluded_lines:
1242+
with self.subTest(line=line):
1243+
self.assertNotIn(line, output)
1244+
12201245
@force_not_colorized
12211246
def test_bad_sys_excepthook_doesnt_crash_pyrepl(self):
12221247
env = os.environ.copy()

Makefile.pre.in

Lines changed: 65 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -227,17 +227,12 @@ ENSUREPIP= @ENSUREPIP@
227227
# Internal static libraries
228228
LIBMPDEC_A= Modules/_decimal/libmpdec/libmpdec.a
229229
LIBEXPAT_A= Modules/expat/libexpat.a
230-
LIBHACL_MD5_A= Modules/_hacl/libHacl_Hash_MD5.a
231-
LIBHACL_SHA1_A= Modules/_hacl/libHacl_Hash_SHA1.a
232-
LIBHACL_SHA2_A= Modules/_hacl/libHacl_Hash_SHA2.a
233-
LIBHACL_SHA3_A= Modules/_hacl/libHacl_Hash_SHA3.a
234-
LIBHACL_BLAKE2_A= Modules/_hacl/libHacl_Hash_Blake2.a
235-
LIBHACL_HMAC_A= Modules/_hacl/libHacl_HMAC.a
230+
231+
# HACL* build configuration
236232
LIBHACL_CFLAGS=@LIBHACL_CFLAGS@
237-
LIBHACL_SIMD128_FLAGS=@LIBHACL_SIMD128_FLAGS@
238-
LIBHACL_SIMD256_FLAGS=@LIBHACL_SIMD256_FLAGS@
239-
LIBHACL_SIMD128_OBJS=@LIBHACL_SIMD128_OBJS@
240-
LIBHACL_SIMD256_OBJS=@LIBHACL_SIMD256_OBJS@
233+
LIBHACL_LDFLAGS=@LIBHACL_LDFLAGS@
234+
LIBHACL_BLAKE2_SIMD128_CFLAGS=@LIBHACL_SIMD128_FLAGS@ -DHACL_CAN_COMPILE_VEC128
235+
LIBHACL_BLAKE2_SIMD256_CFLAGS=@LIBHACL_SIMD256_FLAGS@ -DHACL_CAN_COMPILE_VEC256
241236

242237
# Module state, compiler flags and linker flags
243238
# Empty CFLAGS and LDFLAGS are omitted.
@@ -660,25 +655,40 @@ LIBEXPAT_HEADERS= \
660655

661656
##########################################################################
662657
# hashlib's HACL* library
658+
#
659+
# On WASI, static build is required.
660+
# On other platforms, a shared library is used.
663661

664662
LIBHACL_MD5_OBJS= \
665663
Modules/_hacl/Hacl_Hash_MD5.o
664+
LIBHACL_MD5_LIB_STATIC=Modules/_hacl/libHacl_Hash_MD5.a
665+
LIBHACL_MD5_LIB_SHARED=$(LIBHACL_MD5_OBJS)
666666

667667
LIBHACL_SHA1_OBJS= \
668668
Modules/_hacl/Hacl_Hash_SHA1.o
669+
LIBHACL_SHA1_LIB_STATIC=Modules/_hacl/libHacl_Hash_SHA1.a
670+
LIBHACL_SHA1_LIB_SHARED=$(LIBHACL_SHA1_OBJS)
669671

670672
LIBHACL_SHA2_OBJS= \
671673
Modules/_hacl/Hacl_Hash_SHA2.o
674+
LIBHACL_SHA2_LIB_STATIC=Modules/_hacl/libHacl_Hash_SHA2.a
675+
LIBHACL_SHA2_LIB_SHARED=$(LIBHACL_SHA2_OBJS)
672676

673677
LIBHACL_SHA3_OBJS= \
674678
Modules/_hacl/Hacl_Hash_SHA3.o
679+
LIBHACL_SHA3_LIB_STATIC=Modules/_hacl/libHacl_Hash_SHA3.a
680+
LIBHACL_SHA3_LIB_SHARED=$(LIBHACL_SHA3_OBJS)
675681

682+
LIBHACL_BLAKE2_SIMD128_OBJS=@LIBHACL_BLAKE2_SIMD128_OBJS@
683+
LIBHACL_BLAKE2_SIMD256_OBJS=@LIBHACL_BLAKE2_SIMD256_OBJS@
676684
LIBHACL_BLAKE2_OBJS= \
677685
Modules/_hacl/Hacl_Hash_Blake2s.o \
678686
Modules/_hacl/Hacl_Hash_Blake2b.o \
679687
Modules/_hacl/Lib_Memzero0.o \
680-
$(LIBHACL_SIMD128_OBJS) \
681-
$(LIBHACL_SIMD256_OBJS)
688+
$(LIBHACL_BLAKE2_SIMD128_OBJS) \
689+
$(LIBHACL_BLAKE2_SIMD256_OBJS)
690+
LIBHACL_BLAKE2_LIB_STATIC=Modules/_hacl/libHacl_Hash_BLAKE2.a
691+
LIBHACL_BLAKE2_LIB_SHARED=$(LIBHACL_BLAKE2_OBJS)
682692

683693
LIBHACL_HMAC_OBJS= \
684694
Modules/_hacl/Hacl_HMAC.o \
@@ -688,6 +698,8 @@ LIBHACL_HMAC_OBJS= \
688698
$(LIBHACL_SHA2_OBJS) \
689699
$(LIBHACL_SHA3_OBJS) \
690700
$(LIBHACL_BLAKE2_OBJS)
701+
LIBHACL_HMAC_LIB_STATIC=Modules/_hacl/libHacl_HMAC.a
702+
LIBHACL_HMAC_LIB_SHARED=$(LIBHACL_HMAC_OBJS)
691703

692704
LIBHACL_HEADERS= \
693705
Modules/_hacl/include/krml/FStar_UInt128_Verified.h \
@@ -732,7 +744,6 @@ LIBHACL_BLAKE2_HEADERS= \
732744
Modules/_hacl/internal/Hacl_Impl_Blake2_Constants.h \
733745
Modules/_hacl/internal/Hacl_Hash_Blake2s_Simd128.h \
734746
Modules/_hacl/internal/Hacl_Hash_Blake2b_Simd256.h \
735-
Modules/_hacl/internal/Hacl_Streaming_Types.h \
736747
$(LIBHACL_HEADERS)
737748

738749
LIBHACL_HMAC_HEADERS= \
@@ -1461,74 +1472,72 @@ $(LIBEXPAT_A): $(LIBEXPAT_OBJS)
14611472
$(AR) $(ARFLAGS) $@ $(LIBEXPAT_OBJS)
14621473

14631474
##########################################################################
1464-
# Build HACL* static libraries for hashlib and HACL* HMAC.
1475+
# HACL* library build
1476+
#
1477+
# The HACL* modules are dynamically compiled and linked with the
1478+
# corresponding CPython built-in modules on demand, depending on
1479+
# whether the module is built or not.
14651480
#
1466-
# The contents of libHacl_Blake2.a vary depending on whether we
1467-
# have the ability to compile vectorized versions
1481+
# In particular, the HACL* objects are also dependencies of the
1482+
# corresponding C extension modules but makesetup must NOT create
1483+
# a rule for them.
1484+
#
1485+
# For WASI, static linking is needed and HACL* is statically linked instead.
1486+
1487+
Modules/_hacl/Lib_Memzero0.o: $(srcdir)/Modules/_hacl/Lib_Memzero0.c $(LIBHACL_HEADERS)
1488+
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Lib_Memzero0.c
14681489

14691490
Modules/_hacl/Hacl_Hash_MD5.o: $(srcdir)/Modules/_hacl/Hacl_Hash_MD5.c $(LIBHACL_MD5_HEADERS)
14701491
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_MD5.c
1471-
1472-
$(LIBHACL_MD5_A): $(LIBHACL_MD5_OBJS)
1492+
$(LIBHACL_MD5_LIB_STATIC): $(LIBHACL_MD5_OBJS)
14731493
-rm -f $@
14741494
$(AR) $(ARFLAGS) $@ $(LIBHACL_MD5_OBJS)
14751495

14761496
Modules/_hacl/Hacl_Hash_SHA1.o: $(srcdir)/Modules/_hacl/Hacl_Hash_SHA1.c $(LIBHACL_SHA1_HEADERS)
14771497
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_SHA1.c
1478-
1479-
$(LIBHACL_SHA1_A): $(LIBHACL_SHA1_OBJS)
1498+
$(LIBHACL_SHA1_LIB_STATIC): $(LIBHACL_SHA1_OBJS)
14801499
-rm -f $@
14811500
$(AR) $(ARFLAGS) $@ $(LIBHACL_SHA1_OBJS)
14821501

14831502
Modules/_hacl/Hacl_Hash_SHA2.o: $(srcdir)/Modules/_hacl/Hacl_Hash_SHA2.c $(LIBHACL_SHA2_HEADERS)
14841503
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_SHA2.c
1485-
1486-
$(LIBHACL_SHA2_A): $(LIBHACL_SHA2_OBJS)
1504+
$(LIBHACL_SHA2_LIB_STATIC): $(LIBHACL_SHA2_OBJS)
14871505
-rm -f $@
14881506
$(AR) $(ARFLAGS) $@ $(LIBHACL_SHA2_OBJS)
14891507

14901508
Modules/_hacl/Hacl_Hash_SHA3.o: $(srcdir)/Modules/_hacl/Hacl_Hash_SHA3.c $(LIBHACL_SHA3_HEADERS)
14911509
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_SHA3.c
1492-
1493-
$(LIBHACL_SHA3_A): $(LIBHACL_SHA3_OBJS)
1510+
$(LIBHACL_SHA3_LIB_STATIC): $(LIBHACL_SHA3_OBJS)
14941511
-rm -f $@
14951512
$(AR) $(ARFLAGS) $@ $(LIBHACL_SHA3_OBJS)
14961513

14971514
Modules/_hacl/Hacl_Hash_Blake2s.o: $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2s.c $(LIBHACL_BLAKE2_HEADERS)
14981515
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2s.c
1499-
15001516
Modules/_hacl/Hacl_Hash_Blake2b.o: $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2b.c $(LIBHACL_BLAKE2_HEADERS)
15011517
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2b.c
1502-
15031518
Modules/_hacl/Hacl_Hash_Blake2s_Simd128.o: $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2s_Simd128.c $(LIBHACL_BLAKE2_HEADERS)
1504-
$(CC) -c $(LIBHACL_CFLAGS) $(LIBHACL_SIMD128_FLAGS) -DHACL_CAN_COMPILE_VEC128 -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2s_Simd128.c
1505-
1519+
$(CC) -c $(LIBHACL_CFLAGS) $(LIBHACL_BLAKE2_SIMD128_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2s_Simd128.c
15061520
Modules/_hacl/Hacl_Hash_Blake2s_Simd128_universal2.o: $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2s_Simd128_universal2.c $(LIBHACL_BLAKE2_HEADERS)
1507-
$(CC) -c $(LIBHACL_CFLAGS) $(LIBHACL_SIMD128_FLAGS) -DHACL_CAN_COMPILE_VEC128 -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2s_Simd128_universal2.c
1508-
1521+
$(CC) -c $(LIBHACL_CFLAGS) $(LIBHACL_BLAKE2_SIMD128_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2s_Simd128_universal2.c
15091522
Modules/_hacl/Hacl_Hash_Blake2b_Simd256.o: $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2b_Simd256.c $(LIBHACL_BLAKE2_HEADERS)
1510-
$(CC) -c $(LIBHACL_CFLAGS) $(LIBHACL_SIMD256_FLAGS) -DHACL_CAN_COMPILE_VEC256 -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2b_Simd256.c
1511-
1523+
$(CC) -c $(LIBHACL_CFLAGS) $(LIBHACL_BLAKE2_SIMD256_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2b_Simd256.c
15121524
Modules/_hacl/Hacl_Hash_Blake2b_Simd256_universal2.o: $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2b_Simd256_universal2.c $(LIBHACL_BLAKE2_HEADERS)
1513-
$(CC) -c $(LIBHACL_CFLAGS) $(LIBHACL_SIMD256_FLAGS) -DHACL_CAN_COMPILE_VEC256 -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2b_Simd256_universal2.c
1514-
1515-
Modules/_hacl/Lib_Memzero0.o: $(srcdir)/Modules/_hacl/Lib_Memzero0.c $(LIBHACL_BLAKE2_HEADERS)
1516-
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Lib_Memzero0.c
1517-
1518-
$(LIBHACL_BLAKE2_A): $(LIBHACL_BLAKE2_OBJS)
1525+
$(CC) -c $(LIBHACL_CFLAGS) $(LIBHACL_BLAKE2_SIMD256_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2b_Simd256_universal2.c
1526+
$(LIBHACL_BLAKE2_LIB_STATIC): $(LIBHACL_BLAKE2_OBJS)
15191527
-rm -f $@
15201528
$(AR) $(ARFLAGS) $@ $(LIBHACL_BLAKE2_OBJS)
15211529

1530+
# Other HACL* cryptographic primitives
1531+
15221532
Modules/_hacl/Hacl_HMAC.o: $(srcdir)/Modules/_hacl/Hacl_HMAC.c $(LIBHACL_HMAC_HEADERS)
15231533
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_HMAC.c
1524-
15251534
Modules/_hacl/Hacl_Streaming_HMAC.o: $(srcdir)/Modules/_hacl/Hacl_Streaming_HMAC.c $(LIBHACL_HMAC_HEADERS)
15261535
$(CC) -Wno-unused-variable -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Streaming_HMAC.c
1527-
1528-
$(LIBHACL_HMAC_A): $(LIBHACL_HMAC_OBJS)
1536+
$(LIBHACL_HMAC_LIB_STATIC): $(LIBHACL_HMAC_OBJS)
15291537
-rm -f $@
15301538
$(AR) $(ARFLAGS) $@ $(LIBHACL_HMAC_OBJS)
15311539

1540+
##########################################################################
15321541
# create relative links from build/lib.platform/egg.so to Modules/egg.so
15331542
# pybuilddir.txt is created too late. We cannot use it in Makefile
15341543
# targets. ln --relative is not portable.
@@ -3302,12 +3311,21 @@ MODULE__DECIMAL_DEPS=$(srcdir)/Modules/_decimal/docstrings.h @LIBMPDEC_INTERNAL@
33023311
MODULE__ELEMENTTREE_DEPS=$(srcdir)/Modules/pyexpat.c @LIBEXPAT_INTERNAL@
33033312
MODULE__HASHLIB_DEPS=$(srcdir)/Modules/hashlib.h
33043313
MODULE__IO_DEPS=$(srcdir)/Modules/_io/_iomodule.h
3305-
MODULE__MD5_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_MD5_HEADERS) $(LIBHACL_MD5_A)
3306-
MODULE__SHA1_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_SHA1_HEADERS) $(LIBHACL_SHA1_A)
3307-
MODULE__SHA2_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_SHA2_HEADERS) $(LIBHACL_SHA2_A)
3308-
MODULE__SHA3_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_SHA3_HEADERS) $(LIBHACL_SHA3_A)
3309-
MODULE__BLAKE2_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_BLAKE2_HEADERS) $(LIBHACL_BLAKE2_A)
3310-
MODULE__HMAC_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_HMAC_HEADERS) $(LIBHACL_HMAC_A)
3314+
3315+
# HACL*-based cryptographic primitives
3316+
MODULE__MD5_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_MD5_HEADERS) $(LIBHACL_MD5_LIB_@LIBHACL_LDEPS_LIBTYPE@)
3317+
MODULE__MD5_LDEPS=$(LIBHACL_MD5_LIB_@LIBHACL_LDEPS_LIBTYPE@)
3318+
MODULE__SHA1_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_SHA1_HEADERS) $(LIBHACL_SHA1_LIB_@LIBHACL_LDEPS_LIBTYPE@)
3319+
MODULE__SHA1_LDEPS=$(LIBHACL_SHA1_LIB_@LIBHACL_LDEPS_LIBTYPE@)
3320+
MODULE__SHA2_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_SHA2_HEADERS) $(LIBHACL_SHA2_LIB_@LIBHACL_LDEPS_LIBTYPE@)
3321+
MODULE__SHA2_LDEPS=$(LIBHACL_SHA2_LIB_@LIBHACL_LDEPS_LIBTYPE@)
3322+
MODULE__SHA3_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_SHA3_HEADERS) $(LIBHACL_SHA3_LIB_@LIBHACL_LDEPS_LIBTYPE@)
3323+
MODULE__SHA3_LDEPS=$(LIBHACL_SHA3_LIB_@LIBHACL_LDEPS_LIBTYPE@)
3324+
MODULE__BLAKE2_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_BLAKE2_HEADERS) $(LIBHACL_BLAKE2_LIB_@LIBHACL_LDEPS_LIBTYPE@)
3325+
MODULE__BLAKE2_LDEPS=$(LIBHACL_BLAKE2_LIB_@LIBHACL_LDEPS_LIBTYPE@)
3326+
MODULE__HMAC_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_HMAC_HEADERS) $(LIBHACL_HMAC_LIB_@LIBHACL_LDEPS_LIBTYPE@)
3327+
MODULE__HMAC_LDEPS=$(LIBHACL_HMAC_LIB_@LIBHACL_LDEPS_LIBTYPE@)
3328+
33113329
MODULE__SOCKET_DEPS=$(srcdir)/Modules/socketmodule.h $(srcdir)/Modules/addrinfo.h $(srcdir)/Modules/getaddrinfo.c $(srcdir)/Modules/getnameinfo.c
33123330
MODULE__SSL_DEPS=$(srcdir)/Modules/_ssl.h $(srcdir)/Modules/_ssl/cert.c $(srcdir)/Modules/_ssl/debughelpers.c $(srcdir)/Modules/_ssl/misc.c $(srcdir)/Modules/_ssl_data_111.h $(srcdir)/Modules/_ssl_data_300.h $(srcdir)/Modules/socketmodule.h
33133331
MODULE__TESTCAPI_DEPS=$(srcdir)/Modules/_testcapi/parts.h $(srcdir)/Modules/_testcapi/util.h
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix REPL traceback reporting when using :func:`compile` with an inexisting
2+
file. Patch by Bénédikt Tran.

Misc/sbom.spdx.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)