Merge remote-tracking branch 'origin/HEAD'

[catacomb-python] / algorithms.py

diff --git a/algorithms.py b/algorithms.py
index 4a47dc7d9a6e81f0b8b64bb41968912f1f4f52d7..0fa434a32246d1471016339d570a05a1f913c1ac 100644 (file)
--- a/algorithms.py
+++ b/algorithms.py
@@ -40,9 +40,10 @@ xchacha20 xchacha12 xchacha8
 streamciphers += map(lambda s: s.translate(None, '/'), 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
@@ -95,5 +96,12 @@ for i in latindances:
          'RNG_LATIN, %(ROOT)s_NONCESZ) \\') % \
       {'name': i, 'id': i.translate(None, '/').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