Adapt function names

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemek Stekiel 2023-06-01 11:52:39 +02:00
parent 29c219c285
commit 152bb4632b
5 changed files with 10 additions and 10 deletions

View File

@ -1461,7 +1461,7 @@ psa_status_t psa_export_public_key_internal(
} else if (PSA_KEY_TYPE_IS_DH(type)) { } else if (PSA_KEY_TYPE_IS_DH(type)) {
#if defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR) || \ #if defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR) || \
defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_PUBLIC_KEY) defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_PUBLIC_KEY)
return mbedtls_psa_export_ffdh_public_key(attributes, return mbedtls_psa_ffdh_export_public_key(attributes,
key_buffer, key_buffer,
key_buffer_size, key_buffer_size,
data, data_size, data, data_size,
@ -6800,7 +6800,7 @@ psa_status_t psa_key_agreement_raw_builtin(const psa_key_attributes_t *attribute
#if defined(MBEDTLS_PSA_BUILTIN_ALG_FFDH) #if defined(MBEDTLS_PSA_BUILTIN_ALG_FFDH)
case PSA_ALG_FFDH: case PSA_ALG_FFDH:
return mbedtls_psa_key_agreement_ffdh(attributes, return mbedtls_psa_ffdh_key_agreement(attributes,
peer_key, peer_key,
peer_key_length, peer_key_length,
key_buffer, key_buffer,

View File

@ -123,7 +123,7 @@ cleanup:
#if defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR) || \ #if defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR) || \
defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_PUBLIC_KEY) defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_PUBLIC_KEY)
psa_status_t mbedtls_psa_export_ffdh_public_key( psa_status_t mbedtls_psa_ffdh_export_public_key(
const psa_key_attributes_t *attributes, const psa_key_attributes_t *attributes,
const uint8_t *key_buffer, const uint8_t *key_buffer,
size_t key_buffer_size, size_t key_buffer_size,
@ -232,7 +232,7 @@ psa_status_t mbedtls_psa_ffdh_import_key(
MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_PUBLIC_KEY */ MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_PUBLIC_KEY */
#if defined(MBEDTLS_PSA_BUILTIN_ALG_FFDH) #if defined(MBEDTLS_PSA_BUILTIN_ALG_FFDH)
psa_status_t mbedtls_psa_key_agreement_ffdh( psa_status_t mbedtls_psa_ffdh_key_agreement(
const psa_key_attributes_t *attributes, const psa_key_attributes_t *attributes,
const uint8_t *peer_key, const uint8_t *peer_key,
size_t peer_key_length, size_t peer_key_length,

View File

@ -50,7 +50,7 @@
* \retval #PSA_ERROR_INSUFFICIENT_MEMORY * \retval #PSA_ERROR_INSUFFICIENT_MEMORY
* \retval #PSA_ERROR_CORRUPTION_DETECTED * \retval #PSA_ERROR_CORRUPTION_DETECTED
*/ */
psa_status_t mbedtls_psa_key_agreement_ffdh( psa_status_t mbedtls_psa_ffdh_key_agreement(
const psa_key_attributes_t *attributes, const psa_key_attributes_t *attributes,
const uint8_t *peer_key, const uint8_t *peer_key,
size_t peer_key_length, size_t peer_key_length,
@ -77,7 +77,7 @@ psa_status_t mbedtls_psa_key_agreement_ffdh(
* \retval #PSA_ERROR_INSUFFICIENT_MEMORY * \retval #PSA_ERROR_INSUFFICIENT_MEMORY
* \retval #PSA_ERROR_CORRUPTION_DETECTED * \retval #PSA_ERROR_CORRUPTION_DETECTED
*/ */
psa_status_t mbedtls_psa_export_ffdh_public_key( psa_status_t mbedtls_psa_ffdh_export_public_key(
const psa_key_attributes_t *attributes, const psa_key_attributes_t *attributes,
const uint8_t *key_buffer, const uint8_t *key_buffer,
size_t key_buffer_size, size_t key_buffer_size,

View File

@ -100,14 +100,14 @@ psa_status_t mbedtls_test_transparent_key_agreement(
if (PSA_ALG_IS_FFDH(alg)) { if (PSA_ALG_IS_FFDH(alg)) {
#if (defined(MBEDTLS_TEST_LIBTESTDRIVER1) && \ #if (defined(MBEDTLS_TEST_LIBTESTDRIVER1) && \
defined(LIBTESTDRIVER1_MBEDTLS_PSA_BUILTIN_ALG_FFDH)) defined(LIBTESTDRIVER1_MBEDTLS_PSA_BUILTIN_ALG_FFDH))
return libtestdriver1_mbedtls_psa_key_agreement_ffdh( return libtestdriver1_mbedtls_psa_ffdh_key_agreement(
(const libtestdriver1_psa_key_attributes_t *) attributes, (const libtestdriver1_psa_key_attributes_t *) attributes,
peer_key, peer_key_length, peer_key, peer_key_length,
key_buffer, key_buffer_size, key_buffer, key_buffer_size,
shared_secret, shared_secret_size, shared_secret, shared_secret_size,
shared_secret_length); shared_secret_length);
#elif defined(MBEDTLS_PSA_BUILTIN_ALG_FFDH) #elif defined(MBEDTLS_PSA_BUILTIN_ALG_FFDH)
return mbedtls_psa_key_agreement_ffdh( return mbedtls_psa_ffdh_key_agreement(
attributes, attributes,
peer_key, peer_key,
peer_key_length, peer_key_length,

View File

@ -593,13 +593,13 @@ psa_status_t mbedtls_test_transparent_export_public_key(
#if defined(MBEDTLS_TEST_LIBTESTDRIVER1) && \ #if defined(MBEDTLS_TEST_LIBTESTDRIVER1) && \
(defined(LIBTESTDRIVER1_MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR) || \ (defined(LIBTESTDRIVER1_MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR) || \
defined(LIBTESTDRIVER1_MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_PUBLIC_KEY)) defined(LIBTESTDRIVER1_MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_PUBLIC_KEY))
return libtestdriver1_mbedtls_psa_export_ffdh_public_key( return libtestdriver1_mbedtls_psa_ffdh_export_public_key(
(const libtestdriver1_psa_key_attributes_t *) attributes, (const libtestdriver1_psa_key_attributes_t *) attributes,
key_buffer, key_buffer_size, key_buffer, key_buffer_size,
data, data_size, data_length); data, data_size, data_length);
#elif defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR) || \ #elif defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR) || \
defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_PUBLIC_KEY) defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_PUBLIC_KEY)
return mbedtls_psa_export_ffdh_public_key( return mbedtls_psa_ffdh_export_public_key(
attributes, attributes,
key_buffer, key_buffer_size, key_buffer, key_buffer_size,
data, data_size, data_length); data, data_size, data_length);