crypto: Use updated ECC curve macros

ARMmbed · Apr 7, 2020 · 65e9124 · 65e9124
1 parent 7ed3f9c
commit 65e9124
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/TESTS/psa/attestation/main.cpp b/TESTS/psa/attestation/main.cpp
@@ -98,7 +98,7 @@ static void check_initial_attestation_get_token()
  TEST_ASSERT_EQUAL(status, PSA_SUCCESS);
  status = psa_attestation_inject_key(private_key_data,
  sizeof(private_key_data),
- PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_CURVE_SECP256R1),
+ PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_CURVE_SECP_R1),
  exported,
  sizeof(exported),
  &exported_length);

diff --git a/TESTS/psa/crypto_access_control/COMPONENT_NSPE/main.cpp b/TESTS/psa/crypto_access_control/COMPONENT_NSPE/main.cpp
@@ -348,7 +348,7 @@ void test_use_other_partition_key_aead(void)
 void test_use_other_partition_key_asymmetric_sign_verify(void)
 {
  static const psa_key_id_t key_id = 999;
- static const psa_key_type_t key_type = PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_CURVE_SECP256R1);
+ static const psa_key_type_t key_type = PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_CURVE_SECP_R1);
  static const psa_algorithm_t key_alg = PSA_ALG_ECDSA(PSA_ALG_SHA_256);
  static const psa_key_usage_t key_usage = PSA_KEY_USAGE_SIGN | PSA_KEY_USAGE_VERIFY;
  static const size_t key_bits = 256;

diff --git a/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IMPL/attest_crypto_keys.c b/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IMPL/attest_crypto_keys.c
@@ -48,21 +48,12 @@ static psa_status_t get_curve(psa_key_type_t type, enum ecc_curve_t *curve_type)
 {
  psa_ecc_curve_t curve = PSA_KEY_TYPE_GET_CURVE(type);
  switch (curve) {
- case PSA_ECC_CURVE_SECP256R1:
+ case PSA_ECC_CURVE_SECP_R1:
  *curve_type = P_256;
  break;
- case PSA_ECC_CURVE_SECP384R1:
- *curve_type = P_384;
- break;
- case PSA_ECC_CURVE_SECP521R1:
- *curve_type = P_521;
- break;
- case PSA_ECC_CURVE_CURVE25519:
+ case PSA_ECC_CURVE_MONTGOMERY:
  *curve_type = X25519;
  break;
- case PSA_ECC_CURVE_CURVE448:
- *curve_type = X448;
- break;
  default:
  return (PSA_ERROR_NOT_SUPPORTED);
  }

diff --git a/features/frameworks/TARGET_PSA/pal/pal_mbed_os_intf.cpp b/features/frameworks/TARGET_PSA/pal/pal_mbed_os_intf.cpp
@@ -63,7 +63,7 @@ static void psa_attestation_inject_key_for_test(void)
  psa_attestation_destroy_key_for_test();
  psa_attestation_inject_key(private_key_data,
  sizeof(private_key_data),
- PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_CURVE_SECP256R1),
+ PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_CURVE_SECP_R1),
  exported,
  sizeof(exported),
  &exported_length);