convert (partially) to wolfssl

This commit is contained in:
Andreas Schultz 2016-02-04 14:59:55 +01:00
parent 7e0b977fcd
commit 93cb64ca6f
4 changed files with 8 additions and 8 deletions

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -1,7 +1,7 @@
#include "capwap.h"
#include "capwap_dtls.h"
#include "capwap_protocol.h"
#include <cyassl/options.h>
#include <wolfssl/options.h>
#include <cyassl/ssl.h>
#include <cyassl/ctaocrypt/sha.h>