mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-01-30 06:33:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix various issues

Browse Source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2021-12-01 10:41:37 +08:00
parent dda036d8e0
commit b4ac8f3c04
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
tests/scripts/generate_tls13_compat_tests.py
View File

@ -349,27 +349,26 @@ class MbedTLSCli(TLSProgram):
return ret return ret
SERVER_CLS = {'OpenSSL': OpenSSLServ, 'GnuTLS': GnuTLSServ} SERVER_CLASSES = {'OpenSSL': OpenSSLServ, 'GnuTLS': GnuTLSServ}
CLIENT_CLS = {'mbedTLS': MbedTLSCli} CLIENT_CLASSES = {'mbedTLS': MbedTLSCli}
def generate_compat_test(server=None, client=None, cipher=None, # pylint: disable=unused-argument def generate_compat_test(server=None, client=None, cipher=None, sig_alg=None, named_group=None):
sig_alg=None, named_group=None, **kwargs):
""" """
Generate test case with `ssl-opt.sh` format. Generate test case with `ssl-opt.sh` format.
""" """
name = 'TLS 1.3 {client[0]}->{server[0]}: {cipher},{named_group},{sig_alg}'.format( name = 'TLS 1.3 {client[0]}->{server[0]}: {cipher},{named_group},{sig_alg}'.format(
client=client, server=server, cipher=cipher, sig_alg=sig_alg, named_group=named_group) client=client, server=server, cipher=cipher, sig_alg=sig_alg, named_group=named_group)
server = SERVER_CLS[server](cipher, sig_alg, named_group) server_object = SERVER_CLASSES[server](cipher, sig_alg, named_group)
client = CLIENT_CLS[client](cipher, sig_alg, named_group) client_object = CLIENT_CLASSES[client](cipher, sig_alg, named_group)
cmd = ['run_test "{}"'.format(name), '"{}"'.format( cmd = ['run_test "{}"'.format(name), '"{}"'.format(
server.cmd()), '"{}"'.format(client.cmd()), '0'] server_object.cmd()), '"{}"'.format(client_object.cmd()), '0']
cmd += server.post_checks() cmd += server_object.post_checks()
cmd += client.post_checks() cmd += client_object.post_checks()
prefix = ' \\\n' + (' '*9) prefix = ' \\\n' + (' '*9)
cmd = prefix.join(cmd) cmd = prefix.join(cmd)
return '\n'.join(server.pre_checks() + client.pre_checks() + [cmd]) return '\n'.join(server_object.pre_checks() + client_object.pre_checks() + [cmd])
SSL_OUTPUT_HEADER = '''#!/bin/sh SSL_OUTPUT_HEADER = '''#!/bin/sh
@ -429,11 +428,11 @@ def main():
parser.add_argument('--list-clients', action='store_true', parser.add_argument('--list-clients', action='store_true',
default=False, help='List supported TLS Clients') default=False, help='List supported TLS Clients')
parser.add_argument('server', choices=SERVER_CLS.keys(), nargs='?', parser.add_argument('server', choices=SERVER_CLASSES.keys(), nargs='?',
default=list(SERVER_CLS.keys())[0], default=list(SERVER_CLASSES.keys())[0],
help='Choose TLS server program for test') help='Choose TLS server program for test')
parser.add_argument('client', choices=CLIENT_CLS.keys(), nargs='?', parser.add_argument('client', choices=CLIENT_CLASSES.keys(), nargs='?',
default=list(CLIENT_CLS.keys())[0], default=list(CLIENT_CLASSES.keys())[0],
help='Choose TLS client program for test') help='Choose TLS client program for test')
parser.add_argument('cipher', choices=CIPHER_SUITE_IANA_VALUE.keys(), nargs='?', parser.add_argument('cipher', choices=CIPHER_SUITE_IANA_VALUE.keys(), nargs='?',
default=list(CIPHER_SUITE_IANA_VALUE.keys())[0], default=list(CIPHER_SUITE_IANA_VALUE.keys())[0],
@ -448,16 +447,18 @@ def main():
args = parser.parse_args() args = parser.parse_args()
def get_all_test_cases(): def get_all_test_cases():
for i in itertools.product(CIPHER_SUITE_IANA_VALUE.keys(), SIG_ALG_IANA_VALUE.keys(), for cipher, sig_alg, named_group, server, client in \
NAMED_GROUP_IANA_VALUE.keys(), SERVER_CLS.keys(), itertools.product(CIPHER_SUITE_IANA_VALUE.keys(), SIG_ALG_IANA_VALUE.keys(),
CLIENT_CLS.keys()): NAMED_GROUP_IANA_VALUE.keys(), SERVER_CLASSES.keys(),
yield generate_compat_test(**dict( CLIENT_CLASSES.keys()):
zip(['cipher', 'sig_alg', 'named_group', 'server', 'client'], i))) yield generate_compat_test(cipher=cipher, sig_alg=sig_alg, named_group=named_group,
server=server, client=client)
if args.generate_all_tls13_compat_tests: if args.generate_all_tls13_compat_tests:
if args.output: if args.output:
with open(args.output, 'w', encoding="utf-8") as f: with open(args.output, 'w', encoding="utf-8") as f:
f.write(SSL_OUTPUT_HEADER.format(filename=os.path.basename(args.output))) f.write(SSL_OUTPUT_HEADER.format(
filename=os.path.basename(args.output)))
f.write('\n\n'.join(get_all_test_cases())) f.write('\n\n'.join(get_all_test_cases()))
f.write('\n') f.write('\n')
else: else:
@ -473,12 +474,13 @@ def main():
if args.list_named_groups: if args.list_named_groups:
print(*NAMED_GROUP_IANA_VALUE.keys()) print(*NAMED_GROUP_IANA_VALUE.keys())
if args.list_servers: if args.list_servers:
print(*SERVER_CLS.keys()) print(*SERVER_CLASSES.keys())
if args.list_clients: if args.list_clients:
print(*CLIENT_CLS.keys()) print(*CLIENT_CLASSES.keys())
return 0 return 0
print(generate_compat_test(**vars(args))) print(generate_compat_test(server=args.server, client=args.client,
sig_alg=args.sig_alg, cipher=args.cipher, named_group=args.named_group))
return 0 return 0