lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-28 00:21:48 +03:00
Code Activity

Remove the option r in generate_tls13_compat_tests.py

Browse Source 
Integrate two options into one
Use one dedicate cipher suite TLS_AES_256_GCM_SHA384
Use on dedicate signature algorithm ecdsa_secp384r1_sha384

Change-Id: Icbe39b985e1942edc4b1e37ce3352eed4f316ab7
Signed-off-by: XiaokangQian <xiaokang.qian@arm.com>
This commit is contained in:
XiaokangQian
2022-03-17 06:06:07 +00:00
parent 20438976f9
commit 68a87e4606
1 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tests/scripts/generate_tls13_compat_tests.py
View File

@ -70,6 +70,14 @@ NAMED_GROUP_IANA_VALUE = {
'x448': 0x1e, 'x448': 0x1e,
} }
HRR_CIPHER_SUITE_VALUE = {
"TLS_AES_256_GCM_SHA384": 0x1302,
}
HRR_SIG_ALG_VALUE = {
"ecdsa_secp384r1_sha384": 0x0503,
}
class TLSProgram(metaclass=abc.ABCMeta): class TLSProgram(metaclass=abc.ABCMeta):
""" """
Base class for generate server/client command. Base class for generate server/client command.
@ -456,9 +464,6 @@ def main():
parser.add_argument('-a', '--generate-all-tls13-compat-tests', action='store_true', parser.add_argument('-a', '--generate-all-tls13-compat-tests', action='store_true',
default=False, help='Generate all available tls13 compat tests') default=False, help='Generate all available tls13 compat tests')
parser.add_argument('-r', '--generate-hrr-tls13-compat-tests', action='store_true',
default=False, help='Generate all hrr tls13 compat tests')
parser.add_argument('--list-ciphers', action='store_true', parser.add_argument('--list-ciphers', action='store_true',
default=False, help='List supported ciphersuites') default=False, help='List supported ciphersuites')
@ -502,10 +507,8 @@ def main():
CLIENT_CLASSES.keys()): CLIENT_CLASSES.keys()):
yield generate_compat_test(cipher=cipher, sig_alg=sig_alg, named_group=named_group, yield generate_compat_test(cipher=cipher, sig_alg=sig_alg, named_group=named_group,
server=server, client=client) server=server, client=client)
def get_hrr_test_cases():
for cipher, sig_alg, client_named_group, server_named_group, server, client in \ for cipher, sig_alg, client_named_group, server_named_group, server, client in \
itertools.product(CIPHER_SUITE_IANA_VALUE.keys(), SIG_ALG_IANA_VALUE.keys(), itertools.product(HRR_CIPHER_SUITE_VALUE.keys(), HRR_SIG_ALG_VALUE.keys(),
NAMED_GROUP_IANA_VALUE.keys(), NAMED_GROUP_IANA_VALUE.keys(), NAMED_GROUP_IANA_VALUE.keys(), NAMED_GROUP_IANA_VALUE.keys(),
SERVER_CLASSES.keys(), CLIENT_CLASSES.keys()): SERVER_CLASSES.keys(), CLIENT_CLASSES.keys()):
if client_named_group != server_named_group: if client_named_group != server_named_group:
@ -525,17 +528,6 @@ def main():
print('\n\n'.join(get_all_test_cases())) print('\n\n'.join(get_all_test_cases()))
return 0 return 0
if args.generate_hrr_tls13_compat_tests:
if args.output:
with open(args.output, 'w', encoding="utf-8") as f:
f.write(SSL_OUTPUT_HEADER.format(
filename=os.path.basename(args.output), parameter='-r'))
f.write('\n\n'.join(get_hrr_test_cases()))
f.write('\n')
else:
print('\n\n'.join(get_hrr_test_cases()))
return 0
if args.list_ciphers or args.list_sig_algs or args.list_named_groups \ if args.list_ciphers or args.list_sig_algs or args.list_named_groups \
or args.list_servers or args.list_clients: or args.list_servers or args.list_clients:
if args.list_ciphers: if args.list_ciphers:
@ -554,11 +546,6 @@ def main():
print(generate_compat_test(server=args.server, client=args.client, sig_alg=args.sig_alg, print(generate_compat_test(server=args.server, client=args.client, sig_alg=args.sig_alg,
cipher=args.cipher, named_group=args.named_group)) cipher=args.cipher, named_group=args.named_group))
if args.generate_hrr_tls13_compat_tests:
print(generate_compat_hrr_test(server=args.server, client=args.client,
sig_alg=args.sig_alg, cipher=args.cipher,
client_named_group=args.client_named_group,
server_named_group=args.server_named_group))
return 0 return 0