Skip to content

Commit ac1180f

Browse files
picnixzpicnixz
committed
simplify HACL* build for MD5, SHA1, SHA2 and SHA3 modules
1 parent d4e2cdc commit ac1180f

File tree

2 files changed

+8
-40
lines changed

2 files changed

+8
-40
lines changed

‎Makefile.pre.in

+4-36
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,6 @@ 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
234230
LIBHACL_BLAKE2_A= Modules/_hacl/libHacl_Hash_Blake2.a
235231
LIBHACL_HMAC_A= Modules/_hacl/libHacl_HMAC.a
236232
LIBHACL_CFLAGS=@LIBHACL_CFLAGS@
@@ -1466,34 +1462,6 @@ $(LIBEXPAT_A): $(LIBEXPAT_OBJS)
14661462
# The contents of libHacl_Blake2.a vary depending on whether we
14671463
# have the ability to compile vectorized versions
14681464

1469-
Modules/_hacl/Hacl_Hash_MD5.o: $(srcdir)/Modules/_hacl/Hacl_Hash_MD5.c $(LIBHACL_MD5_HEADERS)
1470-
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_MD5.c
1471-
1472-
$(LIBHACL_MD5_A): $(LIBHACL_MD5_OBJS)
1473-
-rm -f $@
1474-
$(AR) $(ARFLAGS) $@ $(LIBHACL_MD5_OBJS)
1475-
1476-
Modules/_hacl/Hacl_Hash_SHA1.o: $(srcdir)/Modules/_hacl/Hacl_Hash_SHA1.c $(LIBHACL_SHA1_HEADERS)
1477-
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_SHA1.c
1478-
1479-
$(LIBHACL_SHA1_A): $(LIBHACL_SHA1_OBJS)
1480-
-rm -f $@
1481-
$(AR) $(ARFLAGS) $@ $(LIBHACL_SHA1_OBJS)
1482-
1483-
Modules/_hacl/Hacl_Hash_SHA2.o: $(srcdir)/Modules/_hacl/Hacl_Hash_SHA2.c $(LIBHACL_SHA2_HEADERS)
1484-
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_SHA2.c
1485-
1486-
$(LIBHACL_SHA2_A): $(LIBHACL_SHA2_OBJS)
1487-
-rm -f $@
1488-
$(AR) $(ARFLAGS) $@ $(LIBHACL_SHA2_OBJS)
1489-
1490-
Modules/_hacl/Hacl_Hash_SHA3.o: $(srcdir)/Modules/_hacl/Hacl_Hash_SHA3.c $(LIBHACL_SHA3_HEADERS)
1491-
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_SHA3.c
1492-
1493-
$(LIBHACL_SHA3_A): $(LIBHACL_SHA3_OBJS)
1494-
-rm -f $@
1495-
$(AR) $(ARFLAGS) $@ $(LIBHACL_SHA3_OBJS)
1496-
14971465
Modules/_hacl/Hacl_Hash_Blake2s.o: $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2s.c $(LIBHACL_BLAKE2_HEADERS)
14981466
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2s.c
14991467

@@ -3302,10 +3270,10 @@ MODULE__DECIMAL_DEPS=$(srcdir)/Modules/_decimal/docstrings.h @LIBMPDEC_INTERNAL@
33023270
MODULE__ELEMENTTREE_DEPS=$(srcdir)/Modules/pyexpat.c @LIBEXPAT_INTERNAL@
33033271
MODULE__HASHLIB_DEPS=$(srcdir)/Modules/hashlib.h
33043272
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)
3273+
MODULE__MD5_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_MD5_HEADERS) $(srcdir)/Modules/_hacl/Hacl_Hash_MD5.c
3274+
MODULE__SHA1_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_SHA1_HEADERS) $(srcdir)/Modules/_hacl/Hacl_Hash_SHA1.c
3275+
MODULE__SHA2_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_SHA2_HEADERS) $(srcdir)/Modules/_hacl/Hacl_Hash_SHA2.c
3276+
MODULE__SHA3_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_SHA3_HEADERS) $(srcdir)/Modules/_hacl/Hacl_Hash_SHA3.c
33093277
MODULE__BLAKE2_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_BLAKE2_HEADERS) $(LIBHACL_BLAKE2_A)
33103278
MODULE__HMAC_DEPS=$(srcdir)/Modules/hashlib.h $(LIBHACL_HMAC_HEADERS) $(LIBHACL_HMAC_A)
33113279
MODULE__SOCKET_DEPS=$(srcdir)/Modules/socketmodule.h $(srcdir)/Modules/addrinfo.h $(srcdir)/Modules/getaddrinfo.c $(srcdir)/Modules/getnameinfo.c

‎Modules/Setup.stdlib.in

+4-4
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@
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 -I$(srcdir)/Modules/_hacl/include Modules/_hacl/libHacl_Hash_MD5.a -D_BSD_SOURCE -D_DEFAULT_SOURCE
81-
@MODULE__SHA1_TRUE@_sha1 sha1module.c -I$(srcdir)/Modules/_hacl/include Modules/_hacl/libHacl_Hash_SHA1.a -D_BSD_SOURCE -D_DEFAULT_SOURCE
82-
@MODULE__SHA2_TRUE@_sha2 sha2module.c -I$(srcdir)/Modules/_hacl/include Modules/_hacl/libHacl_Hash_SHA2.a -D_BSD_SOURCE -D_DEFAULT_SOURCE
83-
@MODULE__SHA3_TRUE@_sha3 sha3module.c -I$(srcdir)/Modules/_hacl/include Modules/_hacl/libHacl_Hash_SHA3.a -D_BSD_SOURCE -D_DEFAULT_SOURCE
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
82+
@MODULE__SHA2_TRUE@_sha2 sha2module.c -I$(srcdir)/Modules/_hacl/include _hacl/Hacl_Hash_SHA2.c -D_BSD_SOURCE -D_DEFAULT_SOURCE
83+
@MODULE__SHA3_TRUE@_sha3 sha3module.c -I$(srcdir)/Modules/_hacl/include _hacl/Hacl_Hash_SHA3.c -D_BSD_SOURCE -D_DEFAULT_SOURCE
8484
@MODULE__BLAKE2_TRUE@_blake2 blake2module.c -I$(srcdir)/Modules/_hacl/include Modules/_hacl/libHacl_Hash_Blake2.a -D_BSD_SOURCE -D_DEFAULT_SOURCE
8585

8686
@MODULE__HMAC_TRUE@_hmac hmacmodule.c

0 commit comments

Comments
 (0)