generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cyassl: Fix include order

Browse Source 
Prior to this change CyaSSL's build options could redefine some generic
build symbols.

http://curl.haxx.se/mail/lib-2015-04/0069.html
This commit is contained in:
Jay Satiro 2015-04-17 15:22:48 -04:00
parent 8dc3bbf0f8
commit f70112522f
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/vtls/cyassl.c
View File

@ -30,6 +30,20 @@
#ifdef USE_CYASSL #ifdef USE_CYASSL
#define WOLFSSL_OPTIONS_IGNORE_SYS
/* CyaSSL's version.h, which should contain only the version, should come
before all other CyaSSL includes and be immediately followed by build config
aka options.h. http://curl.haxx.se/mail/lib-2015-04/0069.html */
#include <cyassl/version.h>
#if defined(HAVE_CYASSL_OPTIONS_H) && (LIBCYASSL_VERSION_HEX > 0x03004008)
#if defined(CYASSL_API) || defined(WOLFSSL_API)
/* Safety measure. If either is defined some API include was already included
and that's a problem since options.h hasn't been included yet. */
#error "CyaSSL API was included before the CyaSSL build options."
#endif
#include <cyassl/options.h>
#endif
#ifdef HAVE_LIMITS_H #ifdef HAVE_LIMITS_H
#include <limits.h> #include <limits.h>
#endif #endif
@ -45,12 +59,7 @@
#include "rawstr.h" #include "rawstr.h"
#include "curl_printf.h" #include "curl_printf.h"
/* The first CyaSSL include should be its build config aka options.h */
#ifdef HAVE_CYASSL_OPTIONS_H
#include <cyassl/options.h>
#endif
#include <cyassl/ssl.h> #include <cyassl/ssl.h>
#include <cyassl/version.h>
#ifdef HAVE_CYASSL_ERROR_SSL_H #ifdef HAVE_CYASSL_ERROR_SSL_H
#include <cyassl/error-ssl.h> #include <cyassl/error-ssl.h>
#else #else