Skip to content

Commit 2f6524c

Browse files
committed
acinclude: --with-ca-fallback only works with OpenSSL
Make it error if another TLS backend is used. Also tweaked the documentation for it to make it more clear it is only for OpenSSL. Follow-up to 9cf4759 Reported-by: Michael Osipov Fixes #18362 Closes #18364
1 parent 806d97d commit 2f6524c

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

acinclude.m4

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,10 +1242,10 @@ AS_HELP_STRING([--without-ca-path], [Don't use a default CA path]),
12421242
AC_MSG_RESULT([no])
12431243
fi
12441244
1245-
AC_MSG_CHECKING([whether to use built-in CA store of SSL library])
1245+
AC_MSG_CHECKING([whether to use OpenSSL's built-in CA store])
12461246
AC_ARG_WITH(ca-fallback,
1247-
AS_HELP_STRING([--with-ca-fallback], [Use the built-in CA store of the SSL library])
1248-
AS_HELP_STRING([--without-ca-fallback], [Don't use the built-in CA store of the SSL library]),
1247+
AS_HELP_STRING([--with-ca-fallback], [Use OpenSSL's built-in CA store])
1248+
AS_HELP_STRING([--without-ca-fallback], [Don't use OpenSSL's built-in CA store]),
12491249
[
12501250
if test "x$with_ca_fallback" != "xyes" -a "x$with_ca_fallback" != "xno"; then
12511251
AC_MSG_ERROR([--with-ca-fallback only allows yes or no as parameter])
@@ -1254,10 +1254,10 @@ AS_HELP_STRING([--without-ca-fallback], [Don't use the built-in CA store of the
12541254
[ with_ca_fallback="no"])
12551255
AC_MSG_RESULT([$with_ca_fallback])
12561256
if test "x$with_ca_fallback" = "xyes"; then
1257-
if test "x$OPENSSL_ENABLED" != "x1" -a "x$GNUTLS_ENABLED" != "x1"; then
1258-
AC_MSG_ERROR([--with-ca-fallback only works with OpenSSL or GnuTLS])
1257+
if test "x$OPENSSL_ENABLED" != "x1"; then
1258+
AC_MSG_ERROR([--with-ca-fallback only works with OpenSSL])
12591259
fi
1260-
AC_DEFINE_UNQUOTED(CURL_CA_FALLBACK, 1, [define "1" to use built-in CA store of SSL library])
1260+
AC_DEFINE_UNQUOTED(CURL_CA_FALLBACK, 1, [define "1" to use OpenSSL's built-in CA store])
12611261
fi
12621262
])
12631263

0 commit comments

Comments
 (0)