Unverified Commit 7207affe authored by Marcel Raad's avatar Marcel Raad
Browse files

cyassl: define build macros before including ssl.h 

cyassl/ssl.h needs the macros from cyassl/options.h, so define them
before including cyassl/ssl.h the first time, which happens in
urldata.h.
This broke the build on Ubuntu Xenial, which comes with WolfSSL 3.4.8
and therefore redefines the symbols from cyassl/options.h instead of
including the header.

Closes https://github.com/curl/curl/pull/1536
parent 5233de9a

lib/vtls/cyassl.c

+32 −32
Original line number Diff line number Diff line
@@ -44,6 +44,38 @@ and that's a problem since options.h hasn't been included yet. */ 
#include <cyassl/options.h>

#endif



/* To determine what functions are available we rely on one or both of:

   - the user's options.h generated by CyaSSL/wolfSSL

   - the symbols detected by curl's configure

   Since they are markedly different from one another, and one or the other may

   not be available, we do some checking below to bring things in sync. */



/* HAVE_ALPN is wolfSSL's build time symbol for enabling ALPN in options.h. */

#ifndef HAVE_ALPN

#ifdef HAVE_WOLFSSL_USEALPN

#define HAVE_ALPN

#endif

#endif



/* WOLFSSL_ALLOW_SSLV3 is wolfSSL's build time symbol for enabling SSLv3 in

   options.h, but is only seen in >= 3.6.6 since that's when they started

   disabling SSLv3 by default. */

#ifndef WOLFSSL_ALLOW_SSLV3

#if (LIBCYASSL_VERSION_HEX < 0x03006006) || \

    defined(HAVE_WOLFSSLV3_CLIENT_METHOD)

#define WOLFSSL_ALLOW_SSLV3

#endif

#endif



/* HAVE_SUPPORTED_CURVES is wolfSSL's build time symbol for enabling the ECC

   supported curve extension in options.h. Note ECC is enabled separately. */

#ifndef HAVE_SUPPORTED_CURVES

#if defined(HAVE_CYASSL_CTX_USESUPPORTEDCURVE) || \

    defined(HAVE_WOLFSSL_CTX_USESUPPORTEDCURVE)

#define HAVE_SUPPORTED_CURVES

#endif

#endif



#ifdef HAVE_LIMITS_H

#include <limits.h>

#endif
@@ -78,38 +110,6 @@ and that's a problem since options.h hasn't been included yet. */ 
#define CYASSL_MAX_ERROR_SZ 80

#endif



/* To determine what functions are available we rely on one or both of:

   - the user's options.h generated by CyaSSL/wolfSSL

   - the symbols detected by curl's configure

   Since they are markedly different from one another, and one or the other may

   not be available, we do some checking below to bring things in sync. */



/* HAVE_ALPN is wolfSSL's build time symbol for enabling ALPN in options.h. */

#ifndef HAVE_ALPN

#ifdef HAVE_WOLFSSL_USEALPN

#define HAVE_ALPN

#endif

#endif



/* WOLFSSL_ALLOW_SSLV3 is wolfSSL's build time symbol for enabling SSLv3 in

   options.h, but is only seen in >= 3.6.6 since that's when they started

   disabling SSLv3 by default. */

#ifndef WOLFSSL_ALLOW_SSLV3

#if (LIBCYASSL_VERSION_HEX < 0x03006006) || \

    defined(HAVE_WOLFSSLV3_CLIENT_METHOD)

#define WOLFSSL_ALLOW_SSLV3

#endif

#endif



/* HAVE_SUPPORTED_CURVES is wolfSSL's build time symbol for enabling the ECC

   supported curve extension in options.h. Note ECC is enabled separately. */

#ifndef HAVE_SUPPORTED_CURVES

#if defined(HAVE_CYASSL_CTX_USESUPPORTEDCURVE) || \

    defined(HAVE_WOLFSSL_CTX_USESUPPORTEDCURVE)

#define HAVE_SUPPORTED_CURVES

#endif

#endif



static Curl_recv cyassl_recv;

static Curl_send cyassl_send;