diff options
| author | Simon Goldschmidt <[email protected]> | 2018-11-23 22:25:21 +0100 |
|---|---|---|
| committer | Simon Goldschmidt <[email protected]> | 2019-02-18 13:12:18 +0100 |
| commit | beeb300c18c3828c88bf1d067d448c80e1905135 (patch) | |
| tree | 2bbac452fcd8ae256342a59e82113e8358f07f79 | |
| parent | 79732693f3bffdb2aaaad59f7c7674ec09d48ad9 (diff) | |
altcp_tls_mbedtls: add debug output of mbedtls library
(cherry picked from commit 54448559bbbde6bec74eb41234ecfd0ab77cd74b)
| -rw-r--r-- | src/apps/altcp_tls/altcp_tls_mbedtls.c | 14 | ||||
| -rw-r--r-- | src/include/lwip/apps/altcp_tls_mbedtls_opts.h | 10 |
2 files changed, 18 insertions, 6 deletions
diff --git a/src/apps/altcp_tls/altcp_tls_mbedtls.c b/src/apps/altcp_tls/altcp_tls_mbedtls.c index f03f97a3..1b6baf6d 100644 --- a/src/apps/altcp_tls/altcp_tls_mbedtls.c +++ b/src/apps/altcp_tls/altcp_tls_mbedtls.c @@ -634,16 +634,18 @@ altcp_tls_context(struct altcp_pcb *conn) return NULL; } -#if ALTCP_MBEDTLS_DEBUG != LWIP_DBG_OFF +#if ALTCP_MBEDTLS_LIB_DEBUG != LWIP_DBG_OFF static void altcp_mbedtls_debug(void *ctx, int level, const char *file, int line, const char *str) { - LWIP_UNUSED_ARG(str); - LWIP_UNUSED_ARG(level); + LWIP_UNUSED_ARG(ctx); LWIP_UNUSED_ARG(file); LWIP_UNUSED_ARG(line); - LWIP_UNUSED_ARG(ctx); - /* @todo: output debug string :-) */ + LWIP_UNUSED_ARG(str); + + if (level >= ALTCP_MBEDTLS_LIB_DEBUG_LEVEL_MIN) { + LWIP_DEBUGF(ALTCP_MBEDTLS_LIB_DEBUG, ("%s:%04d: %s", file, line, str)); + } } #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_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); #endif #if defined(MBEDTLS_SSL_CACHE_C) && ALTCP_MBEDTLS_SESSION_CACHE_TIMEOUT_SECONDS diff --git a/src/include/lwip/apps/altcp_tls_mbedtls_opts.h b/src/include/lwip/apps/altcp_tls_mbedtls_opts.h index 36cddd93..d8129cc8 100644 --- a/src/include/lwip/apps/altcp_tls_mbedtls_opts.h +++ b/src/include/lwip/apps/altcp_tls_mbedtls_opts.h @@ -55,6 +55,16 @@ #define ALTCP_MBEDTLS_DEBUG LWIP_DBG_OFF #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 * ATTENTION: Using a session cache can lower security by reusing keys! */ |