From ec07950e532d328b36122d2f730d2e0c4efab07f Mon Sep 17 00:00:00 2001 From: Darryl Green Date: Tue, 29 Jan 2019 15:48:00 +0000 Subject: [PATCH] Exclude ECDH and FFDH key agreement algorithms for now --- tests/scripts/test_psa_constant_names.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/scripts/test_psa_constant_names.py b/tests/scripts/test_psa_constant_names.py index 7f7076c4cb..1c19cd44b0 100755 --- a/tests/scripts/test_psa_constant_names.py +++ b/tests/scripts/test_psa_constant_names.py @@ -131,7 +131,9 @@ where each argument takes each possible value at least once.''' excluded_name_re = re.compile('_(?:GET|IS|OF)_|_(?:BASE|FLAG|MASK)\Z') # Additional excluded macros. excluded_names = set(['PSA_ALG_AEAD_WITH_DEFAULT_TAG_LENGTH', - 'PSA_ALG_FULL_LENGTH_MAC']) + 'PSA_ALG_FULL_LENGTH_MAC', + 'PSA_ALG_ECDH', + 'PSA_ALG_FFDH']) argument_split_re = re.compile(r' *, *') def parse_header_line(self, line): '''Parse a C header line, looking for "#define PSA_xxx".''' @@ -158,6 +160,8 @@ where each argument takes each possible value at least once.''' def add_test_case_line(self, function, argument): '''Parse a test case data line, looking for algorithm metadata tests.''' if function.endswith('_algorithm'): + if 'ECDH' in argument or 'FFDH' in argument: + return self.algorithms.add(argument) if function == 'hash_algorithm': self.hash_algorithms.add(argument)