Use PSA macros for the `pkalgs` domain
Signed-off-by: Gabor Mezei <gabor.mezei@arm.com>
diff --git a/tests/scripts/depends.py b/tests/scripts/depends.py
index 5e025ba..cfd9f40 100755
--- a/tests/scripts/depends.py
+++ b/tests/scripts/depends.py
@@ -281,50 +281,52 @@
'PSA_WANT_ECC_MONTGOMERY_448': ['MBEDTLS_ECP_DP_CURVE448_ENABLED'],
'PSA_WANT_ECC_SECP_R1_192': ['MBEDTLS_ECP_DP_SECP192R1_ENABLED'],
'PSA_WANT_ECC_SECP_R1_224': ['MBEDTLS_ECP_DP_SECP224R1_ENABLED'],
- 'PSA_WANT_ECC_SECP_R1_256': ['MBEDTLS_ECJPAKE_C',
+ 'PSA_WANT_ECC_SECP_R1_256': ['PSA_WANT_ALG_JPAKE',
'MBEDTLS_ECP_DP_SECP256R1_ENABLED'],
'PSA_WANT_ECC_SECP_R1_384': ['MBEDTLS_ECP_DP_SECP384R1_ENABLED'],
'PSA_WANT_ECC_SECP_R1_521': ['MBEDTLS_ECP_DP_SECP521R1_ENABLED'],
'PSA_WANT_ECC_SECP_K1_192': ['MBEDTLS_ECP_DP_SECP192K1_ENABLED'],
'PSA_WANT_ECC_SECP_K1_256': ['MBEDTLS_ECP_DP_SECP256K1_ENABLED'],
- 'MBEDTLS_ECDSA_C': ['MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED',
- 'MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED',
- 'PSA_WANT_ALG_ECDSA',
- 'PSA_WANT_ALG_DETERMINISTIC_ECDSA'],
- 'MBEDTLS_ECP_C': ['MBEDTLS_ECDSA_C',
- 'MBEDTLS_ECDH_C', 'PSA_WANT_ALG_ECDH',
- 'MBEDTLS_ECJPAKE_C',
- 'MBEDTLS_ECP_RESTARTABLE',
- 'MBEDTLS_PK_PARSE_EC_EXTENDED',
- 'MBEDTLS_PK_PARSE_EC_COMPRESSED',
- 'MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED',
- 'MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED',
- 'MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED',
- 'MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL_ENABLED',
- 'MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_ENABLED',
- 'PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY',
- 'PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC',
- 'PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT',
- 'PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT',
- 'PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE',
- 'PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE'],
- 'MBEDTLS_ECJPAKE_C': ['MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED',
- 'PSA_WANT_ALG_JPAKE'],
- 'MBEDTLS_PKCS1_V21': ['MBEDTLS_X509_RSASSA_PSS_SUPPORT',
- 'PSA_WANT_ALG_RSA_OAEP',
- 'PSA_WANT_ALG_RSA_PSS'],
- 'MBEDTLS_PKCS1_V15': ['MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED',
- 'PSA_WANT_ALG_RSA_PKCS1V15_CRYPT',
- 'PSA_WANT_ALG_RSA_PKCS1V15_SIGN'],
- 'MBEDTLS_RSA_C': ['MBEDTLS_PKCS1_V15',
- 'MBEDTLS_PKCS1_V21',
- 'MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED',
- 'PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY',
- 'PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC',
- 'PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT',
- 'PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT',
- 'PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE'],
+ 'PSA_WANT_ALG_ECDSA': ['PSA_WANT_ALG_DETERMINISTIC_ECDSA',
+ 'MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED',
+ 'MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED',
+ 'MBEDTLS_ECDSA_C'],
+ 'PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC': [
+ 'PSA_WANT_ALG_ECDSA',
+ 'PSA_WANT_ALG_ECDH', 'MBEDTLS_ECDH_C',
+ 'PSA_WANT_ALG_JPAKE',
+ 'PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY',
+ 'PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT',
+ 'PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT',
+ 'PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE',
+ 'PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE',
+ 'MBEDTLS_ECP_RESTARTABLE',
+ 'MBEDTLS_PK_PARSE_EC_EXTENDED',
+ 'MBEDTLS_PK_PARSE_EC_COMPRESSED',
+ 'MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED',
+ 'MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED',
+ 'MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED',
+ 'MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL_ENABLED',
+ 'MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_ENABLED',
+ 'MBEDTLS_ECP_C'],
+ 'PSA_WANT_ALG_JPAKE': ['MBEDTLS_ECJPAKE_C',
+ 'MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED'],
+ 'PSA_WANT_ALG_RSA_OAEP': ['PSA_WANT_ALG_RSA_PSS',
+ 'MBEDTLS_X509_RSASSA_PSS_SUPPORT',
+ 'MBEDTLS_PKCS1_V21'],
+ 'PSA_WANT_ALG_RSA_PKCS1V15_CRYPT': ['PSA_WANT_ALG_RSA_PKCS1V15_SIGN',
+ 'MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED',
+ 'MBEDTLS_PKCS1_V15'],
+ 'PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC': [
+ 'PSA_WANT_ALG_RSA_PKCS1V15_CRYPT',
+ 'PSA_WANT_ALG_RSA_OAEP',
+ 'PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY',
+ 'PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT',
+ 'PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT',
+ 'PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE',
+ 'MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED',
+ 'MBEDTLS_RSA_C'],
'MBEDTLS_MD5_C' : ['PSA_WANT_ALG_MD5'],
'MBEDTLS_RIPEMD160_C' : ['PSA_WANT_ALG_RIPEMD160'],
@@ -359,12 +361,10 @@
EXCLUSIVE_GROUPS = {
'MBEDTLS_SHA512_C': ['-MBEDTLS_SSL_COOKIE_C',
'-MBEDTLS_SSL_TLS_C'],
- 'PSA_WANT_ECC_MONTGOMERY_448': ['-MBEDTLS_ECDSA_C',
- '-MBEDTLS_ECDSA_DETERMINISTIC',
- '-MBEDTLS_ECJPAKE_C',],
- 'PSA_WANT_ECC_MONTGOMERY_255': ['-MBEDTLS_ECDSA_C',
- '-MBEDTLS_ECDSA_DETERMINISTIC',
- '-MBEDTLS_ECJPAKE_C'],
+ 'PSA_WANT_ECC_MONTGOMERY_448': ['-PSA_WANT_ALG_ECDSA',
+ '-PSA_WANT_ALG_JPAKE',],
+ 'PSA_WANT_ECC_MONTGOMERY_255': ['-PSA_WANT_ALG_ECDSA',
+ '-PSA_WANT_ALG_JPAKE'],
'PSA_WANT_KEY_TYPE_ARIA': ['-PSA_WANT_ALG_CMAC',
'-PSA_WANT_ALG_CCM',
'-PSA_WANT_ALG_GCM',
@@ -559,11 +559,12 @@
'|MBEDTLS_SHA3_'),
# Key exchange types.
'kex': ExclusiveDomain(key_exchange_symbols, build_and_test),
- 'pkalgs': ComplementaryDomain(['MBEDTLS_ECDSA_C',
- 'MBEDTLS_ECP_C',
- 'MBEDTLS_PKCS1_V21',
- 'MBEDTLS_PKCS1_V15',
- 'MBEDTLS_RSA_C',
+
+ 'pkalgs': ComplementaryDomain(['PSA_WANT_ALG_ECDSA',
+ 'PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC',
+ 'PSA_WANT_ALG_RSA_OAEP',
+ 'PSA_WANT_ALG_RSA_PKCS1V15_CRYPT',
+ 'PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC',
'MBEDTLS_X509_RSASSA_PSS_SUPPORT'],
build_and_test),
}