Skip to content

Commit 729c375

Browse files
msprotzJelleZijlstra
msprotz
authored and
JelleZijlstra
committed
pythongh-99108: Import MD5 and SHA1 from HACL* (python#102089)
Replaces our fallback non-OpenSSL MD5 and SHA1 implementations with those from HACL* as we've already done with SHA2.
1 parent d1f00e9 commit 729c375

24 files changed

Lines changed: 2498 additions & 699 deletions

‎Makefile.pre.in‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -578,17 +578,21 @@ LIBEXPAT_HEADERS= \
578578
LIBHACL_SHA2_OBJS= \
579579
Modules/_hacl/Hacl_Streaming_SHA2.o
580580

581-
LIBHACL_SHA2_HEADERS= \
582-
Modules/_hacl/Hacl_Streaming_SHA2.h \
581+
LIBHACL_HEADERS= \
583582
Modules/_hacl/include/krml/FStar_UInt128_Verified.h \
584583
Modules/_hacl/include/krml/FStar_UInt_8_16_32_64.h \
585584
Modules/_hacl/include/krml/fstar_uint128_struct_endianness.h \
586585
Modules/_hacl/include/krml/internal/target.h \
587586
Modules/_hacl/include/krml/lowstar_endianness.h \
588587
Modules/_hacl/include/krml/types.h \
589-
Modules/_hacl/internal/Hacl_SHA2_Generic.h \
588+
Modules/_hacl/Hacl_Streaming_Types.h \
590589
Modules/_hacl/python_hacl_namespaces.h
591590

591+
LIBHACL_SHA2_HEADERS= \
592+
Modules/_hacl/Hacl_Streaming_SHA2.h \
593+
Modules/_hacl/internal/Hacl_SHA2_Generic.h \
594+
$(LIBHACL_HEADERS)
595+
592596
#########################################################################
593597
# Rules
594598

@@ -2635,8 +2639,8 @@ MODULE__DECIMAL_DEPS=$(srcdir)/Modules/_decimal/docstrings.h @LIBMPDEC_INTERNAL@
26352639
MODULE__ELEMENTTREE_DEPS=$(srcdir)/Modules/pyexpat.c @LIBEXPAT_INTERNAL@
26362640
MODULE__HASHLIB_DEPS=$(srcdir)/Modules/hashlib.h
26372641
MODULE__IO_DEPS=$(srcdir)/Modules/_io/_iomodule.h
2638-
MODULE__MD5_DEPS=$(srcdir)/Modules/hashlib.h
2639-
MODULE__SHA1_DEPS=$(srcdir)/Modules/hashlib.h
2642+
MODULE__MD5_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_HEADERS) Modules/_hacl/Hacl_Hash_MD5.h Modules/_hacl/Hacl_Hash_MD5.c
2643+
MODULE__SHA1_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_HEADERS) Modules/_hacl/Hacl_Hash_SHA1.h Modules/_hacl/Hacl_Hash_SHA1.c
26402644
MODULE__SHA2_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_SHA2_HEADERS) $(LIBHACL_SHA2_A)
26412645
MODULE__SHA3_DEPS=$(srcdir)/Modules/_sha3/sha3.c $(srcdir)/Modules/_sha3/sha3.h $(srcdir)/Modules/hashlib.h
26422646
MODULE__SOCKET_DEPS=$(srcdir)/Modules/socketmodule.h $(srcdir)/Modules/addrinfo.h $(srcdir)/Modules/getaddrinfo.c $(srcdir)/Modules/getnameinfo.c

‎Misc/NEWS.d/next/Security/2023-02-17-10-42-48.gh-issue-99108.MKA8-f.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Replace builtin hashlib implementations of MD5 and SHA1 with verified ones
2+
from the HACL* project.

‎Modules/Setup‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ PYTHONPATH=$(COREPYTHONPATH)
163163

164164
# hashing builtins
165165
#_blake2 _blake2/blake2module.c _blake2/blake2b_impl.c _blake2/blake2s_impl.c
166-
#_md5 md5module.c
167-
#_sha1 sha1module.c
166+
#_md5 md5module.c -I$(srcdir)/Modules/_hacl/include _hacl/libHacl_Hash_MD5.c
167+
#_sha1 sha1module.c -I$(srcdir)/Modules/_hacl/include _hacl/libHacl_Hash_SHA1.c
168168
#_sha2 sha2module.c -I$(srcdir)/Modules/_hacl/include Modules/_hacl/libHacl_Streaming_SHA2.a
169169
#_sha3 _sha3/sha3module.c
170170

‎Modules/Setup.stdlib.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@
7777
@MODULE_READLINE_TRUE@readline readline.c
7878

7979
# hashing builtins, can be disabled with --without-builtin-hashlib-hashes
80-
@MODULE__MD5_TRUE@_md5 md5module.c
81-
@MODULE__SHA1_TRUE@_sha1 sha1module.c
80+
@MODULE__MD5_TRUE@_md5 md5module.c -I$(srcdir)/Modules/_hacl/include _hacl/Hacl_Hash_MD5.c -D_BSD_SOURCE -D_DEFAULT_SOURCE
81+
@MODULE__SHA1_TRUE@_sha1 sha1module.c -I$(srcdir)/Modules/_hacl/include _hacl/Hacl_Hash_SHA1.c -D_BSD_SOURCE -D_DEFAULT_SOURCE
8282
@MODULE__SHA2_TRUE@_sha2 sha2module.c -I$(srcdir)/Modules/_hacl/include Modules/_hacl/libHacl_Streaming_SHA2.a
8383
@MODULE__SHA3_TRUE@_sha3 _sha3/sha3module.c
8484
@MODULE__BLAKE2_TRUE@_blake2 _blake2/blake2module.c _blake2/blake2b_impl.c _blake2/blake2s_impl.c

0 commit comments

Comments
 (0)