diff --git a/Makefile.pre.in b/Makefile.pre.in index 650838d68286c73..5e5564107a93d94 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1581,8 +1581,8 @@ $(LIBHACL_BLAKE2_LIB_STATIC): $(LIBHACL_BLAKE2_OBJS) Modules/_hacl/Hacl_HMAC.o: $(srcdir)/Modules/_hacl/Hacl_HMAC.c $(LIBHACL_HMAC_HEADERS) $(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_HMAC.c -Modules/_hacl/Hacl_Streaming_HMAC.o: $(srcdir)/Modules/_hacl/Hacl_Streaming_HMAC.c $(LIBHACL_HMAC_HEADERS) - $(CC) -Wno-unused-variable -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Streaming_HMAC.c +Modules/_hacl/Hacl_Streaming_HMAC.o: $(srcdir)/Modules/_hacl/_hmac_hacl.c $(srcdir)/Modules/_hacl/Hacl_Streaming_HMAC.c $(LIBHACL_HMAC_HEADERS) + $(CC) -Wno-unused-variable -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/_hmac_hacl.c $(LIBHACL_HMAC_LIB_STATIC): $(LIBHACL_HMAC_OBJS) -rm -f $@ $(AR) $(ARFLAGS) $@ $(LIBHACL_HMAC_OBJS) diff --git a/Modules/_hacl/README.md b/Modules/_hacl/README.md index 0d6454cdd6efb36..c3fce79494b2f37 100644 --- a/Modules/_hacl/README.md +++ b/Modules/_hacl/README.md @@ -19,6 +19,7 @@ changes needed, work with the upstream repository. ## Local files +* [_hmac_hacl.c](_hmac_hacl.c) * [python_hacl_namespaces.h](python_hacl_namespaces.h) * [README.md](README.md) * [refresh.sh](refresh.sh) diff --git a/Modules/_hacl/_hmac_hacl.c b/Modules/_hacl/_hmac_hacl.c new file mode 100644 index 000000000000000..a4e800736aeb911 --- /dev/null +++ b/Modules/_hacl/_hmac_hacl.c @@ -0,0 +1,11 @@ +/* Compile the HACL* streaming HMAC implementation with explicit SIMD defaults. */ +#include "internal/Hacl_Streaming_HMAC.h" + +#ifndef HACL_CAN_COMPILE_VEC128 +# define HACL_CAN_COMPILE_VEC128 0 +#endif +#ifndef HACL_CAN_COMPILE_VEC256 +# define HACL_CAN_COMPILE_VEC256 0 +#endif + +#include "Hacl_Streaming_HMAC.c" diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index d16aa7b4254b453..3dea47e239df28a 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -458,7 +458,7 @@ - + diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters index 99b2631b673a80d..842795ecb2f6a6c 100644 --- a/PCbuild/pythoncore.vcxproj.filters +++ b/PCbuild/pythoncore.vcxproj.filters @@ -1028,7 +1028,7 @@ Modules - + Modules diff --git a/Tools/build/generate_sbom.py b/Tools/build/generate_sbom.py index 6975d9687f815dc..051ec48e00a4e08 100644 --- a/Tools/build/generate_sbom.py +++ b/Tools/build/generate_sbom.py @@ -77,6 +77,7 @@ class PackageFiles(typing.NamedTuple): exclude=[ "Modules/_hacl/refresh.sh", "Modules/_hacl/README.md", + "Modules/_hacl/_hmac_hacl.c", "Modules/_hacl/python_hacl_namespace.h", ] ),