Skip to content

Commit

Permalink
Release the lock in mbedtls_sha256_free if it was not released already (
Browse files Browse the repository at this point in the history
#2105)

* Release the lock in mbedtls_sha256_free if it was not released already. Requires making pico_sha256_unlock include-able. Fixes #2103.

* addres lock release API comment

* Fix description of pico_sha256_cleanup

---------

Co-authored-by: nils <nils@nils>
Co-authored-by: Peter Harper <[email protected]>
  • Loading branch information
3 people authored Jan 31, 2025
1 parent 3d746b3 commit 6c06f90
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/rp2_common/pico_mbedtls/pico_mbedtls.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ void mbedtls_sha256_init(__unused mbedtls_sha256_context *ctx) {
}

void mbedtls_sha256_free(__unused mbedtls_sha256_context *ctx) {
pico_sha256_cleanup(ctx);
}

int mbedtls_sha256_starts_ret(mbedtls_sha256_context *ctx, int is224) {
Expand Down
10 changes: 10 additions & 0 deletions src/rp2_common/pico_sha256/include/pico/sha256.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,16 @@ typedef struct pico_sha256_state {
size_t total_data_size;
} pico_sha256_state_t;

/*! \brief Release the internal lock on the SHA-256 hardware
* \ingroup pico_sha256
*
* Release the internal lock on the SHA-256 hardware.
* Does nothing if the internal lock was not claimed.
*
* @param state A pointer to a pico_sha256_state_t instance
*/
void pico_sha256_cleanup(pico_sha256_state_t *state);

/*! \brief Start a SHA-256 calculation returning immediately with an error if the SHA-256 hardware is not available
* \ingroup pico_sha256
*
Expand Down
6 changes: 6 additions & 0 deletions src/rp2_common/pico_sha256/sha256.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ void __weak pico_sha256_unlock(pico_sha256_state_t *state) {
state->locked = false;
}

void pico_sha256_cleanup(pico_sha256_state_t *state) {
if (state->locked) {
pico_sha256_unlock(state);
}
}

int pico_sha256_try_start(pico_sha256_state_t *state, enum sha256_endianness endianness, bool use_dma) {
memset(state, 0, sizeof(*state));
if (!pico_sha256_lock(state)) return PICO_ERROR_RESOURCE_IN_USE;
Expand Down

0 comments on commit 6c06f90

Please sign in to comment.