Skip to content

Commit 49796a5

Browse files
committed
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.
1 parent 8f810c2 commit 49796a5

2 files changed

Lines changed: 5 additions & 13 deletions

File tree

.wolfssl_known_macro_extras

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,6 @@ WOLFSSL_PSK_IDENTITY_ALERT
866866
WOLFSSL_PSK_ID_PROTECTION
867867
WOLFSSL_PSK_MULTI_ID_PER_CS
868868
WOLFSSL_PSK_TLS13_CB
869-
WOLFSSL_PYTHON
870869
WOLFSSL_RENESAS_FSPSM_CRYPT_ONLY
871870
WOLFSSL_RENESAS_RA6M3
872871
WOLFSSL_RENESAS_RA6M3G

configure.ac

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,7 +1211,11 @@ then
12111211
test "$enable_ocsp" = "" && enable_ocsp=yes
12121212
test "$enable_ocspstapling" = "" && test "$enable_ocsp" != "no" && enable_ocspstapling=yes
12131213
test "$enable_ocspstapling2" = "" && test "$enable_ocsp" != "no" && enable_ocspstapling2=yes
1214-
test "$enable_ocsp_responder" = "" && test "$enable_ocsp" != "no" && test "$ASN_IMPL" = "template" && enable_ocsp_responder=yes
1214+
test "$enable_ocsp_responder" = "" &&
1215+
test "$enable_ocsp" != "no" &&
1216+
test "$enable_sha" != "no" &&
1217+
test "$ASN_IMPL" = "template" &&
1218+
enable_ocsp_responder=yes
12151219
test "$enable_savesession" = "" && enable_savesession=yes
12161220
test "$enable_savecert" = "" && enable_savecert=yes
12171221
test "$enable_postauth" = "" && enable_postauth=yes
@@ -1485,7 +1489,6 @@ then
14851489
test "$enable_ocsp" = "" && enable_ocsp=yes
14861490
test "$enable_ocspstapling" = "" && test "$enable_ocsp" != "no" && enable_ocspstapling=yes
14871491
test "$enable_ocspstapling2" = "" && test "$enable_ocsp" != "no" && enable_ocspstapling2=yes
1488-
test "$enable_ocsp_responder" = "" && test "$enable_ocsp" != "no" && test "$ASN_IMPL" = "template" && enable_ocsp_responder=yes
14891492
test "$enable_crl" = "" && enable_crl=yes
14901493
test "$enable_supportedcurves" = "" && enable_supportedcurves=yes
14911494
test "$enable_tlsx" = "" && enable_tlsx=yes
@@ -10701,16 +10704,6 @@ AS_IF([test "x$ENABLED_CMAC" = "xyes" && \
1070110704
test "x$ENABLED_AES" = "xno"],
1070210705
[AC_MSG_ERROR([cannot use CMAC without AES.])])
1070310706
10704-
# OCSP responder requires SHA-1. Auto disable for --enable-all or
10705-
# --enable-all-crypto when SHA-1 was disabled.
10706-
AS_IF([test "x$ENABLED_OCSP_RESPONDER" = "xyes" && \
10707-
test "x$ENABLED_SHA" = "xno"],
10708-
[AS_IF([test "x$ENABLED_ALL" = "xyes" || \
10709-
test "x$ENABLED_ALL_CRYPT" = "xyes"],
10710-
[AC_MSG_WARN([Disabling OCSP responder because SHA-1 is disabled (--disable-sha).])
10711-
ENABLED_OCSP_RESPONDER="no"],
10712-
[AC_MSG_ERROR([--enable-ocsp-responder requires SHA-1; remove --disable-sha or disable OCSP responder.])])])
10713-
1071410707
# certreq requires certgen
1071510708
AS_IF([test "x$ENABLED_CERT_REQ" = "xyes" && \
1071610709
test "x$ENABLED_CERT_GEN" = "xno"],

0 commit comments

Comments
 (0)