Commit 1ff3a07b authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

wolfssl: handle builds without SSLv3 support

parent 15cb03ad

configure.ac

+7 −2
Original line number Diff line number Diff line
@@ -2166,11 +2166,11 @@ if test "$curl_ssl_msg" = "$init_ssl_msg"; then 
	]])

      ],[

         AC_MSG_RESULT(yes)

         AC_DEFINE(USE_CYASSL, 1, [if CyaSSL is enabled])

         AC_DEFINE(USE_CYASSL, 1, [if CyaSSL/WolfSSL is enabled])

         AC_SUBST(USE_CYASSL, [1])

         CYASSL_ENABLED=1

         USE_CYASSL="yes"

         curl_ssl_msg="enabled (CyaSSL)"

         curl_ssl_msg="enabled (WolfSSL)"

       ],

       [

         AC_MSG_RESULT(no)
@@ -2195,6 +2195,11 @@ if test "$curl_ssl_msg" = "$init_ssl_msg"; then 


      LIBS="-l$cyassllibname -lm $LIBS"



      if test "x$cyassllib" = "xwolfssl"; then

        dnl Recent WolfSSL versions build without SSLv3 by default

        AC_CHECK_FUNCS(wolfSSLv3_client_method)

      fi



      if test -n "$cyassllib"; then

        dnl when shared libs were found in a path that the run-time

        dnl linker doesn't search through, we need to add it to

lib/vtls/cyassl.c

+7 −0
Original line number Diff line number Diff line
@@ -143,8 +143,15 @@ cyassl_connect_step1(struct connectdata *conn, 
    use_sni(TRUE);

    break;

  case CURL_SSLVERSION_SSLv3:

    /* before WolfSSL SSLv3 was enabled by default, and starting in WolfSSL

       we check for its presence since it is built without it by default */

#if !defined(WOLFSSL_VERSION) || defined(HAVE_WOLFSSLV3_CLIENT_METHOD)

    req_method = SSLv3_client_method();

    use_sni(FALSE);

#else

    failf(data, "No support for SSLv3");

    return CURLE_NOT_BUILT_IN;

#endif

    break;

  case CURL_SSLVERSION_SSLv2:

    failf(data, "CyaSSL does not support SSLv2");