configure.ac: don't include enable_ocsp_responder in enable-all if $enable_sha = no, remove enable_ocsp_responder from enable-all-crypto setup, and remove superseded fixup clause for ENABLED_OCSP_RESPONDER with ENABLED_SHA = no.

.wolfssl_known_macro_extras: remove unneeded WOLFSSL_PYTHON.
This commit is contained in:
Daniel Pouzzner
2026-03-16 10:20:48 -05:00
parent 8f810c2705
commit 49796a5159
2 changed files with 5 additions and 13 deletions
-1
View File
@@ -866,7 +866,6 @@ WOLFSSL_PSK_IDENTITY_ALERT
WOLFSSL_PSK_ID_PROTECTION
WOLFSSL_PSK_MULTI_ID_PER_CS
WOLFSSL_PSK_TLS13_CB
WOLFSSL_PYTHON
WOLFSSL_RENESAS_FSPSM_CRYPT_ONLY
WOLFSSL_RENESAS_RA6M3
WOLFSSL_RENESAS_RA6M3G
+5 -12
View File
@@ -1211,7 +1211,11 @@ then
test "$enable_ocsp" = "" && enable_ocsp=yes
test "$enable_ocspstapling" = "" && test "$enable_ocsp" != "no" && enable_ocspstapling=yes
test "$enable_ocspstapling2" = "" && test "$enable_ocsp" != "no" && enable_ocspstapling2=yes
test "$enable_ocsp_responder" = "" && test "$enable_ocsp" != "no" && test "$ASN_IMPL" = "template" && enable_ocsp_responder=yes
test "$enable_ocsp_responder" = "" &&
test "$enable_ocsp" != "no" &&
test "$enable_sha" != "no" &&
test "$ASN_IMPL" = "template" &&
enable_ocsp_responder=yes
test "$enable_savesession" = "" && enable_savesession=yes
test "$enable_savecert" = "" && enable_savecert=yes
test "$enable_postauth" = "" && enable_postauth=yes
@@ -1485,7 +1489,6 @@ then
test "$enable_ocsp" = "" && enable_ocsp=yes
test "$enable_ocspstapling" = "" && test "$enable_ocsp" != "no" && enable_ocspstapling=yes
test "$enable_ocspstapling2" = "" && test "$enable_ocsp" != "no" && enable_ocspstapling2=yes
test "$enable_ocsp_responder" = "" && test "$enable_ocsp" != "no" && test "$ASN_IMPL" = "template" && enable_ocsp_responder=yes
test "$enable_crl" = "" && enable_crl=yes
test "$enable_supportedcurves" = "" && enable_supportedcurves=yes
test "$enable_tlsx" = "" && enable_tlsx=yes
@@ -10701,16 +10704,6 @@ AS_IF([test "x$ENABLED_CMAC" = "xyes" && \
test "x$ENABLED_AES" = "xno"],
[AC_MSG_ERROR([cannot use CMAC without AES.])])
# OCSP responder requires SHA-1. Auto disable for --enable-all or
# --enable-all-crypto when SHA-1 was disabled.
AS_IF([test "x$ENABLED_OCSP_RESPONDER" = "xyes" && \
test "x$ENABLED_SHA" = "xno"],
[AS_IF([test "x$ENABLED_ALL" = "xyes" || \
test "x$ENABLED_ALL_CRYPT" = "xyes"],
[AC_MSG_WARN([Disabling OCSP responder because SHA-1 is disabled (--disable-sha).])
ENABLED_OCSP_RESPONDER="no"],
[AC_MSG_ERROR([--enable-ocsp-responder requires SHA-1; remove --disable-sha or disable OCSP responder.])])])
# certreq requires certgen
AS_IF([test "x$ENABLED_CERT_REQ" = "xyes" && \
test "x$ENABLED_CERT_GEN" = "xno"],