From 4d483a181435ab348a7a1f33f462fb8d857a7d93 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Wed, 1 Feb 2023 18:19:23 +0100 Subject: [PATCH] Fix misplaced #endif in test program This broke the build when MBEDTLS_CERTS_C is undefined. Fixes #6243. Signed-off-by: Gilles Peskine --- ChangeLog.d/build-without-certs.txt | 3 +++ programs/ssl/ssl_server2.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 ChangeLog.d/build-without-certs.txt diff --git a/ChangeLog.d/build-without-certs.txt b/ChangeLog.d/build-without-certs.txt new file mode 100644 index 000000000..dcb5c777d --- /dev/null +++ b/ChangeLog.d/build-without-certs.txt @@ -0,0 +1,3 @@ +Bugfix + * Fix build errors in test programs when MBEDTLS_CERTS_C is disabled. + Fixes #6243. diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c index dd78c0bd3..dce1cbb3a 100644 --- a/programs/ssl/ssl_server2.c +++ b/programs/ssl/ssl_server2.c @@ -2358,7 +2358,7 @@ usage: #if !defined(MBEDTLS_CERTS_C) mbedtls_printf("Not certificated or key provided, and \nMBEDTLS_CERTS_C not defined!\n"); goto exit; -#else +#else /* MBEDTLS_CERTS_C */ #if defined(MBEDTLS_RSA_C) if ((ret = mbedtls_x509_crt_parse(&srvcert, (const unsigned char *) mbedtls_test_srv_crt_rsa, @@ -2393,6 +2393,7 @@ usage: } key_cert_init2 = 2; #endif /* MBEDTLS_ECDSA_C */ +#endif /* MBEDTLS_CERTS_C */ } #if defined(MBEDTLS_USE_PSA_CRYPTO) @@ -2418,7 +2419,6 @@ usage: } } #endif /* MBEDTLS_USE_PSA_CRYPTO */ -#endif /* MBEDTLS_CERTS_C */ mbedtls_printf(" ok (key types: %s - %s)\n", mbedtls_pk_get_name(&pkey),