lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00
Code Activity

generate_tls13_compat_tests.py: Fix/Unify parameter ordering

Browse Source 
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
This commit is contained in:
Ronald Cron
2022-04-05 16:13:38 +02:00
parent df5f8681cc
commit 9d0a3e8296
2 changed files with 2604 additions and 2602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5180
tests/opt-testcases/tls13-compat.sh
View File

File diff suppressed because it is too large Load Diff

26
tests/scripts/generate_tls13_compat_tests.py
View File

@ -349,7 +349,7 @@ SERVER_CLASSES = {'OpenSSL': OpenSSLServ, 'GnuTLS': GnuTLSServ}
CLIENT_CLASSES = {'mbedTLS': MbedTLSCli} CLIENT_CLASSES = {'mbedTLS': MbedTLSCli}
def generate_compat_test(server=None, client=None, cipher=None, sig_alg=None, named_group=None): def generate_compat_test(client=None, server=None, cipher=None, named_group=None, sig_alg=None):
""" """
Generate test case with `ssl-opt.sh` format. Generate test case with `ssl-opt.sh` format.
""" """
@ -375,8 +375,9 @@ def generate_compat_test(server=None, client=None, cipher=None, sig_alg=None, na
return '\n'.join(server_object.pre_checks() + client_object.pre_checks() + [cmd]) return '\n'.join(server_object.pre_checks() + client_object.pre_checks() + [cmd])
def generate_hrr_compat_test(client=None, server=None, cert_sig_alg=None, def generate_hrr_compat_test(client=None, server=None,
client_named_group=None, server_named_group=None): client_named_group=None, server_named_group=None,
cert_sig_alg=None):
""" """
Generate Hello Retry Request test case with `ssl-opt.sh` format. Generate Hello Retry Request test case with `ssl-opt.sh` format.
""" """
@ -480,14 +481,15 @@ def main():
def get_all_test_cases(): def get_all_test_cases():
# Generate normal compat test cases # Generate normal compat test cases
for cipher, sig_alg, named_group, server, client in \ for client, server, cipher, named_group, sig_alg in \
itertools.product(CIPHER_SUITE_IANA_VALUE.keys(), itertools.product(CLIENT_CLASSES.keys(),
SIG_ALG_IANA_VALUE.keys(),
NAMED_GROUP_IANA_VALUE.keys(),
SERVER_CLASSES.keys(), SERVER_CLASSES.keys(),
CLIENT_CLASSES.keys()): CIPHER_SUITE_IANA_VALUE.keys(),
yield generate_compat_test(cipher=cipher, sig_alg=sig_alg, named_group=named_group, NAMED_GROUP_IANA_VALUE.keys(),
server=server, client=client) SIG_ALG_IANA_VALUE.keys()):
yield generate_compat_test(client=client, server=server,
cipher=cipher, named_group=named_group,
sig_alg=sig_alg)
# Generate Hello Retry Request compat test cases # Generate Hello Retry Request compat test cases
for client, server, client_named_group, server_named_group in \ for client, server, client_named_group, server_named_group in \
@ -497,9 +499,9 @@ def main():
NAMED_GROUP_IANA_VALUE.keys()): NAMED_GROUP_IANA_VALUE.keys()):
if client_named_group != server_named_group: if client_named_group != server_named_group:
yield generate_hrr_compat_test(client=client, server=server, yield generate_hrr_compat_test(client=client, server=server,
cert_sig_alg="ecdsa_secp256r1_sha256",
client_named_group=client_named_group, client_named_group=client_named_group,
server_named_group=server_named_group) server_named_group=server_named_group,
cert_sig_alg="ecdsa_secp256r1_sha256")
if args.generate_all_tls13_compat_tests: if args.generate_all_tls13_compat_tests:
if args.output: if args.output: