planix.org/actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use bsd makefiles

Browse Source
This commit is contained in:
7u83
2022-07-10 12:25:14 +02:00
parent 330b8a9d87
commit ddde491ba8
10 changed files with 106 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/cw/Makefile
View File

@ -241,6 +241,22 @@ RADIOSRC=\
cw_read_radio_generic.c\
#DTLSSRC += dtls_openssl.c \
# dtls_openssl_accept.c \
# dtls_openssl_connect.c \
# dtls_openssl_get_cipher.c \
# dtls_openssl_bio.c
#LIBS+=-lssl
DTLSSRC+= dtls_gnutls.c \
dtls_gnutls_accept.c \
dtls_gnutls_connect.c \
dtls_gnutls_bio.c \
dtls_gnutls_get_cipher.c \
dtls_gnutls_get_peers_cert.c
LIBS+=-lgnutls
#SRC=$(wildcard *.c)
SOURCES = $(CWSRC) $(LWSRC) $(MAVLSRC) $(MLISTSRC) $(SOCKSRC) $(LOGSRC) $(DTLSSRC) $(RADIOSRC) $(KTVSRC) $(MISCSRC)

12
src/cw/capwap.h
View File

@ -394,14 +394,12 @@
//#define CAPWAP_CIPHER "AES128-SHA"
*/
/*
#ifdef WITH_GNUTLS
#define CAPWAP_CIPHER "+RSA:+AES-128-CBC:+SHA1:"
#ifdef USE_OPENSSL
#define CAPWAP_CIPHER "ALL"
#else
#define CAPWAP_CIPHER "+RSA:+AES-128-CBC:+SHA1:"
#endif
#ifdef WITH_OPENSSL
#define CAPWAP_CIPHER "ALL"
#endif
*/
/**

18
src/cw/dtls.h
View File

@ -24,7 +24,14 @@
#if WITH_GNUTLS
#ifdef USE_OPENSSL
#include "dtls_openssl.h"
#define dtls_init dtls_openssl_init
#define dtls_accept dtls_openssl_accept
#define dtls_connect dtls_openssl_connect
#define dtls_shutdown dtls_openssl_shutdown
#define dtls_get_cipher dtls_openssl_get_cipher
#else
#include "dtls_gnutls.h"
#define dtls_init dtls_gnutls_init
#define dtls_accept dtls_gnutls_accept
@ -34,15 +41,6 @@
#define dtls_get_peers_cert dtls_gnutls_get_peers_cert
#endif
#if WITH_OPENSSL
#include "dtls_openssl.h"
#define dtls_init dtls_openssl_init
#define dtls_accept dtls_openssl_accept
#define dtls_connect dtls_openssl_connect
#define dtls_shutdown dtls_openssl_shutdown
#define dtls_get_cipher dtls_openssl_get_cipher
#endif
#endif

7
src/cw/dtls_openssl_bio.c
View File

@ -37,9 +37,11 @@
BIO_METHOD *dtls_openssl_bio_method()
{
static BIO_METHOD bio_methods;
BIO_METHOD * bio_methods;
bio_methods = BIO_mth_new(BIO_TYPE_DGRAM,"CW Packet");
bio_methods.type = BIO_TYPE_DGRAM;
/* bio_methods.type = BIO_TYPE_DGRAM;
bio_methods.name = "CW packet";
bio_methods.bwrite = dtls_openssl_bio_write;
bio_methods.bread = dtls_openssl_bio_read;
@ -49,6 +51,7 @@ BIO_METHOD *dtls_openssl_bio_method()
bio_methods.create = dtls_openssl_bio_new;
bio_methods.destroy = dtls_openssl_bio_free;
bio_methods.callback_ctrl = 0;
*/
return &bio_methods;
}