X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/a7f2e3893166d7ce7e9d63437d6eebcad5e9c55c..8afbf782f42e549cacf25cef947463853f92f468:/algorithms.py

diff --git a/algorithms.py b/algorithms.py
index 4a47dc7..46abccb 100644
--- a/algorithms.py
+++ b/algorithms.py
@@ -37,12 +37,13 @@ chacha20 chacha12 chacha8
 chacha20-ietf chacha12-ietf chacha8-ietf
 xchacha20 xchacha12 xchacha8
 '''.split()
-streamciphers += map(lambda s: s.translate(None, '/'), latindances)
+streamciphers += map(lambda s: s.replace('/', ''), latindances)
 hashes = '''
 md2 md4 md5 tiger has160
-sha sha224 sha256 sha384 sha512
+sha sha224 sha256 sha512/224 sha512/256 sha384 sha512
 rmd128 rmd160 rmd256 rmd320
 whirlpool whirlpool256
+sha3-224 sha3-256 sha3-384 sha3-512
 '''.split()
 hmodes = '''
 mgf hmac
@@ -93,7 +94,14 @@ for i in latindances:
   if i.endswith('-ietf'): root += '_ietf'
   print ('\t_("%(name)s", %(root)s_keysz, %(id)s_rand, ' +
          'RNG_LATIN, %(ROOT)s_NONCESZ) \\') % \
-      {'name': i, 'id': i.translate(None, '/').replace('-', '_'),
+      {'name': i, 'id': i.replace('/', '').replace('-', '_'),
        'root': root, 'ROOT': root.upper()}
+for i in [128, 256]:
+  print ('\t_("shake%(w)d", shake%(w)d_keysz, cshake%(w)d_rand, ' +
+         'RNG_SHAKE, 0) \\') % \
+         {'w': i}
+  print ('\t_("kmac%(w)d", kmac%(w)d_keysz, kmac%(w)d_rand, ' +
+         'RNG_KMAC, 0) \\') % \
+         {'w': i}
 print '\t/* end */'
 print