From a37caf0ae545ac26730e50ae0eb613025050e4a8 Mon Sep 17 00:00:00 2001
From: "7u83@mail.ru" <7u83@mail.ru@noemail.net>
Date: Sat, 7 Mar 2020 08:34:33 +0000
Subject: [PATCH] Get it work under FreeBSD

FossilOrigin-Name: dbf6c9aef90847e18cdbac6b9212e1195f702f380759bd9abf41d6e247fe6df5
---
 src/CWConfig.mak      | 4 ++--
 src/WtpConfig.mak     | 2 +-
 src/cw/dtls_openssl.c | 4 ++--
 src/wtp/Makefile      | 6 +++---
 src/wtp/cisco.ktv     | 4 ++--
 src/wtp/wtp_main.c    | 2 +-
 ssl/mkcert.sh         | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/CWConfig.mak b/src/CWConfig.mak
index d732e038..db77ffd9 100644
--- a/src/CWConfig.mak
+++ b/src/CWConfig.mak
@@ -1,4 +1,4 @@
 include ../Config.mak
 
-WITH_GNUTLS=1
-WITH_OPENSSL=0
+WITH_GNUTLS=0
+WITH_OPENSSL=1
diff --git a/src/WtpConfig.mak b/src/WtpConfig.mak
index 2aa1d3b2..bcf8984e 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=GNUTLS
+SSL_LIBRARY=OPENSSL
 
 CFLAGS += -I/usr/include/libnl3
 CFLAGS += -I../contrib/uci
diff --git a/src/cw/dtls_openssl.c b/src/cw/dtls_openssl.c
index c1f5839a..bc64630d 100644
--- a/src/cw/dtls_openssl.c
+++ b/src/cw/dtls_openssl.c
@@ -329,10 +329,10 @@ struct dtls_openssl_data * dtls_openssl_data_create(struct conn * conn, const SS
 	}
 
 	/* set dtls psk if exists */
-	if (conn->dtls_psk)
+/*	if (conn->dtls_psk)
 		SSL_CTX_set_psk_server_callback( d->ctx, psk_server_cb);
 
-
+*/
 
 	/* setup certificates */
 	rc = dtls_openssl_set_certs(conn,d);
diff --git a/src/wtp/Makefile b/src/wtp/Makefile
index e855b212..c4d6f24f 100644
--- a/src/wtp/Makefile
+++ b/src/wtp/Makefile
@@ -12,7 +12,7 @@ LIBARCHDIR	:= $(LIBDIR)/$(ARCH)
 OBJDIR		:= ../../obj/wtp/$(ARCH)
 EXENAME		:= ./wtp
 
-LIBS		:= -lcw
+LIBS		:= -lcw -lnettle
 #STATICLIBS	:= $(LIBDIR)/$(ARCH)/libcw.a
 LDFLAGS		+= -L$(LIBARCHDIR)
 
@@ -48,8 +48,8 @@ $(OBJDIR)/%.o:%.c
 	@$(CC) -c $(CFLAGS) $< -o $@
 
 $(EXENAME): $(OBJS)
-	@echo "  $(LD) $(EXENAME)"
-	@$(LD) $(LDFLAGS) -o $(EXENAME) $(OBJS) $(LIBS) $(STATICLIBS)
+	echo "  $(LD) $(EXENAME)"
+	$(LD) $(LDFLAGS) -o $(EXENAME) $(OBJS) $(LIBS) $(STATICLIBS)
 
 
 clean: 
diff --git a/src/wtp/cisco.ktv b/src/wtp/cisco.ktv
index 420aadfc..062bb0c5 100644
--- a/src/wtp/cisco.ktv
+++ b/src/wtp/cisco.ktv
@@ -99,9 +99,9 @@ cisco/rouge-and-mss/tcp-adjust-mss :Word: 0
 cisco/rouge-detection/rest :Bstr16: .x000aff800000
 cisco/rouge-detection/rouge-detection :Bool: false
 cisco/sig-toogle :Bool: true
-cisco/ssl-certfile :Str: ../../ssl/certs/wtpc.crt
+cisco/ssl-certfile :Str: ../../ssl/certs/wtp.crt
 cisco/ssl-cipher :Str: ALL
-cisco/ssl-keyfile :Str: ../../ssl/certs/wtpc.key
+cisco/ssl-keyfile :Str: ../../ssl/certs/wtp.key
 cisco/vlan/id :Word: 0
 cisco/vlan/tagging :Bool: false
 cisco/wtp-board-data/card-id :Word: 0
diff --git a/src/wtp/wtp_main.c b/src/wtp/wtp_main.c
index 734aca51..27ae910e 100644
--- a/src/wtp/wtp_main.c
+++ b/src/wtp/wtp_main.c
@@ -194,7 +194,7 @@ exit(0);
 	cw_discovery_init_results(&dis);
 /*cw_run_discovery(conn, "255.255.255.255","192.168.56.1", &dis);*/
 /*	cw_run_discovery(conn, "255.255.255.255",NULL, &dis);*/
-	cw_run_discovery(conn, "255.255.255.255","192.168.0.14", &dis);
+	cw_run_discovery(conn, "192.168.0.161","192.168.0.29", &dis);
 
 	cw_dbg_ktv_dump(dis.prio_ip, DBG_INFO, "=== IP list ===", "IP", "=== END IP List ===");
 
diff --git a/ssl/mkcert.sh b/ssl/mkcert.sh
index 51b6b3cf..e1c5f0a9 100755
--- a/ssl/mkcert.sh
+++ b/ssl/mkcert.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 KEYSIZE=2048
 #OPENSSL="../src/contrib/openssl-1.0.1i/apps/openssl"