mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-01-31 18:32:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8517 from mschulz-at-hilscher/fixes/issue-6910

Browse Source 
Fixes redundant declarations for psa_set_key_domain_parameters
This commit is contained in:
Dave Rodgman 2024-01-02 16:34:40 +00:00 committed by GitHub
commit 1cc90a1003
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/psa/crypto_extra.h
View File

@ -464,10 +464,13 @@ psa_status_t mbedtls_psa_inject_entropy(const uint8_t *seed,
* \retval #PSA_ERROR_NOT_SUPPORTED \emptydescription * \retval #PSA_ERROR_NOT_SUPPORTED \emptydescription
* \retval #PSA_ERROR_INSUFFICIENT_MEMORY \emptydescription * \retval #PSA_ERROR_INSUFFICIENT_MEMORY \emptydescription
*/ */
#if !defined(PSA_SET_KEY_DOMAIN_PARAMETERS)
#define PSA_SET_KEY_DOMAIN_PARAMETERS
psa_status_t psa_set_key_domain_parameters(psa_key_attributes_t *attributes, psa_status_t psa_set_key_domain_parameters(psa_key_attributes_t *attributes,
psa_key_type_t type, psa_key_type_t type,
const uint8_t *data, const uint8_t *data,
size_t data_length); size_t data_length);
#endif /* PSA_SET_KEY_DOMAIN_PARAMETERS */
/** /**
* \brief Get domain parameters for a key. * \brief Get domain parameters for a key.

3
include/psa/crypto_struct.h
View File

@ -368,10 +368,13 @@ static inline psa_algorithm_t psa_get_key_algorithm(
/* This function is declared in crypto_extra.h, which comes after this /* This function is declared in crypto_extra.h, which comes after this
* header file, but we need the function here, so repeat the declaration. */ * header file, but we need the function here, so repeat the declaration. */
#if !defined(PSA_SET_KEY_DOMAIN_PARAMETERS)
#define PSA_SET_KEY_DOMAIN_PARAMETERS
psa_status_t psa_set_key_domain_parameters(psa_key_attributes_t *attributes, psa_status_t psa_set_key_domain_parameters(psa_key_attributes_t *attributes,
psa_key_type_t type, psa_key_type_t type,
const uint8_t *data, const uint8_t *data,
size_t data_length); size_t data_length);
#endif /* PSA_SET_KEY_DOMAIN_PARAMETERS */
static inline void psa_set_key_type(psa_key_attributes_t *attributes, static inline void psa_set_key_type(psa_key_attributes_t *attributes,
psa_key_type_t type) psa_key_type_t type)