greg/cpython
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

gh-131876: Revert "gh-131876: extract _hashlib helpers into a separate directory (#136995) (#137307)

Browse Source 
Revert "gh-131876: extract `_hashlib` helpers into a separate directory (#136995)"

This reverts commit 45138d3584.
This commit is contained in:
Bénédikt Tran
2025-08-01 19:45:40 +02:00
committed by GitHub
parent e7b55f564d
commit fe0e921817
20 changed files with 221 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
configure.ac
View File

@@ -7187,7 +7187,6 @@ SRCDIRS="\
Modules/_decimal \
Modules/_decimal/libmpdec \
Modules/_hacl \
Modules/_hashlib \
Modules/_io \
Modules/_multiprocessing \
Modules/_sqlite \
@@ -7958,15 +7957,6 @@ PY_STDLIB_MOD_SIMPLE([_codecs_tw])
PY_STDLIB_MOD_SIMPLE([_multibytecodec])
PY_STDLIB_MOD_SIMPLE([unicodedata])
###############################################################################
# Cryptographic primitives
LIBHASHLIB_INTERNAL_CFLAGS="-I\$(srcdir)/Modules/_hashlib"
LIBHASHLIB_INTERNAL_LDFLAGS="-lm \$(LIBHASHLIB_INTERNAL_A)"
LIBHASHLIB_INTERNAL="\$(LIBHASHLIB_INTERNAL_HEADERS) \$(LIBHASHLIB_INTERNAL_A)"
AC_SUBST([LIBHASHLIB_INTERNAL_CFLAGS])
AC_SUBST([LIBHASHLIB_INTERNAL])
###############################################################################
# HACL* compilation and linking configuration (contact: @picnixz)
#
@@ -8103,9 +8093,7 @@ dnl The EXTNAME is the name of the extension module being built.
AC_DEFUN([PY_HACL_CREATE_MODULE], [
AS_VAR_PUSHDEF([v], [[LIBHACL_][$1][_LDFLAGS]])
AS_VAR_SET([v], [[LIBHACL_][$1][_LIB_${LIBHACL_LDEPS_LIBTYPE}]])
PY_STDLIB_MOD([$2], [$3], [],
[$LIBHACL_CFLAGS $LIBHASHLIB_INTERNAL_CFLAGS],
[\$($v) $LIBHASHLIB_INTERNAL_LDFLAGS])
PY_STDLIB_MOD([$2], [$3], [], [$LIBHACL_CFLAGS], [\$($v)])
AS_VAR_POPDEF([v])
])
@@ -8186,8 +8174,7 @@ dnl OpenSSL bindings
PY_STDLIB_MOD([_ssl], [], [test "$ac_cv_working_openssl_ssl" = yes],
[$OPENSSL_INCLUDES], [$OPENSSL_LDFLAGS $OPENSSL_LDFLAGS_RPATH $OPENSSL_LIBS])
PY_STDLIB_MOD([_hashlib], [], [test "$ac_cv_working_openssl_hashlib" = yes],
[$OPENSSL_INCLUDES $LIBHASHLIB_INTERNAL_CFLAGS],
[$OPENSSL_LDFLAGS $OPENSSL_LDFLAGS_RPATH $LIBCRYPTO_LIBS $LIBHASHLIB_INTERNAL_LDFLAGS])
[$OPENSSL_INCLUDES], [$OPENSSL_LDFLAGS $OPENSSL_LDFLAGS_RPATH $LIBCRYPTO_LIBS])
dnl test modules
PY_STDLIB_MOD([_testcapi],