Merge pull request #34 from eleuzi01/replace-ecc-keys

Replace MBEDTLS_PK_HAVE_ECC_KEYS with PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY

Validated for dev by the CI of https://github.com/Mbed-TLS/mbedtls/pull/9492, for 3.6 by the CI of https://github.com/Mbed-TLS/mbedtls/pull/9640.

scripts/generate_config_tests.py

@@ -14,6 +14,7 @@ import config
 from mbedtls_framework import config_common
 from mbedtls_framework import test_case
 from mbedtls_framework import test_data_generation
+from mbedtls_framework import build_tree
 
 
 def single_setting_case(setting: config_common.Setting, when_on: bool,
@@ -87,7 +88,13 @@ def dependencies_of_setting(cfg: config_common.Config,
         if name.startswith('MBEDTLS_CIPHER_PADDING_'):
             return 'MBEDTLS_CIPHER_C:MBEDTLS_CIPHER_MODE_CBC'
         if name.startswith('MBEDTLS_PK_PARSE_EC_'):
-            return 'MBEDTLS_PK_C:MBEDTLS_PK_HAVE_ECC_KEYS'
+            #temporary solution to determine correct dependency macros between 3.6 and 4.0
+            #see issue #51 in mbedtls-framework
+            if build_tree.is_mbedtls_3_6():
+                return 'MBEDTLS_PK_C:MBEDTLS_PK_HAVE_ECC_KEYS'
+            else:
+                return 'MBEDTLS_PK_C:PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY'
+
         # For TLS settings, insist on having them once off and once on in
         # a configuration where both client support and server support are
         # enabled. The settings are also meaningful when only one side is

scripts/generate_pkcs7_tests.py

@@ -16,6 +16,7 @@ Given a valid DER pkcs7 file add tests to the test_suite_pkcs7.data file
 
 import sys
 from os.path import exists
+from mbedtls_framework import build_tree
 
 PKCS7_TEST_FILE = "../suites/test_suite_pkcs7.data"
 
@@ -37,7 +38,13 @@ class TestData:
     Take in test_suite_pkcs7.data file.
     Allow for new tests to be added.
     """
-    mandatory_dep = "MBEDTLS_MD_CAN_SHA256"
+    #temporary solution to determine correct dependency macros between 3.6 and 4.0
+    #see issue #51 in mbedtls-framework
+    if build_tree.is_mbedtls_3_6():
+        mandatory_dep = "MBEDTLS_MD_CAN_SHA256"
+    else:
+        mandatory_dep = "PSA_WANT_ALG_SHA_256"
+
     test_name = "PKCS7 Parse Failure Invalid ASN1"
     test_function = "pkcs7_asn1_fail:"
     def __init__(self, file_name):