coffee/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-10-28 18:07:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge 64b0a840fef0de0802a4c34be96aab19afd5a984 into 03e1438089654fb884ac48e0f3cd0049cfe2c102

Browse Source
This commit is contained in:
Julio Loayza 2026-10-27 10:46:09 -04:00 committed by GitHub
commit 7c770ac383
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.d/fix-client-fuzzing.txt Normal file
View File

@ -0,0 +1,3 @@
Bugfix
* Call to `psa_crypto_init()` before parsing the test CA certificate in the
fuzzing programs for TLS and DTLS clients.

10
programs/fuzz/fuzz_client.c
View File

@ -37,6 +37,11 @@ int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
fuzzBufferOffset_t biomemfuzz; fuzzBufferOffset_t biomemfuzz;
uint16_t options; uint16_t options;
psa_status_t status = psa_crypto_init();
if (status != PSA_SUCCESS) {
goto exit;
}
if (initialized == 0) { if (initialized == 0) {
#if defined(MBEDTLS_X509_CRT_PARSE_C) && defined(MBEDTLS_PEM_PARSE_C) #if defined(MBEDTLS_X509_CRT_PARSE_C) && defined(MBEDTLS_PEM_PARSE_C)
mbedtls_x509_crt_init(&cacert); mbedtls_x509_crt_init(&cacert);
@ -66,11 +71,6 @@ int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
mbedtls_ssl_init(&ssl); mbedtls_ssl_init(&ssl);
mbedtls_ssl_config_init(&conf); mbedtls_ssl_config_init(&conf);
psa_status_t status = psa_crypto_init();
if (status != PSA_SUCCESS) {
goto exit;
}
if (mbedtls_ssl_config_defaults(&conf, if (mbedtls_ssl_config_defaults(&conf,
MBEDTLS_SSL_IS_CLIENT, MBEDTLS_SSL_IS_CLIENT,
MBEDTLS_SSL_TRANSPORT_STREAM, MBEDTLS_SSL_TRANSPORT_STREAM,

10
programs/fuzz/fuzz_dtlsclient.c
View File

@ -33,6 +33,11 @@ int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
unsigned char buf[4096]; unsigned char buf[4096];
fuzzBufferOffset_t biomemfuzz; fuzzBufferOffset_t biomemfuzz;
psa_status_t status = psa_crypto_init();
if (status != PSA_SUCCESS) {
goto exit;
}
if (initialized == 0) { if (initialized == 0) {
#if defined(MBEDTLS_X509_CRT_PARSE_C) && defined(MBEDTLS_PEM_PARSE_C) #if defined(MBEDTLS_X509_CRT_PARSE_C) && defined(MBEDTLS_PEM_PARSE_C)
mbedtls_x509_crt_init(&cacert); mbedtls_x509_crt_init(&cacert);
@ -49,11 +54,6 @@ int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
mbedtls_ssl_init(&ssl); mbedtls_ssl_init(&ssl);
mbedtls_ssl_config_init(&conf); mbedtls_ssl_config_init(&conf);
psa_status_t status = psa_crypto_init();
if (status != PSA_SUCCESS) {
goto exit;
}
if (mbedtls_ssl_config_defaults(&conf, if (mbedtls_ssl_config_defaults(&conf,
MBEDTLS_SSL_IS_CLIENT, MBEDTLS_SSL_IS_CLIENT,
MBEDTLS_SSL_TRANSPORT_DATAGRAM, MBEDTLS_SSL_TRANSPORT_DATAGRAM,