rand.c, algorithms.py: Change how kinds of RNGs are distinguished.

[catacomb-python] / algorithms.py

diff --git a/algorithms.py b/algorithms.py
index a2a468f46bf613fa8207079e0b6f63e19967e523..a7a2caab8ce952e81180efee68a9ec3845d65038 100644 (file)
--- a/algorithms.py
+++ b/algorithms.py
@@ -73,14 +73,14 @@ print
 print '#define RNGS(_) \\'
 for i in (cross(prps, ['ofb', 'counter'])):
   print ('\t_("%(prim)s-%(mode)s", %(prim)s_keysz, ' +
 print '#define RNGS(_) \\'
 for i in (cross(prps, ['ofb', 'counter'])):
   print ('\t_("%(prim)s-%(mode)s", %(prim)s_keysz, ' +

-         '%(prim)s_%(mode)srand, 0, 0) \\') % \
+         '%(prim)s_%(mode)srand, RNG_PLAIN, 0) \\') % \

          {'prim': i[0], 'mode': i[1]}
 for i in (cross(hashes, 'mgf')):
   print ('\t_("%(prim)s-%(mode)s", %(prim)s_%(mode)skeysz, ' +
          {'prim': i[0], 'mode': i[1]}
 for i in (cross(hashes, 'mgf')):
   print ('\t_("%(prim)s-%(mode)s", %(prim)s_%(mode)skeysz, ' +

-         '%(prim)s_%(mode)srand, 0, 0) \\') % \
+         '%(prim)s_%(mode)srand, RNG_PLAIN, 0) \\') % \

          {'prim': i[0], 'mode': i[1]}
 print '\t_("rc4", rc4_keysz, rc4_rand, 0, 0) \\'
          {'prim': i[0], 'mode': i[1]}
 print '\t_("rc4", rc4_keysz, rc4_rand, 0, 0) \\'

-print '\t_("seal", seal_keysz, seal_rand, RNGF_INT, 0) \\'
+print '\t_("seal", seal_keysz, seal_rand, RNG_SEAL, 0) \\'

 for i in latindances:
   for r in ['salsa20', 'xsalsa20', 'chacha', 'xchacha']:
     if i.startswith(r):
 for i in latindances:
   for r in ['salsa20', 'xsalsa20', 'chacha', 'xchacha']:
     if i.startswith(r):


@@ -90,7 +90,7 @@ for i in latindances:
     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, ' +
     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) \\') % \
+         'RNG_LATIN, %(ROOT)s_NONCESZ) \\') % \

       {'name': i, 'id': i.translate(None, '/').replace('-', '_'),
        'root': root, 'ROOT': root.upper()}
 print '\t/* end */'
       {'name': i, 'id': i.translate(None, '/').replace('-', '_'),
        'root': root, 'ROOT': root.upper()}
 print '\t/* end */'