diff --git a/src/Config.mak b/src/Config.mak index e0e4bf3f..96899acc 100644 --- a/src/Config.mak +++ b/src/Config.mak @@ -36,4 +36,6 @@ LIBDIR=lib OPTFLAGS := -g -O0 CFLAGS := -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE=1 -pedantic -std=c90 -Wall - + + +SSL_LIBRARY:=GNUTLS diff --git a/src/cw/dtls_gnutls.h b/src/cw/dtls_gnutls.h index a9f22f9b..6979bd34 100644 --- a/src/cw/dtls_gnutls.h +++ b/src/cw/dtls_gnutls.h @@ -35,6 +35,8 @@ const char * dtls_gnutls_get_cipher(struct conn * conn, char * dst); struct dtls_ssl_cert dtls_gnutls_get_peers_cert(struct conn * conn,unsigned int n); extern int dtls_gnutls_shutdown(struct conn *conn); +#define CAPWAP_CIPHER "+RSA:+AES-128-CBC:+SHA1:" + /* functions used only by capwap libray */ diff --git a/src/mod/Mod.mak b/src/mod/Mod.mak index 5283a222..649804eb 100644 --- a/src/mod/Mod.mak +++ b/src/mod/Mod.mak @@ -9,6 +9,15 @@ OBJS:=$(patsubst %.o,$(OBJDIR)/%.o,$(OBJS)) CFLAGS+= -I ../../ -I../ -I../../include +ifeq ($(SSL_LIBRARY),GNUTLS) +CFLAGS+=-DWITH_GNUTLS +endif + +ifeq ($(SSL_LIBRARY),OPENSSL) +CFLAGS+=-DWITH_OPENSSL +endif + + SRCS = $(OBJS:.o=.c) diff --git a/src/mod/capwap/mod_capwap_ac.c b/src/mod/capwap/mod_capwap_ac.c index 450ed295..77cfa0d2 100644 --- a/src/mod/capwap/mod_capwap_ac.c +++ b/src/mod/capwap/mod_capwap_ac.c @@ -4,7 +4,7 @@ #include "cw/dbg.h" #include "cw/ktv.h" #include "cw/keys.h" - +#include "cw/dtls.h" #include "mod_capwap.h" diff --git a/src/mod/cisco/mod_cisco_ac.c b/src/mod/cisco/mod_cisco_ac.c index 8c5af192..4e47ac0c 100644 --- a/src/mod/cisco/mod_cisco_ac.c +++ b/src/mod/cisco/mod_cisco_ac.c @@ -4,7 +4,7 @@ #include "cw/mod.h" #include "cw/log.h" #include "cw/dbg.h" - +#include "cw/dtls.h" /*#include "mod_cisco.h"*/ @@ -221,4 +221,4 @@ struct cw_Mod *mod_cisco() { return &cisco_data; } -*/ \ No newline at end of file +*/