Update metadata tests with the new IS_ALG_RSA_PSS_xxx_SALT predicates

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2021-10-04 18:14:59 +02:00
parent 35115f9c1a
commit ac6181ca1c
2 changed files with 25 additions and 23 deletions

View file

@ -196,11 +196,11 @@ asymmetric_signature_algorithm:PSA_ALG_RSA_PKCS1V15_SIGN( PSA_ALG_SHA_256 ):ALG_
Asymmetric signature: RSA PSS SHA-256 Asymmetric signature: RSA PSS SHA-256
depends_on:PSA_WANT_ALG_RSA_PSS:PSA_WANT_ALG_SHA_256 depends_on:PSA_WANT_ALG_RSA_PSS:PSA_WANT_ALG_SHA_256
asymmetric_signature_algorithm:PSA_ALG_RSA_PSS( PSA_ALG_SHA_256 ):ALG_IS_RSA_PSS | ALG_IS_HASH_AND_SIGN asymmetric_signature_algorithm:PSA_ALG_RSA_PSS( PSA_ALG_SHA_256 ):ALG_IS_RSA_PSS | ALG_IS_RSA_PSS_STANDARD_SALT | ALG_IS_HASH_AND_SIGN
Asymmetric signature: RSA PSS-any-salt SHA-256 Asymmetric signature: RSA PSS-any-salt SHA-256
depends_on:PSA_WANT_ALG_RSA_PSS:PSA_WANT_ALG_SHA_256 depends_on:PSA_WANT_ALG_RSA_PSS:PSA_WANT_ALG_SHA_256
asymmetric_signature_algorithm:PSA_ALG_RSA_PSS_ANY_SALT( PSA_ALG_SHA_256 ):ALG_IS_RSA_PSS | ALG_IS_HASH_AND_SIGN asymmetric_signature_algorithm:PSA_ALG_RSA_PSS_ANY_SALT( PSA_ALG_SHA_256 ):ALG_IS_RSA_PSS | ALG_IS_RSA_PSS_ANY_SALT | ALG_IS_HASH_AND_SIGN
Asymmetric signature: randomized ECDSA (no hashing) Asymmetric signature: randomized ECDSA (no hashing)
depends_on:PSA_WANT_ALG_ECDSA depends_on:PSA_WANT_ALG_ECDSA
@ -232,11 +232,11 @@ asymmetric_signature_wildcard:PSA_ALG_RSA_PKCS1V15_SIGN( PSA_ALG_ANY_HASH ):ALG_
Asymmetric signature: RSA PSS with wildcard hash Asymmetric signature: RSA PSS with wildcard hash
depends_on:PSA_WANT_ALG_RSA_PSS depends_on:PSA_WANT_ALG_RSA_PSS
asymmetric_signature_wildcard:PSA_ALG_RSA_PSS( PSA_ALG_ANY_HASH ):ALG_IS_RSA_PSS asymmetric_signature_wildcard:PSA_ALG_RSA_PSS( PSA_ALG_ANY_HASH ):ALG_IS_RSA_PSS | ALG_IS_RSA_PSS_STANDARD_SALT
Asymmetric signature: RSA PSS-any-salt with wildcard hash Asymmetric signature: RSA PSS-any-salt with wildcard hash
depends_on:PSA_WANT_ALG_RSA_PSS depends_on:PSA_WANT_ALG_RSA_PSS
asymmetric_signature_wildcard:PSA_ALG_RSA_PSS_ANY_SALT( PSA_ALG_ANY_HASH ):ALG_IS_RSA_PSS asymmetric_signature_wildcard:PSA_ALG_RSA_PSS_ANY_SALT( PSA_ALG_ANY_HASH ):ALG_IS_RSA_PSS | ALG_IS_RSA_PSS_ANY_SALT
Asymmetric signature: randomized ECDSA with wildcard hash Asymmetric signature: randomized ECDSA with wildcard hash
depends_on:PSA_WANT_ALG_ECDSA depends_on:PSA_WANT_ALG_ECDSA

View file

@ -22,25 +22,27 @@
#define ALG_IS_STREAM_CIPHER ( 1u << 3 ) #define ALG_IS_STREAM_CIPHER ( 1u << 3 )
#define ALG_IS_RSA_PKCS1V15_SIGN ( 1u << 4 ) #define ALG_IS_RSA_PKCS1V15_SIGN ( 1u << 4 )
#define ALG_IS_RSA_PSS ( 1u << 5 ) #define ALG_IS_RSA_PSS ( 1u << 5 )
#define ALG_IS_DSA ( 1u << 6 ) #define ALG_IS_RSA_PSS_ANY_SALT ( 1u << 6 )
#define ALG_DSA_IS_DETERMINISTIC ( 1u << 7 ) #define ALG_IS_RSA_PSS_STANDARD_SALT ( 1u << 7 )
#define ALG_IS_DETERMINISTIC_DSA ( 1u << 8 ) #define ALG_IS_DSA ( 1u << 8 )
#define ALG_IS_RANDOMIZED_DSA ( 1u << 9 ) #define ALG_DSA_IS_DETERMINISTIC ( 1u << 9 )
#define ALG_IS_ECDSA ( 1u << 10 ) #define ALG_IS_DETERMINISTIC_DSA ( 1u << 10 )
#define ALG_ECDSA_IS_DETERMINISTIC ( 1u << 11 ) #define ALG_IS_RANDOMIZED_DSA ( 1u << 11 )
#define ALG_IS_DETERMINISTIC_ECDSA ( 1u << 12 ) #define ALG_IS_ECDSA ( 1u << 12 )
#define ALG_IS_RANDOMIZED_ECDSA ( 1u << 13 ) #define ALG_ECDSA_IS_DETERMINISTIC ( 1u << 13 )
#define ALG_IS_HASH_EDDSA ( 1u << 14 ) #define ALG_IS_DETERMINISTIC_ECDSA ( 1u << 14 )
#define ALG_IS_HASH_AND_SIGN ( 1u << 15 ) #define ALG_IS_RANDOMIZED_ECDSA ( 1u << 15 )
#define ALG_IS_RSA_OAEP ( 1u << 16 ) #define ALG_IS_HASH_EDDSA ( 1u << 16 )
#define ALG_IS_HKDF ( 1u << 17 ) #define ALG_IS_HASH_AND_SIGN ( 1u << 17 )
#define ALG_IS_FFDH ( 1u << 18 ) #define ALG_IS_RSA_OAEP ( 1u << 18 )
#define ALG_IS_ECDH ( 1u << 19 ) #define ALG_IS_HKDF ( 1u << 19 )
#define ALG_IS_WILDCARD ( 1u << 20 ) #define ALG_IS_FFDH ( 1u << 20 )
#define ALG_IS_RAW_KEY_AGREEMENT ( 1u << 21 ) #define ALG_IS_ECDH ( 1u << 21 )
#define ALG_IS_AEAD_ON_BLOCK_CIPHER ( 1u << 22 ) #define ALG_IS_WILDCARD ( 1u << 22 )
#define ALG_IS_TLS12_PRF ( 1u << 23 ) #define ALG_IS_RAW_KEY_AGREEMENT ( 1u << 23 )
#define ALG_IS_TLS12_PSK_TO_MS ( 1u << 24 ) #define ALG_IS_AEAD_ON_BLOCK_CIPHER ( 1u << 24 )
#define ALG_IS_TLS12_PRF ( 1u << 25 )
#define ALG_IS_TLS12_PSK_TO_MS ( 1u << 26 )
/* Flags for key type classification macros. There is a flag for every /* Flags for key type classification macros. There is a flag for every
* key type classification macro PSA_KEY_TYPE_IS_xxx except for some that * key type classification macro PSA_KEY_TYPE_IS_xxx except for some that