fix pylint fail

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2021-11-29 17:37:19 +08:00
parent 55ee769b51
commit 7f5e5adfa3

View File

@ -45,7 +45,6 @@ CERTIFICATES = {
} }
CAFILE = { CAFILE = {
'ecdsa_secp256r1_sha256': 'data_files/test-ca2.crt', 'ecdsa_secp256r1_sha256': 'data_files/test-ca2.crt',
'ecdsa_secp384r1_sha384': 'data_files/test-ca2.crt', 'ecdsa_secp384r1_sha384': 'data_files/test-ca2.crt',
@ -76,7 +75,6 @@ NAMED_GROUP_IANA_VALUE = {
'x448': 0x1e, 'x448': 0x1e,
} }
OUTPUT_FILE=sys.stdout
def remove_duplicates(seq): def remove_duplicates(seq):
seen = set() seen = set()
@ -372,7 +370,8 @@ def generate_compat_test(server=None, client=None, cipher=None, # pylint: disab
cmd = prefix.join(cmd) cmd = prefix.join(cmd)
return '\n'.join(server.pre_checks() + client.pre_checks() + [cmd]) return '\n'.join(server.pre_checks() + client.pre_checks() + [cmd])
SSL_OUTPUT_HEADER='''#!/bin/sh
SSL_OUTPUT_HEADER = '''#!/bin/sh
# {filename} # {filename}
# #
@ -401,11 +400,12 @@ SSL_OUTPUT_HEADER='''#!/bin/sh
# #
''' '''
def main(): def main():
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('-o', '--output', nargs='?', parser.add_argument('-o', '--output', nargs='?',
default=None, help='Output file path') default=None, help='Output file path if `-a` was set')
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')
@ -442,34 +442,38 @@ def main():
help='Choose cipher suite for test') help='Choose cipher suite for test')
args = parser.parse_args() args = parser.parse_args()
if args.output:
OUTPUT_FILE=open(args.output,'w')
OUTPUT_FILE.write(SSL_OUTPUT_HEADER.format(filename=args.output))
if args.generate_all_tls13_compat_tests: def get_all_test_cases():
for i in itertools.product(CIPHER_SUITE_IANA_VALUE.keys(), SIG_ALG_IANA_VALUE.keys(), for i in itertools.product(CIPHER_SUITE_IANA_VALUE.keys(), SIG_ALG_IANA_VALUE.keys(),
NAMED_GROUP_IANA_VALUE.keys(), SERVER_CLS.keys(), NAMED_GROUP_IANA_VALUE.keys(), SERVER_CLS.keys(),
CLIENT_CLS.keys()): CLIENT_CLS.keys()):
test_case = generate_compat_test( **dict( yield generate_compat_test(**dict(
zip(['cipher', 'sig_alg', 'named_group', 'server', 'client'], i))) zip(['cipher', 'sig_alg', 'named_group', 'server', 'client'], i)))
print(test_case,file=OUTPUT_FILE)
if args.generate_all_tls13_compat_tests:
if args.output:
with open(args.output, 'w', encoding="utf-8") as f:
f.write(SSL_OUTPUT_HEADER.format(filename=args.output))
f.write('\n\n'.join(get_all_test_cases()))
else:
print('\n'.join(get_all_test_cases()))
return 0 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:
print(*CIPHER_SUITE_IANA_VALUE.keys(),file=OUTPUT_FILE) print(*CIPHER_SUITE_IANA_VALUE.keys())
if args.list_sig_algs: if args.list_sig_algs:
print(*SIG_ALG_IANA_VALUE.keys(),file=OUTPUT_FILE) print(*SIG_ALG_IANA_VALUE.keys())
if args.list_named_groups: if args.list_named_groups:
print(*NAMED_GROUP_IANA_VALUE.keys(),file=OUTPUT_FILE) print(*NAMED_GROUP_IANA_VALUE.keys())
if args.list_servers: if args.list_servers:
print(*SERVER_CLS.keys(),file=OUTPUT_FILE) print(*SERVER_CLS.keys())
if args.list_clients: if args.list_clients:
print(*CLIENT_CLS.keys(),file=OUTPUT_FILE) print(*CLIENT_CLS.keys())
return 0 return 0
print(generate_compat_test(**vars(args)),file=OUTPUT_FILE) print(generate_compat_test(**vars(args)))
return 0 return 0