Mbed-TLS/mbedtls-framework
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls-framework.git synced 2026-09-17 07:39:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Undo temporary solution

Browse Source 
Signed-off-by: Elena Uziunaite <[email protected]>
This commit is contained in:
Elena Uziunaite
2024-10-24 17:01:31 +01:00
parent 2808d0cd71
commit 9cfdbe933e
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/generate_config_tests.py
+1 -7
View File
@@ -14,7 +14,6 @@ import config
from mbedtls_framework import config_common from mbedtls_framework import config_common
from mbedtls_framework import test_case from mbedtls_framework import test_case
from mbedtls_framework import test_data_generation from mbedtls_framework import test_data_generation
from mbedtls_framework import build_tree
def single_setting_case(setting: config_common.Setting, when_on: bool, def single_setting_case(setting: config_common.Setting, when_on: bool,
@@ -88,12 +87,7 @@ def dependencies_of_setting(cfg: config_common.Config,
if name.startswith('MBEDTLS_CIPHER_PADDING_'): if name.startswith('MBEDTLS_CIPHER_PADDING_'):
return 'MBEDTLS_CIPHER_C:MBEDTLS_CIPHER_MODE_CBC' return 'MBEDTLS_CIPHER_C:MBEDTLS_CIPHER_MODE_CBC'
if name.startswith('MBEDTLS_PK_PARSE_EC_'): if name.startswith('MBEDTLS_PK_PARSE_EC_'):
#temporary solution to determine correct dependency macros between 3.6 and 4.0 return 'MBEDTLS_PK_C:' + test_case.psa_or_3_6_feature_macro('PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY','')
#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 # For TLS settings, insist on having them once off and once on in
# a configuration where both client support and server support are # a configuration where both client support and server support are
scripts/generate_pkcs7_tests.py
+2 -7
View File
@@ -16,7 +16,7 @@ Given a valid DER pkcs7 file add tests to the test_suite_pkcs7.data file
import sys import sys
from os.path import exists from os.path import exists
from mbedtls_framework import build_tree from mbedtls_framework import test_case
PKCS7_TEST_FILE = "../suites/test_suite_pkcs7.data" PKCS7_TEST_FILE = "../suites/test_suite_pkcs7.data"
@@ -38,12 +38,7 @@ class TestData:
Take in test_suite_pkcs7.data file. Take in test_suite_pkcs7.data file.
Allow for new tests to be added. Allow for new tests to be added.
""" """
#temporary solution to determine correct dependency macros between 3.6 and 4.0 mandatory_dep = test_case.psa_or_3_6_feature_macro("PSA_ALG_SHA_256", "")
#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_name = "PKCS7 Parse Failure Invalid ASN1"
test_function = "pkcs7_asn1_fail:" test_function = "pkcs7_asn1_fail:"