lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-05-30 04:04:51 +03:00
Code

Add guards for mbedtls_psa_crypto_free()

Browse Source 
Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemek Stekiel 2023-04-19 13:47:43 +02:00
parent 8fa17b64f2
commit d4d049b88f
32 changed files with 69 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/fuzz/fuzz_client.c
View File

@ -191,7 +191,9 @@ exit:
mbedtls_ctr_drbg_free(&ctr_drbg); mbedtls_ctr_drbg_free(&ctr_drbg);
mbedtls_ssl_config_free(&conf); mbedtls_ssl_config_free(&conf);
mbedtls_ssl_free(&ssl); mbedtls_ssl_free(&ssl);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#else #else
(void) Data; (void) Data;

2
programs/fuzz/fuzz_dtlsclient.c
View File

@ -126,7 +126,9 @@ exit:
mbedtls_ctr_drbg_free(&ctr_drbg); mbedtls_ctr_drbg_free(&ctr_drbg);
mbedtls_ssl_config_free(&conf); mbedtls_ssl_config_free(&conf);
mbedtls_ssl_free(&ssl); mbedtls_ssl_free(&ssl);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#else #else
(void) Data; (void) Data;

2
programs/fuzz/fuzz_dtlsserver.c
View File

@ -166,7 +166,9 @@ exit:
mbedtls_ctr_drbg_free(&ctr_drbg); mbedtls_ctr_drbg_free(&ctr_drbg);
mbedtls_ssl_config_free(&conf); mbedtls_ssl_config_free(&conf);
mbedtls_ssl_free(&ssl); mbedtls_ssl_free(&ssl);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#else #else
(void) Data; (void) Data;

4
programs/fuzz/fuzz_privkey.c
View File

@ -71,9 +71,11 @@ int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
abort(); abort();
} }
} }
#if defined(MBEDTLS_USE_PSA_CRYPTO)
exit: exit:
mbedtls_pk_free(&pk);
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
mbedtls_pk_free(&pk);
#else #else
(void) Data; (void) Data;
(void) Size; (void) Size;

4
programs/fuzz/fuzz_pubkey.c
View File

@ -70,9 +70,11 @@ int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
abort(); abort();
} }
} }
#if defined(MBEDTLS_USE_PSA_CRYPTO)
exit: exit:
mbedtls_pk_free(&pk);
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
mbedtls_pk_free(&pk);
#else #else
(void) Data; (void) Data;
(void) Size; (void) Size;

4
programs/fuzz/fuzz_x509crl.c
View File

@ -19,9 +19,11 @@ int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
if (ret == 0) { if (ret == 0) {
ret = mbedtls_x509_crl_info((char *) buf, sizeof(buf) - 1, " ", &crl); ret = mbedtls_x509_crl_info((char *) buf, sizeof(buf) - 1, " ", &crl);
} }
#if defined(MBEDTLS_USE_PSA_CRYPTO)
exit: exit:
mbedtls_x509_crl_free(&crl);
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
mbedtls_x509_crl_free(&crl);
#else #else
(void) Data; (void) Data;
(void) Size; (void) Size;

4
programs/fuzz/fuzz_x509crt.c
View File

@ -19,9 +19,11 @@ int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
if (ret == 0) { if (ret == 0) {
ret = mbedtls_x509_crt_info((char *) buf, sizeof(buf) - 1, " ", &crt); ret = mbedtls_x509_crt_info((char *) buf, sizeof(buf) - 1, " ", &crt);
} }
#if defined(MBEDTLS_USE_PSA_CRYPTO)
exit: exit:
mbedtls_x509_crt_free(&crt);
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
mbedtls_x509_crt_free(&crt);
#else #else
(void) Data; (void) Data;
(void) Size; (void) Size;

4
programs/fuzz/fuzz_x509csr.c
View File

@ -19,9 +19,11 @@ int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
if (ret == 0) { if (ret == 0) {
ret = mbedtls_x509_csr_info((char *) buf, sizeof(buf) - 1, " ", &csr); ret = mbedtls_x509_csr_info((char *) buf, sizeof(buf) - 1, " ", &csr);
} }
#if defined(MBEDTLS_USE_PSA_CRYPTO)
exit: exit:
mbedtls_x509_csr_free(&csr);
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
mbedtls_x509_csr_free(&csr);
#else #else
(void) Data; (void) Data;
(void) Size; (void) Size;

2
programs/pkey/gen_key.c
View File

@ -420,7 +420,9 @@ exit:
mbedtls_pk_free(&key); mbedtls_pk_free(&key);
mbedtls_ctr_drbg_free(&ctr_drbg); mbedtls_ctr_drbg_free(&ctr_drbg);
mbedtls_entropy_free(&entropy); mbedtls_entropy_free(&entropy);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(_WIN32) #if defined(_WIN32)
mbedtls_printf(" + Press Enter to exit this program.\n"); mbedtls_printf(" + Press Enter to exit this program.\n");

2
programs/pkey/key_app.c
View File

@ -284,7 +284,9 @@ cleanup:
#endif #endif
mbedtls_pk_free(&pk); mbedtls_pk_free(&pk);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
mbedtls_mpi_free(&N); mbedtls_mpi_free(&P); mbedtls_mpi_free(&Q); mbedtls_mpi_free(&N); mbedtls_mpi_free(&P); mbedtls_mpi_free(&Q);
mbedtls_mpi_free(&D); mbedtls_mpi_free(&E); mbedtls_mpi_free(&DP); mbedtls_mpi_free(&D); mbedtls_mpi_free(&E); mbedtls_mpi_free(&DP);
mbedtls_mpi_free(&DQ); mbedtls_mpi_free(&QP); mbedtls_mpi_free(&DQ); mbedtls_mpi_free(&QP);

2
programs/pkey/key_app_writer.c
View File

@ -409,7 +409,9 @@ exit:
mbedtls_mpi_free(&DQ); mbedtls_mpi_free(&QP); mbedtls_mpi_free(&DQ); mbedtls_mpi_free(&QP);
mbedtls_pk_free(&key); mbedtls_pk_free(&key);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(_WIN32) #if defined(_WIN32)
mbedtls_printf(" + Press Enter to exit this program.\n"); mbedtls_printf(" + Press Enter to exit this program.\n");

2
programs/pkey/pk_decrypt.c
View File

@ -151,7 +151,9 @@ exit:
mbedtls_pk_free(&pk); mbedtls_pk_free(&pk);
mbedtls_entropy_free(&entropy); mbedtls_entropy_free(&entropy);
mbedtls_ctr_drbg_free(&ctr_drbg); mbedtls_ctr_drbg_free(&ctr_drbg);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(MBEDTLS_ERROR_C) #if defined(MBEDTLS_ERROR_C)
if (exit_code != MBEDTLS_EXIT_SUCCESS) { if (exit_code != MBEDTLS_EXIT_SUCCESS) {

2
programs/pkey/pk_encrypt.c
View File

@ -153,7 +153,9 @@ exit:
mbedtls_pk_free(&pk); mbedtls_pk_free(&pk);
mbedtls_entropy_free(&entropy); mbedtls_entropy_free(&entropy);
mbedtls_ctr_drbg_free(&ctr_drbg); mbedtls_ctr_drbg_free(&ctr_drbg);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(MBEDTLS_ERROR_C) #if defined(MBEDTLS_ERROR_C)
if (exit_code != MBEDTLS_EXIT_SUCCESS) { if (exit_code != MBEDTLS_EXIT_SUCCESS) {

2
programs/pkey/pk_sign.c
View File

@ -150,7 +150,9 @@ exit:
mbedtls_pk_free(&pk); mbedtls_pk_free(&pk);
mbedtls_ctr_drbg_free(&ctr_drbg); mbedtls_ctr_drbg_free(&ctr_drbg);
mbedtls_entropy_free(&entropy); mbedtls_entropy_free(&entropy);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(MBEDTLS_ERROR_C) #if defined(MBEDTLS_ERROR_C)
if (exit_code != MBEDTLS_EXIT_SUCCESS) { if (exit_code != MBEDTLS_EXIT_SUCCESS) {

2
programs/pkey/pk_verify.c
View File

@ -126,7 +126,9 @@ int main(int argc, char *argv[])
exit: exit:
mbedtls_pk_free(&pk); mbedtls_pk_free(&pk);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(MBEDTLS_ERROR_C) #if defined(MBEDTLS_ERROR_C)
if (exit_code != MBEDTLS_EXIT_SUCCESS) { if (exit_code != MBEDTLS_EXIT_SUCCESS) {

2
programs/pkey/rsa_sign_pss.c
View File

@ -158,7 +158,9 @@ exit:
mbedtls_pk_free(&pk); mbedtls_pk_free(&pk);
mbedtls_ctr_drbg_free(&ctr_drbg); mbedtls_ctr_drbg_free(&ctr_drbg);
mbedtls_entropy_free(&entropy); mbedtls_entropy_free(&entropy);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(_WIN32) #if defined(_WIN32)
mbedtls_printf(" + Press Enter to exit this program.\n"); mbedtls_printf(" + Press Enter to exit this program.\n");

2
programs/pkey/rsa_verify_pss.c
View File

@ -136,7 +136,9 @@ int main(int argc, char *argv[])
exit: exit:
mbedtls_pk_free(&pk); mbedtls_pk_free(&pk);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(_WIN32) #if defined(_WIN32)
mbedtls_printf(" + Press Enter to exit this program.\n"); mbedtls_printf(" + Press Enter to exit this program.\n");

2
programs/ssl/dtls_client.c
View File

@ -339,7 +339,9 @@ exit:
mbedtls_ssl_config_free(&conf); mbedtls_ssl_config_free(&conf);
mbedtls_ctr_drbg_free(&ctr_drbg); mbedtls_ctr_drbg_free(&ctr_drbg);
mbedtls_entropy_free(&entropy); mbedtls_entropy_free(&entropy);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(_WIN32) #if defined(_WIN32)
mbedtls_printf(" + Press Enter to exit this program.\n"); mbedtls_printf(" + Press Enter to exit this program.\n");

2
programs/ssl/dtls_server.c
View File

@ -404,7 +404,9 @@ exit:
#endif #endif
mbedtls_ctr_drbg_free(&ctr_drbg); mbedtls_ctr_drbg_free(&ctr_drbg);
mbedtls_entropy_free(&entropy); mbedtls_entropy_free(&entropy);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(_WIN32) #if defined(_WIN32)
printf(" Press Enter to exit this program.\n"); printf(" Press Enter to exit this program.\n");

2
programs/ssl/mini_client.c
View File

@ -281,7 +281,9 @@ exit:
#if defined(MBEDTLS_X509_CRT_PARSE_C) #if defined(MBEDTLS_X509_CRT_PARSE_C)
mbedtls_x509_crt_free(&ca); mbedtls_x509_crt_free(&ca);
#endif #endif
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
mbedtls_exit(ret); mbedtls_exit(ret);
} }

2
programs/ssl/ssl_client1.c
View File

@ -289,7 +289,9 @@ exit:
mbedtls_ssl_config_free(&conf); mbedtls_ssl_config_free(&conf);
mbedtls_ctr_drbg_free(&ctr_drbg); mbedtls_ctr_drbg_free(&ctr_drbg);
mbedtls_entropy_free(&entropy); mbedtls_entropy_free(&entropy);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(_WIN32) #if defined(_WIN32)
mbedtls_printf(" + Press Enter to exit this program.\n"); mbedtls_printf(" + Press Enter to exit this program.\n");

2
programs/ssl/ssl_context_info.c
View File

@ -1017,7 +1017,9 @@ int main(int argc, char *argv[])
printf("Finished. No valid base64 code found\n"); printf("Finished. No valid base64 code found\n");
} }
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
return 0; return 0;
} }

2
programs/ssl/ssl_fork_server.c
View File

@ -384,7 +384,9 @@ exit:
mbedtls_ssl_config_free(&conf); mbedtls_ssl_config_free(&conf);
mbedtls_ctr_drbg_free(&ctr_drbg); mbedtls_ctr_drbg_free(&ctr_drbg);
mbedtls_entropy_free(&entropy); mbedtls_entropy_free(&entropy);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(_WIN32) #if defined(_WIN32)
mbedtls_printf(" Press Enter to exit this program.\n"); mbedtls_printf(" Press Enter to exit this program.\n");

2
programs/ssl/ssl_mail_client.c
View File

@ -801,7 +801,9 @@ exit:
mbedtls_ssl_config_free(&conf); mbedtls_ssl_config_free(&conf);
mbedtls_ctr_drbg_free(&ctr_drbg); mbedtls_ctr_drbg_free(&ctr_drbg);
mbedtls_entropy_free(&entropy); mbedtls_entropy_free(&entropy);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(_WIN32) #if defined(_WIN32)
mbedtls_printf(" + Press Enter to exit this program.\n"); mbedtls_printf(" + Press Enter to exit this program.\n");

2
programs/ssl/ssl_pthread_server.c
View File

@ -492,7 +492,9 @@ exit:
#if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C) #if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C)
mbedtls_memory_buffer_alloc_free(); mbedtls_memory_buffer_alloc_free();
#endif #endif
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(_WIN32) #if defined(_WIN32)
mbedtls_printf(" Press Enter to exit this program.\n"); mbedtls_printf(" Press Enter to exit this program.\n");

2
programs/ssl/ssl_server.c
View File

@ -366,7 +366,9 @@ exit:
#endif #endif
mbedtls_ctr_drbg_free(&ctr_drbg); mbedtls_ctr_drbg_free(&ctr_drbg);
mbedtls_entropy_free(&entropy); mbedtls_entropy_free(&entropy);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(_WIN32) #if defined(_WIN32)
mbedtls_printf(" Press Enter to exit this program.\n"); mbedtls_printf(" Press Enter to exit this program.\n");

2
programs/x509/cert_app.c
View File

@ -461,7 +461,9 @@ exit:
#endif #endif
mbedtls_ctr_drbg_free(&ctr_drbg); mbedtls_ctr_drbg_free(&ctr_drbg);
mbedtls_entropy_free(&entropy); mbedtls_entropy_free(&entropy);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(_WIN32) #if defined(_WIN32)
mbedtls_printf(" + Press Enter to exit this program.\n"); mbedtls_printf(" + Press Enter to exit this program.\n");

2
programs/x509/cert_req.c
View File

@ -374,7 +374,9 @@ exit:
mbedtls_pk_free(&key); mbedtls_pk_free(&key);
mbedtls_ctr_drbg_free(&ctr_drbg); mbedtls_ctr_drbg_free(&ctr_drbg);
mbedtls_entropy_free(&entropy); mbedtls_entropy_free(&entropy);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(_WIN32) #if defined(_WIN32)
mbedtls_printf(" + Press Enter to exit this program.\n"); mbedtls_printf(" + Press Enter to exit this program.\n");

2
programs/x509/cert_write.c
View File

@ -726,7 +726,9 @@ exit:
mbedtls_mpi_free(&serial); mbedtls_mpi_free(&serial);
mbedtls_ctr_drbg_free(&ctr_drbg); mbedtls_ctr_drbg_free(&ctr_drbg);
mbedtls_entropy_free(&entropy); mbedtls_entropy_free(&entropy);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(_WIN32) #if defined(_WIN32)
mbedtls_printf(" + Press Enter to exit this program.\n"); mbedtls_printf(" + Press Enter to exit this program.\n");

2
programs/x509/crl_app.c
View File

@ -136,7 +136,9 @@ usage:
exit: exit:
mbedtls_x509_crl_free(&crl); mbedtls_x509_crl_free(&crl);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(_WIN32) #if defined(_WIN32)
mbedtls_printf(" + Press Enter to exit this program.\n"); mbedtls_printf(" + Press Enter to exit this program.\n");

2
programs/x509/load_roots.c
View File

@ -200,7 +200,9 @@ int main(int argc, char *argv[])
exit_code = MBEDTLS_EXIT_SUCCESS; exit_code = MBEDTLS_EXIT_SUCCESS;
exit: exit:
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
mbedtls_exit(exit_code); mbedtls_exit(exit_code);
} }
#endif /* necessary configuration */ #endif /* necessary configuration */

2
programs/x509/req_app.c
View File

@ -136,7 +136,9 @@ usage:
exit: exit:
mbedtls_x509_csr_free(&csr); mbedtls_x509_csr_free(&csr);
#if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
#endif /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(_WIN32) #if defined(_WIN32)
mbedtls_printf(" + Press Enter to exit this program.\n"); mbedtls_printf(" + Press Enter to exit this program.\n");