diff options
author | lloyd <lloyd@randombit.net> | 2015-01-28 04:32:10 +0000 |
---|---|---|
committer | lloyd <lloyd@randombit.net> | 2015-01-28 04:32:10 +0000 |
commit | 7b56f1bd570dc684ffd7c945dee0d9b5480354ff (patch) | |
tree | 0c50ad534280a292a1b76daee9a19b34cfd96367 /src/scripts | |
parent | b8fa304ec981d273c45d7ef31705d65ccfb00cc1 (diff) |
Add a runtime map of string->func() which when called return
Transforms and BlockCiphers. Registration for all types is done at
startup but is very cheap as just a std::function and a std::map entry
are created, no actual objects are created until needed. This is a
huge improvement over Algorithm_Factory which used T::clone() as the
function and thus kept a prototype object of each type in memory.
Replace existing lookup mechanisms for ciphers, AEADs, and compression
to use the transform lookup. The existing Engine framework remains in
place for BlockCipher, but the engines now just call to the registry
instead of having hardcoded lookups.
s/Transformation/Transform/ with typedefs for compatability.
Remove lib/selftest code (for runtime selftesting): not the right approach.
Diffstat (limited to 'src/scripts')
-rwxr-xr-x | src/scripts/tls_suite_info.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/scripts/tls_suite_info.py b/src/scripts/tls_suite_info.py index d569352ef..613332b14 100755 --- a/src/scripts/tls_suite_info.py +++ b/src/scripts/tls_suite_info.py @@ -49,7 +49,7 @@ def to_ciphersuite_info(code, name): cipher += ['CCM'] mac_algo = 'SHA256' elif mac_algo == 'CCM_8': - cipher += ['CCM-8'] + cipher += ['CCM(8)'] mac_algo = 'SHA256' cipher_info = { @@ -123,7 +123,7 @@ def to_ciphersuite_info(code, name): if cipher_algo not in stream_ciphers: mode = cipher[-1] - if mode not in ['CBC', 'GCM', 'CCM-8', 'CCM', 'OCB']: + if mode not in ['CBC', 'GCM', 'CCM(8)', 'CCM', 'OCB']: print "#warning Unknown mode %s" % (' '.join(cipher)) ivlen = 8 if cipher_algo == '3DES' else 16 |