lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-30 22:43:08 +03:00
Code Activity

ssl_server2: support ticket_aead only when CIPHER_C is defined

Browse Source 
Cipher parsing requires mbedtls_cipher_info_from_string() which
depends on CIPHER_C.

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti
2023-10-27 12:02:45 +02:00
parent 31ad3a14cc
commit bdf04e840a
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
programs/ssl/ssl_server2.c
View File

@ -283,6 +283,7 @@ int main(void)
#else #else
#define USAGE_PSK "" #define USAGE_PSK ""
#endif /* MBEDTLS_SSL_HANDSHAKE_WITH_PSK_ENABLED */ #endif /* MBEDTLS_SSL_HANDSHAKE_WITH_PSK_ENABLED */
#if defined(MBEDTLS_X509_TRUSTED_CERTIFICATE_CALLBACK) #if defined(MBEDTLS_X509_TRUSTED_CERTIFICATE_CALLBACK)
#define USAGE_CA_CALLBACK \ #define USAGE_CA_CALLBACK \
" ca_callback=%%d default: 0 (disabled)\n" \ " ca_callback=%%d default: 0 (disabled)\n" \
@ -290,13 +291,21 @@ int main(void)
#else #else
#define USAGE_CA_CALLBACK "" #define USAGE_CA_CALLBACK ""
#endif /* MBEDTLS_X509_TRUSTED_CERTIFICATE_CALLBACK */ #endif /* MBEDTLS_X509_TRUSTED_CERTIFICATE_CALLBACK */
#if defined(MBEDTLS_SSL_SESSION_TICKETS) && defined(MBEDTLS_SSL_TICKET_C) #if defined(MBEDTLS_SSL_SESSION_TICKETS) && defined(MBEDTLS_SSL_TICKET_C)
#if defined(MBEDTLS_CIPHER_C)
#define USAGE_TICKETS \ #define USAGE_TICKETS \
" tickets=%%d default: 1 (enabled)\n" \ " tickets=%%d default: 1 (enabled)\n" \
" ticket_rotate=%%d default: 0 (disabled)\n" \ " ticket_rotate=%%d default: 0 (disabled)\n" \
" ticket_timeout=%%d default: 86400 (one day)\n" \ " ticket_timeout=%%d default: 86400 (one day)\n" \
" ticket_aead=%%s default: \"AES-256-GCM\"\n" " ticket_aead=%%s default: \"AES-256-GCM\"\n"
#else #else /* MBEDTLS_CIPHER_C */
#define USAGE_TICKETS \
" tickets=%%d default: 1 (enabled)\n" \
" ticket_rotate=%%d default: 0 (disabled)\n" \
" ticket_timeout=%%d default: 86400 (one day)\n"
#endif /* MBEDTLS_CIPHER_C */
#else /* MBEDTLS_SSL_SESSION_TICKETS && MBEDTLS_SSL_TICKET_C */
#define USAGE_TICKETS "" #define USAGE_TICKETS ""
#endif /* MBEDTLS_SSL_SESSION_TICKETS && MBEDTLS_SSL_TICKET_C */ #endif /* MBEDTLS_SSL_SESSION_TICKETS && MBEDTLS_SSL_TICKET_C */
@ -2146,14 +2155,18 @@ usage:
if (opt.ticket_timeout < 0) { if (opt.ticket_timeout < 0) {
goto usage; goto usage;
} }
} else if (strcmp(p, "ticket_aead") == 0) { } else
#if defined(MBEDTLS_CIPHER_C)
if (strcmp(p, "ticket_aead") == 0) {
const mbedtls_cipher_info_t *ci = mbedtls_cipher_info_from_string(q); const mbedtls_cipher_info_t *ci = mbedtls_cipher_info_from_string(q);
if (ci == NULL) { if (ci == NULL) {
goto usage; goto usage;
} }
opt.ticket_aead = mbedtls_cipher_info_get_type(ci); opt.ticket_aead = mbedtls_cipher_info_get_type(ci);
} else if (strcmp(p, "cache_max") == 0) { } else
#endif
if (strcmp(p, "cache_max") == 0) {
opt.cache_max = atoi(q); opt.cache_max = atoi(q);
if (opt.cache_max < 0) { if (opt.cache_max < 0) {
goto usage; goto usage;