algorithms.py: Support the IETF versions of ChaCha etc. with 96-bit nonce.

diff --git a/algorithms.py b/algorithms.py
index c2ab4ee06f707b74fbb0c07fb3401eb6b623d58b..a2a468f46bf613fa8207079e0b6f63e19967e523 100644 (file)
--- a/algorithms.py
+++ b/algorithms.py
@@ -30,8 +30,12 @@ streamciphers = '''
 rc4 seal
 '''.split()
 latindances = '''
 rc4 seal
 '''.split()
 latindances = '''

-salsa20 salsa20/12 salsa20/8 xsalsa20 xsalsa20/12 xsalsa20/8
-chacha20 chacha12 chacha8 xchacha20 xchacha12 xchacha8
+salsa20 salsa20/12 salsa20/8
+salsa20-ietf salsa20/12-ietf salsa20/8-ietf
+xsalsa20 xsalsa20/12 xsalsa20/8
+chacha20 chacha12 chacha8
+chacha20-ietf chacha12-ietf chacha8-ietf
+xchacha20 xchacha12 xchacha8

 '''.split()
 streamciphers += map(lambda s: s.translate(None, '/'), latindances)
 hashes = '''
 '''.split()
 streamciphers += map(lambda s: s.translate(None, '/'), latindances)
 hashes = '''


@@ -84,9 +88,10 @@ for i in latindances:
       break
   else:
     raise ValueError, 'failed to find root name for %s' % i
       break
   else:
     raise ValueError, 'failed to find root name for %s' % i

+  if i.endswith('-ietf'): root += '_ietf'

   print ('\t_("%(name)s", %(root)s_keysz, %(id)s_rand, ' +
          'RNGF_NONCE | RNGF_LATIN, %(ROOT)s_NONCESZ) \\') % \
   print ('\t_("%(name)s", %(root)s_keysz, %(id)s_rand, ' +
          'RNGF_NONCE | RNGF_LATIN, %(ROOT)s_NONCESZ) \\') % \

-      {'name': i, 'id': i.translate(None, '/'),
+      {'name': i, 'id': i.translate(None, '/').replace('-', '_'),

        'root': root, 'ROOT': root.upper()}
 print '\t/* end */'
 print
        'root': root, 'ROOT': root.upper()}
 print '\t/* end */'
 print