Skip to content

gh-131298: eliminate HACL* static libraries for cryptographic modules #132438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gpshead merged 14 commits into from
Apr 20, 2025
Merged

gh-131298: eliminate HACL* static libraries for cryptographic modules #132438

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ac1180f
simplify HACL* build for MD5, SHA1, SHA2 and SHA3 modules
picnixz Apr 12, 2025
3f0b41e
remove statically linked libraries for HACL* implementation
picnixz Apr 13, 2025
08f207b
is it better now?
picnixz Apr 13, 2025
3a3fc29
is it better now?
picnixz Apr 13, 2025
a5d39fa
fixup
picnixz Apr 13, 2025
d6ff1d0
Merge remote-tracking branch 'upstream/main' into fix/hacl/dynamic-li…
picnixz Apr 16, 2025
de0232a
Present HACL* as a static or shared library.
picnixz Apr 16, 2025
c0b00bf
amend whitespace
picnixz Apr 18, 2025
da10142
remove temporary .so file as it requires more symlinks
picnixz Apr 18, 2025
6a47f8a
avoid smelly symbols
picnixz Apr 19, 2025
ca584d9
fixup checksums
picnixz Apr 19, 2025
f260cbb
regen sbom
picnixz Apr 19, 2025
7f9868c
fixup shell warnings and comments
picnixz Apr 19, 2025
c87bb27
it *should* work
picnixz Apr 19, 2025
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
Prev Previous commit
Next Next commit
fixup shell warnings and comments
  • Loading branch information
@picnixz
picnixz committed Apr 19, 2025
commit 7f9868c82a81caa608fc17b48ee9ba44c9f3aca9
26 changes: 16 additions & 10 deletions configure
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 16 additions & 10 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7859,17 +7859,21 @@ PY_STDLIB_MOD_SIMPLE([unicodedata])
#
# Example for MD5:
#
# 1. Compile Modules/_hacl/Hacl_Hash_MD5.c into Modules/_hacl/Hacl_Hash_MD5.o.
# 2. Create Modules/_hacl/libHacl_Hash_MD5$EXT where $EXT is the extension
# for a static (resp. shared) library depending on whether we are on WASI.
# 3. Compile Modules/md5module.c into Modules/md5module.o.
# 4. Link Modules/md5module.o with Modules/_hacl/libHacl_Hash_MD5$EXT
# and get Modules/_md5$(EXT_SUFFIX).
# * Compile Modules/_hacl/Hacl_Hash_MD5.c into Modules/_hacl/Hacl_Hash_MD5.o.
# * Decide whether the object files are to be passed to the linker (emulate
# a shared library without having to install it) or if we need to create
# a static library for WASI. The following summarizes the values taken by
# the MODULE_<NAME>_LDFLAGS variable depending on the linkage type:
# - shared: MODULE__MD5_LDFLAGS is set to LIBHACL_MD5_OBJS
# - static: MODULE__MD5_LDFLAGS is set to Modules/_hacl/libHacl_Hash_MD5.a
# * Compile Modules/md5module.c into Modules/md5module.o.
# * Link Modules/md5module.o using $(MODULE__MD5_LDFLAGS)
# and get Modules/_md5$(EXT_SUFFIX).
#
# LIBHACL_FLAG_I: '-I' flags passed to $(CC) for HACL* and HACL*-based modules
# LIBHACL_FLAG_D: '-D' flags passed to $(CC) for HACL* and HACL*-based modules
# LIBHACL_CFLAGS: flags passed $(CC) for HACL* and HACL*-based modules
# LIBHACL_LDFLAGS: flags passed $(LDSHARED) for HACL* and HACL*-based modules
# LIBHACL_CFLAGS: compiler flags passed for HACL* and HACL*-based modules
# LIBHACL_LDFLAGS: linker flags passed for HACL* and HACL*-based modules
LIBHACL_FLAG_I='-I$(srcdir)/Modules/_hacl -I$(srcdir)/Modules/_hacl/include'
LIBHACL_FLAG_D='-D_BSD_SOURCE -D_DEFAULT_SOURCE'
case "$ac_sys_system" in
Expand All @@ -7887,7 +7891,8 @@ AC_SUBST([LIBHACL_LDFLAGS])
# The SIMD files use aligned_alloc, which is not available on older versions of
# Android.
# The *mmintrin.h headers are x86-family-specific, so can't be used on WASI.
if test "$ac_sys_system" != "Linux-android" -a "$ac_sys_system" != "WASI" || test "$ANDROID_API_LEVEL" -ge 28; then
if test "$ac_sys_system" != "Linux-android" -a "$ac_sys_system" != "WASI" || \
test -n "$ANDROID_API_LEVEL" -a "$ANDROID_API_LEVEL" -ge 28; then
dnl This can be extended here to detect e.g. Power8, which HACL* should also support.
AX_CHECK_COMPILE_FLAG([-msse -msse2 -msse3 -msse4.1 -msse4.2],[
[LIBHACL_SIMD128_FLAGS="-msse -msse2 -msse3 -msse4.1 -msse4.2"]
Expand Down Expand Up @@ -7918,7 +7923,8 @@ AC_SUBST([LIBHACL_BLAKE2_SIMD128_OBJS])
# Although AVX support is not guaranteed on Android
# (https://developer.android.com/ndk/guides/abis#86-64), this is safe because we do a
# runtime CPUID check.
if test "$ac_sys_system" != "Linux-android" -a "$ac_sys_system" != "WASI" || test "$ANDROID_API_LEVEL" -ge 28; then
if test "$ac_sys_system" != "Linux-android" -a "$ac_sys_system" != "WASI" || \
test -n "$ANDROID_API_LEVEL" -a "$ANDROID_API_LEVEL" -ge 28; then
AX_CHECK_COMPILE_FLAG([-mavx2],[
[LIBHACL_SIMD256_FLAGS="-mavx2"]
AC_DEFINE([HACL_CAN_COMPILE_SIMD256], [1], [HACL* library can compile SIMD256 implementations])
Expand Down