From 93cb64ca6fea99e465adb4c5b4f57a84d3c99458 Mon Sep 17 00:00:00 2001 From: Andreas Schultz Date: Thu, 4 Feb 2016 14:59:55 +0100 Subject: [PATCH] convert (partially) to wolfssl --- build/ac/Makefile.am | 4 ++-- build/wtp/Makefile.am | 4 ++-- configure.ac | 6 +++--- src/common/capwap_dtls.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/ac/Makefile.am b/build/ac/Makefile.am index d17239d..8cbe36f 100755 --- a/build/ac/Makefile.am +++ b/build/ac/Makefile.am @@ -26,7 +26,7 @@ AM_CFLAGS = -DCAPWAP_MULTITHREADING_ENABLE \ -D_GNU_SOURCE \ ${LIBNL_CFLAGS} \ $(LIBXML2_CFLAGS) \ - $(CYASSL_CFLAGS) + $(WOLFSSL_CFLAGS) AM_CFLAGS += -I$(top_srcdir)/build \ -I$(top_srcdir)/src/common \ @@ -86,5 +86,5 @@ ac_LDADD = $(CONFIG_LIBS) \ $(PTHREAD_LIBS) \ $(LIBXML2_LIBS) \ $(LIBJSON_LIBS) \ - $(CYASSL_LIBS) \ + $(WOLFSSL_LIBS) \ $(LIBNL_LIBS) diff --git a/build/wtp/Makefile.am b/build/wtp/Makefile.am index c61662f..67c08c5 100755 --- a/build/wtp/Makefile.am +++ b/build/wtp/Makefile.am @@ -26,7 +26,7 @@ AM_CFLAGS = -D_REENTRANT \ ${LIBNL_CFLAGS} if DTLS_ENABLED -AM_CFLAGS += $(CYASSL_CFLAGS) +AM_CFLAGS += $(WOLFSSL_CFLAGS) endif AM_CFLAGS += -I$(top_srcdir)/build \ @@ -62,7 +62,7 @@ wtp_LDADD = $(CONFIG_LIBS) \ $(LIBNL_LIBS) if DTLS_ENABLED -wtp_LDADD += $(CYASSL_LIBS) +wtp_LDADD += $(WOLFSSL_LIBS) endif if BUILD_WTP_WIFI_DRIVERS_NL80211 diff --git a/configure.ac b/configure.ac index fe9b12a..fc15de5 100644 --- a/configure.ac +++ b/configure.ac @@ -180,11 +180,11 @@ AC_CHECK_HEADER([pthread.h], [], [AC_MSG_ERROR(You need the pthread headers)]) AC_CHECK_LIB([pthread], [pthread_create], [PTHREAD_LIBS="-lpthread"], [AC_MSG_ERROR(You need the pthread library)]) # Check SSL library -PKG_CHECK_MODULES([CYASSL], [cyassl >= 3.0.0], [have_cyassl_ssl="yes"], [have_cyassl_ssl="no"]) +PKG_CHECK_MODULES([WOLFSSL], [wolfssl >= 3.0.0], [have_wolfssl_ssl="yes"], [have_wolfssl_ssl="no"]) # Check JSON library if test "${enable_ac}" = "yes"; then - test "x${have_cyassl_ssl}" != "xyes" && AC_MSG_ERROR(You need the cyassl library) + test "x${have_wolfssl_ssl}" != "xyes" && AC_MSG_ERROR(You need the wolfssl library) PKG_CHECK_MODULES( [LIBJSON], @@ -228,7 +228,7 @@ fi AM_CONDITIONAL([BUILD_WTP_WIFI_DRIVERS_NL80211], [test "${enable_wifi_drivers_nl80211}" = "yes"]) if test "${enable_dtls}" = "yes"; then - test "x${have_cyassl_ssl}" != "xyes" && AC_MSG_ERROR(You need the cyassl library) + test "x${have_wolfssl_ssl}" != "xyes" && AC_MSG_ERROR(You need the wolfssl library) AC_DEFINE([ENABLE_DTLS], [1], [Enable DTLS]) fi diff --git a/src/common/capwap_dtls.c b/src/common/capwap_dtls.c index c2f70be..383f96b 100644 --- a/src/common/capwap_dtls.c +++ b/src/common/capwap_dtls.c @@ -1,7 +1,7 @@ #include "capwap.h" #include "capwap_dtls.h" #include "capwap_protocol.h" -#include +#include #include #include