From 4f74f6d3010322b0f573e6908d4e4b45e5cd4a8c Mon Sep 17 00:00:00 2001 From: Jarno Lamsa Date: Wed, 19 Jun 2019 14:56:44 +0300 Subject: [PATCH] Fix check-files, check-names and check-generated-features --- include/mbedtls/check_config.h | 2 +- library/version_features.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h index e3d13e6ef..27dd8aab9 100644 --- a/include/mbedtls/check_config.h +++ b/include/mbedtls/check_config.h @@ -674,7 +674,7 @@ #if ( defined(MBEDTLS_SSL_SESSION_TICKETS) || \ defined(MBEDTLS_SSL_SESSION_CACHE) ) && \ !defined(MBEDTLS_SSL_SESSION_RESUMPTION) -#error "MBEDTLS_SSL_SESSION_TICKETS/MBEDTLS_SESSION_CACHE cannot be defined without MBEDTLS_SSL_SESSION_RESUMPTION" +#error "MBEDTLS_SSL_SESSION_TICKETS/MBEDTLS_SSL_SESSION_CACHE cannot be defined without MBEDTLS_SSL_SESSION_RESUMPTION" #endif #if defined(MBEDTLS_THREADING_PTHREAD) diff --git a/library/version_features.c b/library/version_features.c index 5e9d9239b..7deb41717 100644 --- a/library/version_features.c +++ b/library/version_features.c @@ -513,6 +513,12 @@ static const char *features[] = { #if defined(MBEDTLS_SSL_SESSION_TICKETS) "MBEDTLS_SSL_SESSION_TICKETS", #endif /* MBEDTLS_SSL_SESSION_TICKETS */ +#if defined(MBEDTLS_SSL_SESSION_CACHE) + "MBEDTLS_SSL_SESSION_CACHE", +#endif /* MBEDTLS_SSL_SESSION_CACHE */ +#if defined(MBEDTLS_SSL_SESSION_RESUMPTION) + "MBEDTLS_SSL_SESSION_RESUMPTION", +#endif /* MBEDTLS_SSL_SESSION_RESUMPTION */ #if defined(MBEDTLS_SSL_EXPORT_KEYS) "MBEDTLS_SSL_EXPORT_KEYS", #endif /* MBEDTLS_SSL_EXPORT_KEYS */