From 004759a4c80e71235a3f6b39fe6e229fab187b31 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 8 Mar 2020 00:28:20 +0000 Subject: [PATCH] Uses GNUTLS again FossilOrigin-Name: 2f28b0fd2ce8d456d32b0e7952ca02965f97e784faef283ea1080da169f19f0a --- src/CWConfig.mak | 2 +- src/Config.mak | 2 +- src/WtpConfig.mak | 2 +- src/wtp/cisco.ktv | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CWConfig.mak b/src/CWConfig.mak index db77ffd9..1f71fdb0 100644 --- a/src/CWConfig.mak +++ b/src/CWConfig.mak @@ -1,4 +1,4 @@ include ../Config.mak -WITH_GNUTLS=0 +WITH_GNUTLS=1 WITH_OPENSSL=1 diff --git a/src/Config.mak b/src/Config.mak index a8994f2a..96899acc 100644 --- a/src/Config.mak +++ b/src/Config.mak @@ -28,7 +28,7 @@ COMPDEFS+=-DWITH_CW_LOG_DEBUG WITH_GNUTLS=1 # Compile in openssl support -WITH_OPENSSL=0 +WITH_OPENSSL=1 # # diff --git a/src/WtpConfig.mak b/src/WtpConfig.mak index bcf8984e..2aa1d3b2 100644 --- a/src/WtpConfig.mak +++ b/src/WtpConfig.mak @@ -4,7 +4,7 @@ include ../Config.mak # Define witch SSL library to use # OPENSSL or GNUTLS # -SSL_LIBRARY=OPENSSL +SSL_LIBRARY=GNUTLS CFLAGS += -I/usr/include/libnl3 CFLAGS += -I../contrib/uci diff --git a/src/wtp/cisco.ktv b/src/wtp/cisco.ktv index 062bb0c5..8058ac93 100644 --- a/src/wtp/cisco.ktv +++ b/src/wtp/cisco.ktv @@ -100,7 +100,7 @@ cisco/rouge-detection/rest :Bstr16: .x000aff800000 cisco/rouge-detection/rouge-detection :Bool: false cisco/sig-toogle :Bool: true cisco/ssl-certfile :Str: ../../ssl/certs/wtp.crt -cisco/ssl-cipher :Str: ALL +cisco/ssl-cipher :Str: NORMAL cisco/ssl-keyfile :Str: ../../ssl/certs/wtp.key cisco/vlan/id :Word: 0 cisco/vlan/tagging :Bool: false