Skip to content

Update code to work with demos using latest mbedtls version #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 12, 2025
Merged

Update code to work with demos using latest mbedtls version #207

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef3020a
Update code to work with demos using latest mbedtls version
DakshitBabbar May 8, 2025
f9c7680
Add documentation for the new mutex initialisation
DakshitBabbar May 8, 2025
445b68b
Fix Formatting
DakshitBabbar May 8, 2025
5f2dc04
Remove unwanted extern statements
DakshitBabbar May 9, 2025
5dbdb5b
Merge branch 'main' into mbedtls-upgrade
DakshitBabbar May 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions source/portable/mbedtls/core_pkcs11_mbedtls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,16 @@

#endif /* ifndef DISABLE_LOGGING */

/**
* @brief Global mutexes used for threading in PSA APIs. These are defined by the
* mbedtls library, we just need to initialise them.
*/
#if defined( MBEDTLS_PSA_CRYPTO_C )
extern mbedtls_threading_mutex_t mbedtls_threading_key_slot_mutex;
extern mbedtls_threading_mutex_t mbedtls_threading_psa_globaldata_mutex;
extern mbedtls_threading_mutex_t mbedtls_threading_psa_rngdata_mutex;
#endif

/**
* @ingroup pkcs11_macros
* @brief Delay to wait on acquiring a mutex, in ms.
Expand Down Expand Up @@ -475,6 +485,13 @@ static CK_RV prvMbedTLS_Initialize( void )
mbedtls_entropy_init( &xP11Context.xMbedEntropyContext );
mbedtls_ctr_drbg_init( &xP11Context.xMbedDrbgCtx );

/* Initialise the global mutexes for the PSA API's */
#if defined( MBEDTLS_PSA_CRYPTO_C )
mbedtls_mutex_init( &mbedtls_threading_key_slot_mutex );
mbedtls_mutex_init( &mbedtls_threading_psa_globaldata_mutex );
mbedtls_mutex_init( &mbedtls_threading_psa_rngdata_mutex );
#endif

lMbedTLSResult = mbedtls_ctr_drbg_seed( &xP11Context.xMbedDrbgCtx,
mbedtls_entropy_func,
&xP11Context.xMbedEntropyContext,
Expand Down