X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/d7ab1bab81155baa763449d5afa81e16df98dbe7..40b16f0c70eee219206c99224088c3e81fed4d8a:/algorithms.py

diff --git a/algorithms.py b/algorithms.py
index cc209c6..3aae0f0 100644
--- 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,25 @@ 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 '  _(%s, %s) \\' % (i.upper(), i)
+print '	 /* end */'
+print
+
+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 ('  _("%(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 ('  _("%(prim)s-%(mode)s", %(prim)s_%(mode)skeysz, ' +
+	 '%(prim)s_%(mode)srand, 0) \\') % \
+	 {'prim': i[0], 'mode': i[1]}
+print '	 _("rc4", rc4_keysz, rc4_rand, 0) \\'
+print '	 _("seal", seal_keysz, seal_rand, RNGF_INT) \\'
+print '	 /* end */'
 print