From 991ddaadfcfe6845269c7bb43258ded6ef7a4f89 Mon Sep 17 00:00:00 2001 From: Anthony Hu Date: Wed, 22 Dec 2021 17:34:58 -0500 Subject: [PATCH 1/3] Add a --enable-curl build option --- configure.ac | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/configure.ac b/configure.ac index ef20fc2f1..b550b7007 100644 --- a/configure.ac +++ b/configure.ac @@ -607,6 +607,7 @@ then then # these use DES3: test "$enable_stunnel" = "" && enable_stunnel=yes + test "$enable_curl" = "" && enable_curl=yes test "$enable_tcpdump" = "" && enable_tcpdump=yes test "$enable_eccsi" = "" && enable_eccsi=yes @@ -908,6 +909,7 @@ AC_ARG_ENABLE([mcast], # lighty (--enable-lighty) HAVE_LIGHTY # rsyslog (--enable-rsyslog) # stunnel (--enable-stunnel) HAVE_STUNNEL +# curl (--enable-curl) HAVE_CURL # libest (--enable-libest) HAVE_LIBEST # asio (--enable-asio) WOLFSSL_ASIO # libwebsockets (--enable-libwebsockets) WOLFSSL_LIBWEBSOCKETS @@ -5077,6 +5079,27 @@ then AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_DES_ECB -DWOLFSSL_SIGNER_DER_CERT" fi +# curl Support +AC_ARG_ENABLE([curl], + [AS_HELP_STRING([--enable-curl],[Enable curl (default: disabled)])], + [ ENABLED_CURL=$enableval ], + [ ENABLED_CURL=no ] + ) +# curl support requires all the features enabled within this conditional. +if test "$ENABLED_CURL" = "yes" +then + if test "x$ENABLED_DES3" = "xno" + then + ENABLED_DES3="yes" + fi + + if test "x$ENABLED_OPENSSLEXTRA" = "xno" && test "x$ENABLED_OPENSSLCOEXIST" = "xno" + then + ENABLED_OPENSSLEXTRA="yes" + fi + AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_DES_ECB" +fi + if test "$ENABLED_PSK" = "no" && test "$ENABLED_LEANPSK" = "no" \ && test "x$ENABLED_STUNNEL" = "xno" then From 8eea17d92a719851b32c2502ce650c568a2d8872 Mon Sep 17 00:00:00 2001 From: Anthony Hu Date: Thu, 23 Dec 2021 17:27:25 -0500 Subject: [PATCH 2/3] More stuff, probably not complete yet --- configure.ac | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/configure.ac b/configure.ac index b550b7007..a5bdf78c9 100644 --- a/configure.ac +++ b/configure.ac @@ -5093,10 +5093,45 @@ then ENABLED_DES3="yes" fi + if test "x$ENABLED_ALPN" = "xno" + then + ENABLED_ALPN="yes" + fi + + if test "x$ENABLED_WOLFSSH" = "xno" + then + ENABLED_WOLFSSH="yes" + fi + if test "x$ENABLED_OPENSSLEXTRA" = "xno" && test "x$ENABLED_OPENSSLCOEXIST" = "xno" then ENABLED_OPENSSLEXTRA="yes" fi + + if test "x$ENABLED_CRL" = "xno" + then + ENABLED_CRL="yes" + AM_CFLAGS="$AM_CFLAGS -DHAVE_CRL" + fi + + if test "x$ENABLED_OCSP" = "xno" + then + ENABLED_OCSP="yes" + AM_CFLAGS="$AM_CFLAGS -DHAVE_OCSP" + fi + + if test "x$ENABLED_CERTIFICATE_STATUS_REQUEST" = "xno" + then + ENABLED_CERTIFICATE_STATUS_REQUEST="yes" + AM_CFLAGS="$AM_CFLAGS -DHAVE_TLS_EXTENSIONS -DHAVE_CERTIFICATE_STATUS_REQUEST" + fi + + if test "x$ENABLED_CERTIFICATE_STATUS_REQUEST_V2" = "xno" + then + ENABLED_CERTIFICATE_STATUS_REQUEST_V2="yes" + AM_CFLAGS="$AM_CFLAGS -DHAVE_TLS_EXTENSIONS -DHAVE_CERTIFICATE_STATUS_REQUEST_V2" + fi + AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_DES_ECB" fi From 69733e87c527155cd1fabc18a75bf45f148d47d0 Mon Sep 17 00:00:00 2001 From: Anthony Hu Date: Wed, 29 Dec 2021 12:50:50 -0500 Subject: [PATCH 3/3] SNI and ALT_CERT_CHAINS --- configure.ac | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/configure.ac b/configure.ac index a5bdf78c9..523f67cb2 100644 --- a/configure.ac +++ b/configure.ac @@ -5132,6 +5132,18 @@ then AM_CFLAGS="$AM_CFLAGS -DHAVE_TLS_EXTENSIONS -DHAVE_CERTIFICATE_STATUS_REQUEST_V2" fi + if test "x$ENABLED_SNI" = "xno" + then + ENABLED_SNI="yes" + AM_CFLAGS="$AM_CFLAGS -DHAVE_TLS_EXTENSIONS -DHAVE_SNI" + fi + + if test "x$ENABLED_ALT_CERT_CHAINS" = "xno" + then + ENABLED_ALT_CERT_CHAINS="yes" + AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ALT_CERT_CHAINS" + fi + AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_DES_ECB" fi