cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-09-11 16:15:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix misplaced #endif in test program

Browse Source 
This broke the build when MBEDTLS_CERTS_C is undefined. Fixes #6243.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2023-02-01 18:19:23 +01:00
parent 45379cbe6b
commit 4d483a1814
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.d/build-without-certs.txt Normal file
View File

@ -0,0 +1,3 @@
Bugfix
* Fix build errors in test programs when MBEDTLS_CERTS_C is disabled.
Fixes #6243.

4
programs/ssl/ssl_server2.c
View File

@ -2358,7 +2358,7 @@ usage:
#if !defined(MBEDTLS_CERTS_C) #if !defined(MBEDTLS_CERTS_C)
mbedtls_printf("Not certificated or key provided, and \nMBEDTLS_CERTS_C not defined!\n"); mbedtls_printf("Not certificated or key provided, and \nMBEDTLS_CERTS_C not defined!\n");
goto exit; goto exit;
#else #else /* MBEDTLS_CERTS_C */
#if defined(MBEDTLS_RSA_C) #if defined(MBEDTLS_RSA_C)
if ((ret = mbedtls_x509_crt_parse(&srvcert, if ((ret = mbedtls_x509_crt_parse(&srvcert,
(const unsigned char *) mbedtls_test_srv_crt_rsa, (const unsigned char *) mbedtls_test_srv_crt_rsa,
@ -2393,6 +2393,7 @@ usage:
} }
key_cert_init2 = 2; key_cert_init2 = 2;
#endif /* MBEDTLS_ECDSA_C */ #endif /* MBEDTLS_ECDSA_C */
#endif /* MBEDTLS_CERTS_C */
} }
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
@ -2418,7 +2419,6 @@ usage:
} }
} }
#endif /* MBEDTLS_USE_PSA_CRYPTO */ #endif /* MBEDTLS_USE_PSA_CRYPTO */
#endif /* MBEDTLS_CERTS_C */
mbedtls_printf(" ok (key types: %s - %s)\n", mbedtls_printf(" ok (key types: %s - %s)\n",
mbedtls_pk_get_name(&pkey), mbedtls_pk_get_name(&pkey),