catacomb-python.h: Promote `util' to the head of the list.

[catacomb-python] / algorithms.py

diff --git a/algorithms.py b/algorithms.py
index cc209c6ffdd682383a0b4877d9c03dfd87460273..ad41f69b6d42470c6511640d39db85e1d2aa494d 100644 (file)
--- a/algorithms.py
+++ b/algorithms.py
@@ -47,7 +47,7 @@ for i in prps:
   for j in pmodes:
     print '#include <catacomb/%s-%s.h>' % (i, j)
 for i in streamciphers:
-  print '#include <catacomb/%s.h>' % i  
+  print '#include <catacomb/%s.h>' % i
 print
 for i in hashes:
   print '#include <catacomb/%s.h>' % i
@@ -55,18 +55,24 @@ for i in hashes:
     print '#include <catacomb/%s-%s.h>' % (i, j)
 print
 
-print '#define PRPS(DO) \\'
+print '#define PRPS(_) \\'
 for i in prps:
-  print '  DO(%s, %s) \\' % (i.upper(), i)
-print '  /* end */'
+  print '\t_(%s, %s) \\' % (i.upper(), i)
+print '\t/* end */'
+
+print '#define RNGF_INT 1u'
 print
 
-print '#define RNGS(DO) \\'
-for i in (cross(prps, ['ofb', 'counter']) +
-          cross(hashes, 'mgf')):
-  print '  DO("%(prim)s-%(mode)s", %(prim)s_%(mode)srand) \\' % \
-        {'prim': i[0], 'mode': i[1]}
-print '  DO("rc4", rc4_rand) \\'
-print '  DO("seal", seal_randkludge) \\'
-print '  /* end */'
+print '#define RNGS(_) \\'
+for i in (cross(prps, ['ofb', 'counter'])):
+  print ('\t_("%(prim)s-%(mode)s", %(prim)s_keysz, ' +
+         '%(prim)s_%(mode)srand, 0) \\') % \
+         {'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) \\') % \
+         {'prim': i[0], 'mode': i[1]}
+print '\t_("rc4", rc4_keysz, rc4_rand, 0) \\'
+print '\t_("seal", seal_keysz, seal_rand, RNGF_INT) \\'
+print '\t/* end */'
 print