yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-30 00:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't duplicate the definition of PSA_ALG_IS_HASH_AND_SIGN

Browse Source 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2021-02-24 21:39:52 +01:00
parent 2aff17b8c5
commit 6d40085177
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/psa/crypto_extra.h
View File

@ -407,10 +407,9 @@ psa_status_t mbedtls_psa_inject_entropy(const uint8_t *seed,
/* We need to expand the sample definition of this macro from /* We need to expand the sample definition of this macro from
* the API definition. */ * the API definition. */
#undef PSA_ALG_IS_HASH_AND_SIGN #undef PSA_ALG_IS_VENDOR_HASH_AND_SIGN
#define PSA_ALG_IS_HASH_AND_SIGN(alg) \ #define PSA_ALG_IS_VENDOR_HASH_AND_SIGN(alg) \
(PSA_ALG_IS_RSA_PSS(alg) || PSA_ALG_IS_RSA_PKCS1V15_SIGN(alg) || \ PSA_ALG_IS_DSA(alg)
PSA_ALG_IS_DSA(alg) || PSA_ALG_IS_ECDSA(alg))
/**@}*/ /**@}*/

8
include/psa/crypto_values.h
View File

@ -1344,6 +1344,11 @@
#define PSA_ALG_IS_RANDOMIZED_ECDSA(alg) \ #define PSA_ALG_IS_RANDOMIZED_ECDSA(alg) \
(PSA_ALG_IS_ECDSA(alg) && !PSA_ALG_ECDSA_IS_DETERMINISTIC(alg)) (PSA_ALG_IS_ECDSA(alg) && !PSA_ALG_ECDSA_IS_DETERMINISTIC(alg))
/* Default definition, to be overridden if the library is extended with
* more hash-and-sign algorithms that we want to keep out of this header
* file. */
#define PSA_ALG_IS_VENDOR_HASH_AND_SIGN(alg) 0
/** Whether the specified algorithm is a hash-and-sign algorithm. /** Whether the specified algorithm is a hash-and-sign algorithm.
* *
* Hash-and-sign algorithms are asymmetric (public-key) signature algorithms * Hash-and-sign algorithms are asymmetric (public-key) signature algorithms
@ -1359,7 +1364,8 @@
*/ */
#define PSA_ALG_IS_HASH_AND_SIGN(alg) \ #define PSA_ALG_IS_HASH_AND_SIGN(alg) \
(PSA_ALG_IS_RSA_PSS(alg) || PSA_ALG_IS_RSA_PKCS1V15_SIGN(alg) || \ (PSA_ALG_IS_RSA_PSS(alg) || PSA_ALG_IS_RSA_PKCS1V15_SIGN(alg) || \
PSA_ALG_IS_ECDSA(alg)) PSA_ALG_IS_ECDSA(alg) || \
PSA_ALG_IS_VENDOR_HASH_AND_SIGN(alg))
/** Get the hash used by a hash-and-sign signature algorithm. /** Get the hash used by a hash-and-sign signature algorithm.
* *