From 69f8e47ea2a9a8c74605d09f30f4ecad0b70e51c Mon Sep 17 00:00:00 2001 From: LDA Date: Sun, 15 Sep 2024 13:09:00 +0200 Subject: [PATCH] [FIX] Remove dummy functions --- configure | 2 +- src/Tls/TlsMbedTLS.c | 16 ++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/configure b/configure index ce25874..38e2145 100755 --- a/configure +++ b/configure @@ -78,7 +78,7 @@ for arg in $SCRIPT_ARGS; do ;; --with-mbed) TLS_IMPL="TLS_MBEDTLS" - TLS_LIBS="-lmbedtls" + TLS_LIBS="-lmbedtls -lmbedx509 -lmbedcrypto" ;; --disable-tls) TLS_IMPL="" diff --git a/src/Tls/TlsMbedTLS.c b/src/Tls/TlsMbedTLS.c index a9768b7..0536b96 100644 --- a/src/Tls/TlsMbedTLS.c +++ b/src/Tls/TlsMbedTLS.c @@ -37,6 +37,7 @@ #include #include +#include /* * #include statements and any implementation structures @@ -56,17 +57,6 @@ typedef struct MbedCookie { mbedtls_pk_context serverkey; } MbedCookie; -static void my_debug(void *ctx, int level, - const char *file, int line, - const char *str) -{ - ((void) level); - - fprintf((FILE *) ctx, "%s:%04d: %s\n", file, line, str); - fflush((FILE *) ctx); -} - - void * TlsInitClient(int fd, const char *serverName) { @@ -143,7 +133,6 @@ TlsInitClient(int fd, const char *serverName) mbedtls_ctr_drbg_random, &cookie->ctrDrbg ); - mbedtls_ssl_conf_dbg(&cookie->conf, my_debug, stdout); if ((err = mbedtls_ssl_setup(&cookie->ssl, &cookie->conf)) != 0) { char message[256]; @@ -228,7 +217,7 @@ TlsInitServer(int fd, const char *crt, const char *key) goto error; } - if ((err = mbedtls_pk_parse_keyfile(&cookie->serverkey, key, NULL)) != 0) + if ((err = mbedtls_pk_parse_keyfile(&cookie->serverkey, key, NULL, mbedtls_entropy_func, &cookie->ctrDrbg)) != 0) { char message[256]; mbedtls_strerror(err, message, 255); @@ -266,7 +255,6 @@ TlsInitServer(int fd, const char *crt, const char *key) mbedtls_ctr_drbg_random, &cookie->ctrDrbg ); - mbedtls_ssl_conf_dbg(&cookie->conf, my_debug, stdout); mbedtls_ssl_conf_ca_chain(&cookie->conf, cookie->cert.next, NULL); if ((err = mbedtls_ssl_setup(&cookie->ssl, &cookie->conf)) != 0) {