aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-08-23 10:41:04 -0400
committerJack Lloyd <[email protected]>2017-08-23 10:41:04 -0400
commita89d2f46b686f16091a8912bae8fad28101269ea (patch)
treef09cb2662dfe76b7bc803127d561df5f7f45e143
parentf6a6d44c22b027f1532c9b9834f33d4ebf86a047 (diff)
Add ARIA option to TLS suite info generator
So it can be easily enabled if someone wants it.
-rwxr-xr-xsrc/scripts/tls_suite_info.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/scripts/tls_suite_info.py b/src/scripts/tls_suite_info.py
index 0bf70873a..ec91d598a 100755
--- a/src/scripts/tls_suite_info.py
+++ b/src/scripts/tls_suite_info.py
@@ -176,6 +176,11 @@ def process_command_line(args):
parser.add_option('--without-ocb', action='store_false', dest='with_ocb',
help='disable OCB AEAD suites')
+ parser.add_option('--with-aria', action='store_true', default=False,
+ help='enable ARIA suites')
+ parser.add_option('--without-aria', action='store_false', dest='with_aria',
+ help='disable ARIA suites')
+
parser.add_option('--with-cecpq1', action='store_true', default=True,
help='enable CECPQ1 suites')
parser.add_option('--without-cecpq1', action='store_false', dest='with_cecpq1',
@@ -202,11 +207,14 @@ def main(args = None):
weak_crypto = ['EXPORT', 'RC2', 'IDEA', 'RC4', '_DES_', 'WITH_NULL']
static_dh = ['ECDH_ECDSA', 'ECDH_RSA', 'DH_DSS', 'DH_RSA'] # not supported
protocol_goop = ['SCSV', 'KRB5']
- maybe_someday = ['ARIA', 'RSA_PSK']
+ maybe_someday = ['RSA_PSK']
not_supported = weak_crypto + static_dh + protocol_goop + maybe_someday
(options, args) = process_command_line(args)
+ if options.with_aria == False:
+ not_supported += ['ARIA']
+
ciphersuite_re = re.compile(' +0x([0-9a-fA-F][0-9a-fA-F]),0x([0-9a-fA-F][0-9a-fA-F]) + TLS_([A-Za-z_0-9]+) ')
suites = {}