altcp_tls_mbedtls: add debug output of mbedtls library

This commit is contained in:
Simon Goldschmidt 2018-11-23 22:25:21 +01:00
parent 7859c6832b
commit 54448559bb
2 changed files with 18 additions and 6 deletions

View File

@ -634,16 +634,18 @@ altcp_tls_context(struct altcp_pcb *conn)
return NULL; return NULL;
} }
#if ALTCP_MBEDTLS_DEBUG != LWIP_DBG_OFF #if ALTCP_MBEDTLS_LIB_DEBUG != LWIP_DBG_OFF
static void static void
altcp_mbedtls_debug(void *ctx, int level, const char *file, int line, const char *str) altcp_mbedtls_debug(void *ctx, int level, const char *file, int line, const char *str)
{ {
LWIP_UNUSED_ARG(str); LWIP_UNUSED_ARG(ctx);
LWIP_UNUSED_ARG(level);
LWIP_UNUSED_ARG(file); LWIP_UNUSED_ARG(file);
LWIP_UNUSED_ARG(line); LWIP_UNUSED_ARG(line);
LWIP_UNUSED_ARG(ctx); LWIP_UNUSED_ARG(str);
/* @todo: output debug string :-) */
if (level >= ALTCP_MBEDTLS_LIB_DEBUG_LEVEL_MIN) {
LWIP_DEBUGF(ALTCP_MBEDTLS_LIB_DEBUG, ("%s:%04d: %s", file, line, str));
}
} }
#endif #endif
@ -716,7 +718,7 @@ altcp_tls_create_config(int is_server, int have_cert, int have_pkey, int have_ca
mbedtls_ssl_conf_authmode(&conf->conf, MBEDTLS_SSL_VERIFY_OPTIONAL); mbedtls_ssl_conf_authmode(&conf->conf, MBEDTLS_SSL_VERIFY_OPTIONAL);
mbedtls_ssl_conf_rng(&conf->conf, mbedtls_ctr_drbg_random, &conf->ctr_drbg); mbedtls_ssl_conf_rng(&conf->conf, mbedtls_ctr_drbg_random, &conf->ctr_drbg);
#if ALTCP_MBEDTLS_DEBUG != LWIP_DBG_OFF #if ALTCP_MBEDTLS_LIB_DEBUG != LWIP_DBG_OFF
mbedtls_ssl_conf_dbg(&conf->conf, altcp_mbedtls_debug, stdout); mbedtls_ssl_conf_dbg(&conf->conf, altcp_mbedtls_debug, stdout);
#endif #endif
#if defined(MBEDTLS_SSL_CACHE_C) && ALTCP_MBEDTLS_SESSION_CACHE_TIMEOUT_SECONDS #if defined(MBEDTLS_SSL_CACHE_C) && ALTCP_MBEDTLS_SESSION_CACHE_TIMEOUT_SECONDS

View File

@ -55,6 +55,16 @@
#define ALTCP_MBEDTLS_DEBUG LWIP_DBG_OFF #define ALTCP_MBEDTLS_DEBUG LWIP_DBG_OFF
#endif #endif
/** Configure lwIP debug level of the mbedTLS library */
#ifndef ALTCP_MBEDTLS_LIB_DEBUG
#define ALTCP_MBEDTLS_LIB_DEBUG LWIP_DBG_OFF
#endif
/** Configure minimum internal debug level of the mbedTLS library */
#ifndef ALTCP_MBEDTLS_LIB_DEBUG_LEVEL_MIN
#define ALTCP_MBEDTLS_LIB_DEBUG_LEVEL_MIN 0
#endif
/** Set a session timeout in seconds for the basic session cache /** Set a session timeout in seconds for the basic session cache
* ATTENTION: Using a session cache can lower security by reusing keys! * ATTENTION: Using a session cache can lower security by reusing keys!
*/ */