mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-24 15:02:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename "input_copy" -> "local_input"

Browse Source 
This helps to prevent confusion as it avoids overloading the word
"copy" as both an action and an object.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
This commit is contained in:
David Horstmann 2023-11-20 17:15:32 +00:00
parent 2f307b4216
commit f1734054fa
4 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
library/psa_crypto.c
View File

@ -8496,30 +8496,30 @@ psa_status_t psa_crypto_copy_output(const uint8_t *output_copy, size_t output_co
return PSA_SUCCESS; return PSA_SUCCESS;
} }
psa_status_t psa_crypto_input_copy_alloc(const uint8_t *input, size_t input_len, psa_status_t psa_crypto_local_input_alloc(const uint8_t *input, size_t input_len,
psa_crypto_input_copy_t *input_copy) psa_crypto_local_input_t *local_input)
{ {
psa_status_t status; psa_status_t status;
input_copy->buffer = NULL; local_input->buffer = NULL;
input_copy->length = 0; local_input->length = 0;
if (input_len == 0) { if (input_len == 0) {
return PSA_SUCCESS; return PSA_SUCCESS;
} }
input_copy->buffer = mbedtls_calloc(input_len, 1); local_input->buffer = mbedtls_calloc(input_len, 1);
if (input_copy->buffer == NULL) { if (local_input->buffer == NULL) {
/* Since we dealt with the zero-length case above, we know that /* Since we dealt with the zero-length case above, we know that
* a NULL return value means a failure of allocation. */ * a NULL return value means a failure of allocation. */
return PSA_ERROR_INSUFFICIENT_MEMORY; return PSA_ERROR_INSUFFICIENT_MEMORY;
} }
/* From now on, we must free input_copy->buffer on error. */ /* From now on, we must free local_input->buffer on error. */
input_copy->length = input_len; local_input->length = input_len;
status = psa_crypto_copy_input(input, input_len, status = psa_crypto_copy_input(input, input_len,
input_copy->buffer, input_copy->length); local_input->buffer, local_input->length);
if (status != PSA_SUCCESS) { if (status != PSA_SUCCESS) {
goto error; goto error;
} }
@ -8527,17 +8527,17 @@ psa_status_t psa_crypto_input_copy_alloc(const uint8_t *input, size_t input_len,
return PSA_SUCCESS; return PSA_SUCCESS;
error: error:
mbedtls_free(input_copy->buffer); mbedtls_free(local_input->buffer);
input_copy->buffer = NULL; local_input->buffer = NULL;
input_copy->length = 0; local_input->length = 0;
return status; return status;
} }
void psa_crypto_input_copy_free(psa_crypto_input_copy_t *input_copy) void psa_crypto_local_input_free(psa_crypto_local_input_t *local_input)
{ {
mbedtls_free(input_copy->buffer); mbedtls_free(local_input->buffer);
input_copy->buffer = NULL; local_input->buffer = NULL;
input_copy->length = 0; local_input->length = 0;
} }
psa_status_t psa_crypto_output_copy_alloc(uint8_t *output, size_t output_len, psa_status_t psa_crypto_output_copy_alloc(uint8_t *output, size_t output_len,

20
library/psa_crypto_core.h
View File

@ -854,34 +854,34 @@ psa_status_t mbedtls_psa_verify_hash_complete(
psa_status_t mbedtls_psa_verify_hash_abort( psa_status_t mbedtls_psa_verify_hash_abort(
mbedtls_psa_verify_hash_interruptible_operation_t *operation); mbedtls_psa_verify_hash_interruptible_operation_t *operation);
typedef struct psa_crypto_input_copy_s { typedef struct psa_crypto_local_input_s {
uint8_t *buffer; uint8_t *buffer;
size_t length; size_t length;
} psa_crypto_input_copy_t; } psa_crypto_local_input_t;
#define PSA_CRYPTO_INPUT_COPY_INIT { NULL, 0 } #define PSA_CRYPTO_LOCAL_INPUT_INIT { NULL, 0 }
/** Allocate a local copy of an input buffer. /** Allocate a local copy of an input buffer.
* *
* \param[in] input Pointer to input buffer. * \param[in] input Pointer to input buffer.
* \param[in] input_len Length of the input buffer. * \param[in] input_len Length of the input buffer.
* \param[out] input_copy Pointer to a psa_crypto_input_copy_t struct to * \param[out] local_input Pointer to a psa_crypto_local_input_t struct to
* populate with the input copy. * populate with the local input copy.
* \return #PSA_SUCCESS, if the buffer was successfully * \return #PSA_SUCCESS, if the buffer was successfully
* copied. * copied.
* \return #PSA_ERROR_INSUFFICIENT_MEMORY, if a copy of * \return #PSA_ERROR_INSUFFICIENT_MEMORY, if a copy of
* the buffer cannot be allocated. * the buffer cannot be allocated.
*/ */
psa_status_t psa_crypto_input_copy_alloc(const uint8_t *input, size_t input_len, psa_status_t psa_crypto_local_input_alloc(const uint8_t *input, size_t input_len,
psa_crypto_input_copy_t *input_copy); psa_crypto_local_input_t *local_input);
/** Free a local copy of an input buffer. /** Free a local copy of an input buffer.
* *
* \param[in] input_copy Pointer to a psa_crypto_input_copy_t struct * \param[in] local_input Pointer to a psa_crypto_local_input_t struct
* populated by a previous call to * populated by a previous call to
* psa_crypto_input_copy_alloc(). * psa_crypto_local_input_alloc().
*/ */
void psa_crypto_input_copy_free(psa_crypto_input_copy_t *input_copy); void psa_crypto_local_input_free(psa_crypto_local_input_t *local_input);
typedef struct psa_crypto_output_copy_s { typedef struct psa_crypto_output_copy_s {
uint8_t *original; uint8_t *original;

20
tests/suites/test_suite_psa_crypto_memory.data
View File

@ -28,20 +28,20 @@ copy_output:0:10:PSA_SUCCESS
PSA output buffer copy: zero-length both buffers PSA output buffer copy: zero-length both buffers
copy_output:0:0:PSA_SUCCESS copy_output:0:0:PSA_SUCCESS
PSA crypto input copy alloc PSA crypto local input alloc
input_copy_alloc:200:PSA_SUCCESS local_input_alloc:200:PSA_SUCCESS
PSA crypto input copy alloc, NULL buffer PSA crypto local input alloc, NULL buffer
input_copy_alloc:0:PSA_SUCCESS local_input_alloc:0:PSA_SUCCESS
PSA crypto input copy free PSA crypto local input free
input_copy_free:200 local_input_free:200
PSA crypto input copy free, NULL buffer PSA crypto local input free, NULL buffer
input_copy_free:0 local_input_free:0
PSA crypto input copy round-trip PSA crypto local input round-trip
input_copy_round_trip local_input_round_trip
PSA crypto output copy alloc PSA crypto output copy alloc
output_copy_alloc:200:PSA_SUCCESS output_copy_alloc:200:PSA_SUCCESS

52
tests/suites/test_suite_psa_crypto_memory.function
View File

@ -79,73 +79,73 @@ exit:
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE */ /* BEGIN_CASE */
void input_copy_alloc(int input_len, psa_status_t exp_status) void local_input_alloc(int input_len, psa_status_t exp_status)
{ {
uint8_t *input = NULL; uint8_t *input = NULL;
psa_crypto_input_copy_t input_copy; psa_crypto_local_input_t local_input;
psa_status_t status; psa_status_t status;
input_copy.buffer = NULL; local_input.buffer = NULL;
TEST_CALLOC(input, input_len); TEST_CALLOC(input, input_len);
fill_buffer_pattern(input, input_len); fill_buffer_pattern(input, input_len);
status = psa_crypto_input_copy_alloc(input, input_len, &input_copy); status = psa_crypto_local_input_alloc(input, input_len, &local_input);
TEST_EQUAL(status, exp_status); TEST_EQUAL(status, exp_status);
if (exp_status == PSA_SUCCESS) { if (exp_status == PSA_SUCCESS) {
if (input_len != 0) { if (input_len != 0) {
TEST_ASSERT(input_copy.buffer != input); TEST_ASSERT(local_input.buffer != input);
} }
TEST_MEMORY_COMPARE(input, input_len, TEST_MEMORY_COMPARE(input, input_len,
input_copy.buffer, input_copy.length); local_input.buffer, local_input.length);
} }
exit: exit:
mbedtls_free(input_copy.buffer); mbedtls_free(local_input.buffer);
mbedtls_free(input); mbedtls_free(input);
} }
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE */ /* BEGIN_CASE */
void input_copy_free(int input_len) void local_input_free(int input_len)
{ {
psa_crypto_input_copy_t input_copy; psa_crypto_local_input_t local_input;
input_copy.buffer = NULL; local_input.buffer = NULL;
input_copy.length = input_len; local_input.length = input_len;
TEST_CALLOC(input_copy.buffer, input_copy.length); TEST_CALLOC(local_input.buffer, local_input.length);
psa_crypto_input_copy_free(&input_copy); psa_crypto_local_input_free(&local_input);
TEST_ASSERT(input_copy.buffer == NULL); TEST_ASSERT(local_input.buffer == NULL);
TEST_EQUAL(input_copy.length, 0); TEST_EQUAL(local_input.length, 0);
exit: exit:
mbedtls_free(input_copy.buffer); mbedtls_free(local_input.buffer);
input_copy.buffer = NULL; local_input.buffer = NULL;
input_copy.length = 0; local_input.length = 0;
} }
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE */ /* BEGIN_CASE */
void input_copy_round_trip() void local_input_round_trip()
{ {
psa_crypto_input_copy_t input_copy; psa_crypto_local_input_t local_input;
uint8_t input[200]; uint8_t input[200];
psa_status_t status; psa_status_t status;
fill_buffer_pattern(input, sizeof(input)); fill_buffer_pattern(input, sizeof(input));
status = psa_crypto_input_copy_alloc(input, sizeof(input), &input_copy); status = psa_crypto_local_input_alloc(input, sizeof(input), &local_input);
TEST_EQUAL(status, PSA_SUCCESS); TEST_EQUAL(status, PSA_SUCCESS);
TEST_MEMORY_COMPARE(input_copy.buffer, input_copy.length, TEST_MEMORY_COMPARE(local_input.buffer, local_input.length,
input, sizeof(input)); input, sizeof(input));
TEST_ASSERT(input_copy.buffer != input); TEST_ASSERT(local_input.buffer != input);
psa_crypto_input_copy_free(&input_copy); psa_crypto_local_input_free(&local_input);
TEST_ASSERT(input_copy.buffer == NULL); TEST_ASSERT(local_input.buffer == NULL);
TEST_EQUAL(input_copy.length, 0); TEST_EQUAL(local_input.length, 0);
} }
/* END_CASE */ /* END_CASE */