commit 138e9b8d7cbf68a20f8ae13d19ad0031fd7b86f0
parent 787b07748e3c97ad8e60ffc052005e2382e8f68f
Author: Evgeny Grin (Karlson2k) <k2k@drgrin.dev>
Date: Thu, 11 Dec 2025 19:43:03 +0100
Fixed mess with cyrpro libs sources and flags
Diffstat:
3 files changed, 102 insertions(+), 107 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -6602,6 +6602,9 @@ AC_SUBST([OPENSSL_CPPFLAGS])
AC_SUBST([OPENSSL_LDFLAGS])
AC_SUBST([OPENSSL_LIBS])
AM_CONDITIONAL([MHD_SUPPORT_MBEDTLS], [[test "x$have_mbedtls" = "xyes"]])
+AC_SUBST([MBEDTLS_CRYPTO_CPPFLAGS])
+AC_SUBST([MBEDTLS_CRYPTO_LDFLAGS])
+AC_SUBST([MBEDTLS_CRYPTO_LIBS])
AC_SUBST([MBEDTLS_FULL_CPPFLAGS])
AC_SUBST([MBEDTLS_FULL_LDFLAGS])
AC_SUBST([MBEDTLS_FULL_LIBS])
@@ -6818,6 +6821,9 @@ AC_ARG_ENABLE([[md5]],
)
], [[enable_md5="${enable_digest_auth}"]]
)
+AS_UNSET([have_md5_gnutls])
+AS_UNSET([have_md5_openssl])
+AS_UNSET([have_md5_mbedtls])
AS_CASE([${enable_md5}],[yes|tlslib],
[
found_md5_tls="no"
@@ -6882,6 +6888,7 @@ AS_CASE([${enable_md5}],[yes|tlslib],
[
AC_DEFINE([[MHD_MD5_EXTR_GNUTLS]],[[1]],
[Define to 1 if libmicrohttpd is compiled with MD5 hashing by GnuTLS.])
+ have_md5_gnutls="yes"
found_md5_tls="yes"
]
)
@@ -6934,6 +6941,7 @@ AS_CASE([${enable_md5}],[yes|tlslib],
[
AC_DEFINE([[MHD_MD5_EXTR_OPENSSL]],[[1]],
[Define to 1 if libmicrohttpd is compiled with MD5 hashing by OpenSSL.])
+ have_md5_openssl="yes"
found_md5_tls="yes"
]
)
@@ -6984,6 +6992,7 @@ AS_CASE([${enable_md5}],[yes|tlslib],
[
AC_DEFINE([[MHD_MD5_EXTR_MBEDTLS]],[[1]],
[Define to 1 if libmicrohttpd is compiled with MD5 hashing by MbedTLS.])
+ have_md5_mbedtls="yes"
found_md5_tls="yes"
]
)
@@ -6995,7 +7004,12 @@ AS_CASE([${enable_md5}],[yes|tlslib],
AS_IF([test "x$enable_md5" = "xyes"],
[AS_VAR_IF([found_md5_tls],["yes"],
[enable_md5="tlslib"],
- [enable_md5="builtin"]
+ [
+ enable_md5="builtin"
+ AS_UNSET([have_md5_gnutls])
+ AS_UNSET([have_md5_openssl])
+ AS_UNSET([have_md5_mbedtls])
+ ]
)],
[AS_VAR_IF([found_md5_tls],["yes"],
[enable_md5="tlslib"],
@@ -7027,10 +7041,10 @@ AS_IF([test "x${enable_md5}" = "xtlslib" ],
]
)
AM_CONDITIONAL([MHD_SUPPORT_MD5], [[test "x${enable_md5}" = "xbuiltin" || test "x${enable_md5}" = "xtlslib" ]])
-AM_CONDITIONAL([MHD_MD5_EXTR], [[test "x${enable_md5}" = "xtlslib" ]])
-AM_CONDITIONAL([MHD_MD5_GNUTLS], [[test "x$mhd_cv_gnutls_md5" = "xyes"]])
-AM_CONDITIONAL([MHD_MD5_OPENSSL], [[test "x$mhd_cv_openssl_md5" = "xyes"]])
-AM_CONDITIONAL([MHD_MD5_MBEDTLS], [[test "x$mhd_cv_mbedtls_md5" = "xyes"]])
+AM_CONDITIONAL([MHD_USE_MD5_INTR], [[test "X${enable_md5}" = "Xbuiltin"]])
+AM_CONDITIONAL([MHD_USE_MD5_GNUTLS],[test "X${have_md5_gnutls}" = "Xyes"])
+AM_CONDITIONAL([MHD_USE_MD5_OPENSSL],[test "X${have_md5_openssl}" = "Xyes"])
+AM_CONDITIONAL([MHD_USE_MD5_MBEDTLS],[test "X${have_md5_mbedtls}" = "Xyes"])
AC_MSG_RESULT([[${enable_md5_MSG}]])
# optional: SHA-256 support for Digest Auth. Enabled by default.
@@ -7053,6 +7067,9 @@ AC_ARG_ENABLE([[sha256]],
], [[enable_sha256="${enable_digest_auth}"]]
)
+AS_UNSET([have_sha256_gnutls])
+AS_UNSET([have_sha256_openssl])
+AS_UNSET([have_sha256_mbedtls])
# SHA-256 external vs. internal check
AS_CASE([${enable_sha256}],[yes|tlslib],
[
@@ -7118,6 +7135,7 @@ AS_CASE([${enable_sha256}],[yes|tlslib],
[
AC_DEFINE([[MHD_SHA256_EXTR_GNUTLS]],[[1]],
[Define to 1 if libmicrohttpd is compiled with SHA-256 hashing by GnuTLS.])
+ have_sha256_gnutls="yes"
found_sha256_tls="yes"
]
)
@@ -7170,6 +7188,7 @@ AS_CASE([${enable_sha256}],[yes|tlslib],
[
AC_DEFINE([[MHD_SHA256_EXTR_OPENSSL]],[[1]],
[Define to 1 if libmicrohttpd is compiled with SHA-256 hashing by OpenSSL.])
+ have_sha256_openssl="yes"
found_sha256_tls="yes"
]
)
@@ -7220,6 +7239,7 @@ AS_CASE([${enable_sha256}],[yes|tlslib],
[
AC_DEFINE([[MHD_SHA256_EXTR_MBEDTLS]],[[1]],
[Define to 1 if libmicrohttpd is compiled with SHA256 hashing by MbedTLS.])
+ have_sha256_mbedtls="yes"
found_sha256_tls="yes"
]
)
@@ -7231,7 +7251,12 @@ AS_CASE([${enable_sha256}],[yes|tlslib],
AS_IF([test "x$enable_sha256" = "xyes"],
[AS_VAR_IF([found_sha256_tls],["yes"],
[enable_sha256="tlslib"],
- [enable_sha256="builtin"]
+ [
+ enable_sha256="builtin"
+ AS_UNSET([have_sha256_gnutls])
+ AS_UNSET([have_sha256_openssl])
+ AS_UNSET([have_sha256_mbedtls])
+ ]
)],
[AS_VAR_IF([found_sha256_tls],["yes"],
[enable_sha256="tlslib"],
@@ -7263,10 +7288,10 @@ AS_IF([test "x${enable_sha256}" = "xtlslib" ],
]
)
AM_CONDITIONAL([MHD_SUPPORT_SHA256], [[test "x${enable_sha256}" = "xbuiltin" || test "x${enable_sha256}" = "xtlslib" ]])
-AM_CONDITIONAL([MHD_SHA256_EXTR], [[test "x${enable_sha256}" = "xtlslib" ]])
-AM_CONDITIONAL([MHD_SHA256_GNUTLS], [[test "x$mhd_cv_gnutls_sha256" = "xyes"]])
-AM_CONDITIONAL([MHD_SHA256_OPENSSL], [[test "x$mhd_cv_openssl_sha256" = "xyes"]])
-AM_CONDITIONAL([MHD_SHA256_MBEDTLS], [[test "x$mhd_cv_mbedtls_sha256" = "xyes"]])
+AM_CONDITIONAL([MHD_USE_SHA256_INTR], [[test "X${enable_sha256}" = "Xbuiltin"]])
+AM_CONDITIONAL([MHD_USE_SHA256_GNUTLS], [[test "X${have_sha256_gnutls}" = "Xyes"]])
+AM_CONDITIONAL([MHD_USE_SHA256_OPENSSL], [[test "X${have_sha256_openssl}" = "Xyes"]])
+AM_CONDITIONAL([MHD_USE_SHA256_MBEDTLS], [[test "X${have_sha256_mbedtls}" = "Xyes"]])
AC_MSG_RESULT([[${enable_sha256_MSG}]])
# optional: SHA-512/256 support for Digest Auth. Enabled by default.
@@ -7289,6 +7314,8 @@ AC_ARG_ENABLE([[sha512-256]],
], [[enable_sha512_256="${enable_digest_auth}"]]
)
+AS_UNSET([have_sha512_256_openssl])
+AS_UNSET([have_sha512_256_mbedtls])
# SHA-512/256 external vs internal check
AS_CASE([${enable_sha512_256}],[yes|tlslib],
[
@@ -7336,6 +7363,7 @@ AS_CASE([${enable_sha512_256}],[yes|tlslib],
[
AC_DEFINE([[MHD_SHA512_256_EXTR_OPENSSL]],[[1]],
[Define to 1 if libmicrohttpd is compiled with SHA-512/256 hashing by OpenSSL.])
+ have_sha512_256_openssl="yes"
found_sha512_256_tls="yes"
]
)
@@ -7380,6 +7408,7 @@ AS_CASE([${enable_sha512_256}],[yes|tlslib],
[
AC_DEFINE([[MHD_SHA512_EXTR_MBEDTLS]],[[1]],
[Define to 1 if libmicrohttpd is compiled with SHA-512 hashing by mbedTLS.])
+ have_sha512_256_mbedtls="yes"
found_sha512_256_tls="yes"
]
)
@@ -7391,7 +7420,11 @@ AS_CASE([${enable_sha512_256}],[yes|tlslib],
AS_IF([test "x$enable_sha512_256" = "xyes"],
[AS_VAR_IF([found_sha512_256_tls],["yes"],
[enable_sha512_256="tlslib"],
- [enable_sha512_256="builtin"]
+ [
+ enable_sha512_256="builtin"
+ AS_UNSET([have_sha512_256_openssl])
+ AS_UNSET([have_sha512_256_mbedtls])
+ ]
)],
[AS_VAR_IF([found_sha512_256_tls],["yes"],
[enable_sha256="tlslib"],
@@ -7427,9 +7460,9 @@ AS_IF([test "x${enable_sha512_256}" = "xtlslib" ],
]
)
AM_CONDITIONAL([MHD_SUPPORT_SHA512_256], [[test "x${enable_sha512_256}" = "xbuiltin" || test "x${enable_sha512_256}" = "xtlslib"]])
-AM_CONDITIONAL([MHD_SHA512_256_EXTR], [[test "x${found_sha512_256_tls}" = "xyes"]])
-AM_CONDITIONAL([MHD_SHA512_256_OPENSSL], [[test "x$mhd_cv_openssl_sha512_256" = "xyes"]])
-AM_CONDITIONAL([MHD_SHA512_MBEDTLS], [[test "x$mhd_cv_mbedtls_sha512" = "xyes"]])
+AM_CONDITIONAL([MHD_USE_SHA512_256_INTR], [[test "X${enable_sha512_256}" = "Xbuiltin"]])
+AM_CONDITIONAL([MHD_USE_SHA512_256_OPENSSL], [[test "X${have_sha512_256_openssl}" = "Xyes"]])
+AM_CONDITIONAL([MHD_USE_SHA512_256_MBEDTLS], [[test "X${have_sha512_256_mbedtls}" = "Xyes"]])
AC_MSG_RESULT([[${enable_sha512_256_MSG}]])
diff --git a/src/mhd2/Makefile.am b/src/mhd2/Makefile.am
@@ -156,71 +156,76 @@ auth_basic_OPTSOURCES = \
auth_basic.c auth_basic.h \
response_auth_basic.c
-if MHD_MD5_EXTR
- md5_OPTSOURCES = \
- md5_ext.h \
- mhd_md5.h
-if MHD_SUPPORT_OPENSSL
- md5_OPTSOURCES += \
- md5_ext_openssl.c
-else
-if MHD_SUPPORT_GNUTLS
- md5_OPTSOURCES += \
- md5_ext_gnutls.c
-else
- md5_OPTSOURCES += \
- md5_ext_mbedtls.c
+if MHD_USE_MD5_INTR
+md5_OPTSOURCES = \
+ md5_int.c md5_int.h \
+ mhd_md5.h
endif
+
+if MHD_USE_MD5_GNUTLS
+md5_OPTSOURCES = \
+ md5_ext.h mhd_md5.h \
+ md5_ext_gnutls.c
endif
-else
- md5_OPTSOURCES = \
- md5_int.c md5_int.h \
- mhd_md5.h
+
+if MHD_USE_MD5_OPENSSL
+md5_OPTSOURCES = \
+ md5_ext.h mhd_md5.h \
+ md5_ext_openssl.c
endif
-if MHD_SHA256_EXTR
- sha256_OPTSOURCES = \
- sha256_ext.h \
- mhd_sha256.h
+if MHD_USE_MD5_MBEDTLS
+md5_OPTSOURCES = \
+ md5_ext.h mhd_md5.h \
+ md5_ext_mbedtls.c
+endif
-if MHD_SUPPORT_OPENSSL
- sha256_OPTSOURCES += \
- sha256_ext_openssl.c
-else
-if MHD_SUPPORT_GNUTLS
- sha256_OPTSOURCES += \
- sha256_ext_gnutls.c
-else
- sha256_OPTSOURCES += \
- sha256_ext_mbedtls.c
+
+if MHD_USE_SHA256_INTR
+sha256_OPTSOURCES = \
+ sha256_int.c sha256_int.h \
+ mhd_sha256.h
endif
+
+if MHD_USE_SHA256_GNUTLS
+sha256_OPTSOURCES = \
+ sha256_ext.h mhd_sha256.h \
+ sha256_ext_gnutls.c
endif
-else
- sha256_OPTSOURCES = \
- sha256_int.c sha256_int.h \
- mhd_sha256.h
+if MHD_USE_SHA256_OPENSSL
+sha256_OPTSOURCES = \
+ sha256_ext.h mhd_sha256.h \
+ sha256_ext_openssl.c
endif
-if MHD_SHA512_256_EXTR
- sha512_256_OPTSOURCES = \
- sha512_256_ext.h \
- mhd_sha512_256.h
+if MHD_USE_SHA256_MBEDTLS
+sha256_OPTSOURCES = \
+ sha256_ext.h mhd_sha256.h \
+ sha256_ext_mbedtls.c
+endif
-if MHD_SUPPORT_OPENSSL
- sha256_OPTSOURCES += \
- sha512_256_ext_openssl.c
-else
- sha256_OPTSOURCES += \
- sha512_256_ext_mbedtls.c
+
+if MHD_USE_SHA512_256_INTR
+sha512_256_OPTSOURCES = \
+ sha512_256_int.c sha512_256_int.h \
+ mhd_sha256.h
endif
-else
- sha512_256_OPTSOURCES = \
- sha512_256_int.c sha512_256_int.h \
- mhd_sha512_256.h
+
+if MHD_USE_SHA512_256_OPENSSL
+sha512_256_OPTSOURCES = \
+ sha512_256_ext.h mhd_sha512_256.h \
+ sha512_256_ext_openssl.c
endif
+if MHD_USE_SHA512_256_MBEDTLS
+sha512_256_OPTSOURCES = \
+ sha512_256_ext.h mhd_sha512_256.h \
+ sha512_256_ext_mbedtls.c
+endif
+
+
auth_digest_OPTSOURCES = \
mhd_digest_auth_data.h mhd_auth_digest_hdr.h \
response_auth_digest.c response_auth_digest.h \
diff --git a/src/tests/unit/Makefile.am b/src/tests/unit/Makefile.am
@@ -105,49 +105,6 @@ unit_hpack_tables_combined_SOURCES = $(unit_hpack_tables_dynamic_SOURCES)
unit_md5_SOURCES = unit_md5.c
-if MHD_MD5_EXTR
-if MHD_SUPPORT_OPENSSL
-unit_md5_LDFLAGS = $(OPENSSL_LDFLAGS)
-unit_md5_LDADD = $(OPENSSL_LIBS)
-else
-if MHD_SUPPORT_GNUTLS
-unit_md5_LDFLAGS = $(GNUTLS_LDFLAGS)
-unit_md5_LDADD = $(GNUTLS_LIBS)
-else
-unit_md5_LDFLAGS = $(MBEDTLS_LDFLAGS)
-unit_md5_LDADD = -lmbedcrypto
-endif
-endif
-endif
-
-
unit_sha256_SOURCES = unit_sha256.c
-if MHD_SHA256_EXTR
-if MHD_SUPPORT_OPENSSL
-unit_sha256_LDFLAGS = $(OPENSSL_LDFLAGS)
-unit_sha256_LDADD = $(OPENSSL_LIBS)
-else
-if MHD_SUPPORT_GNUTLS
-unit_sha256_LDFLAGS = $(GNUTLS_LDFLAGS)
-unit_sha256_LDADD = $(GNUTLS_LIBS)
-else
-unit_sha256_LDFLAGS = $(MBEDTLS_LDFLAGS)
-unit_sha256_LDADD = -lmbedcrypto
-endif
-endif
-endif
-
-
unit_sha512_256_SOURCES = unit_sha512_256.c
-
-if MHD_SHA512_256_EXTR
-if MHD_SUPPORT_OPENSSL
-unit_sha512_256_LDFLAGS = $(OPENSSL_LDFLAGS)
-unit_sha512_256_LDADD = $(OPENSSL_LIBS)
-else
-# Must be mbedtls, gnutls is not supported.
-unit_sha512_256_LDFLAGS = $(MBEDTLS_LDFLAGS)
-unit_sha512_256_LDADD = -lmbedcrypto
-endif
-endif
