From: Karl Palsson <karlp@etactica.com>
Date: Mon, 6 Jun 2016 15:49:22 +0000 (+0000)
Subject: ustream-ssl: cyassl compatibility with build time options
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=17085b7abc0cd09c64ccace6f8d16ddee5729678;p=oweals%2Fustream-ssl.git

ustream-ssl: cyassl compatibility with build time options

Adds a HAVE_CYASSL definition to be consistent with polar/mbedtls.
Uses that definition to include the wolfssl build time options.
This enables the correct pullin of the "remainder" of the wolfssl openssl
compatibility options, if they were enabled in the build of wolfssl in the
first place.

Signed-off-by: Karl Palsson <karlp@etactica.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1c2b32..2ce9bf8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,7 @@ ELSEIF(CYASSL)
   IF (HAVE_CYASSL_VERSION_H)
     ADD_DEFINITIONS(-DHAVE_CYASSL_VERSION_H)
   ENDIF()
+  ADD_DEFINITIONS(-DHAVE_CYASSL)
   SET(SSL_SRC ustream-io-cyassl.c ustream-openssl.c)
   SET(SSL_LIB cyassl m)
 ELSE()
diff --git a/ustream-internal.h b/ustream-internal.h
index 020e1c6..4932a0d 100644
--- a/ustream-internal.h
+++ b/ustream-internal.h
@@ -26,6 +26,9 @@
 #elif defined(HAVE_POLARSSL)
 #include "ustream-polarssl.h"
 #else
+#if defined(HAVE_CYASSL)
+#include <wolfssl/options.h>
+#endif
 #include "ustream-openssl.h"
 #endif