X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-perl/blobdiff_plain/660b443cc58d4dd4e92730104429fb64d78c7075..9b46ee0d9f144189d9df836347402c3b3df97936:/algs.PL

diff --git a/algs.PL b/algs.PL
index d16e196..e7b7418 100644
--- a/algs.PL
+++ b/algs.PL
@@ -1,6 +1,6 @@
 # -*-perl-*-
 #
-# $Id: algs.PL,v 1.1 2004/04/02 18:04:01 mdw Exp $
+# $Id$
 #
 # Create tables of algorithms
 #
@@ -25,27 +25,21 @@
 # along with Catacomb/Perl; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-#----- Revision history -----------------------------------------------------
-#
-# $Log: algs.PL,v $
-# Revision 1.1  2004/04/02 18:04:01  mdw
-# Initial checkin.
-#
-
 @cipher = qw(des desx des3
 	     blowfish twofish
 	     cast128 cast256
 	     idea safer safersk
 	     rc2 rc5
 	     square rijndael rijndael192 rijndael256
-	     serpent
+	     serpent noekeon
 	     skipjack
 	     mars
 	     tea xtea);
 @stream = qw(rc4 seal);
-@hash = qw(md5 md4 md2 tiger
-	   sha sha256 sha384 sha512 
-	   rmd128 rmd160 rmd256 rmd320);
+@hash = qw(md5 md4 md2 tiger has160
+	   sha sha224 sha256 sha384 sha512 
+	   rmd128 rmd160 rmd256 rmd320
+           whirlpool whirlpool256);
 
 sub enum {
   $x = shift;
@@ -69,7 +63,7 @@ sub cross {
   return @$x;
 }
 
-open OUT, "> $ARGV[0]" or die "couldn't write `$ARGV[0].c': $!";
+open OUT, "> $ARGV[0]" or die "couldn't write `$ARGV[0]': $!";
 
 print OUT <<EOF;
 /* -*-c-*-
@@ -79,42 +73,14 @@ print OUT <<EOF;
 
 #include "catacomb-perl.h"
 
-#include <catacomb/crc32.h>
-
 EOF
+print OUT cross("#include <catacomb/", \@cipher, ".h>\n"), "\n";
 print OUT cross("#include <catacomb/", \@cipher, "-",
-		[qw(ecb cbc cfb counter ofb)], ".h>\n"), "\n";
-print OUT cross("#include <catacomb/", \@stream, ".h>\n"), "\n";
-print OUT cross("#include <catacomb/", \@hash, ".h>\n"), "\n";
-print OUT cross("#include <catacomb/", \@hash, "-",
-		[qw(mgf hmac)], ".h>\n"), "\n";
+		[qw(counter ofb)], ".h>\n"), "\n";
+print OUT cross("#include <catacomb/", \@hash, "-mgf.h>\n"), "\n";
 
 print OUT <<EOF;
 
-const gccipher *ciphertab[] = {
-EOF
-print OUT cross("  &", \@cipher, "_", [qw(ecb cbc cfb counter ofb)], ",\n");
-print OUT cross("  &", \@hash, "_", [qw(mgf)], ",\n");
-print OUT cross("  &", \@stream, ",\n");
-print OUT <<EOF;
-  0
-};
-
-const gchash *hashtab[] = {
-EOF
-print OUT cross("  &", \@hash, ",\n");
-print OUT <<EOF;
-  &gcrc32,
-  0
-};
-
-const gcmac *mactab[] = {
-EOF
-print OUT cross("  &", \@hash, "_", [qw(hmac nmac sslmac)], ",\n");
-print OUT <<EOF;
-  0
-};
-
 const struct randtab mgftab[] = {
 EOF
 foreach my $i (@hash) { print OUT "  { \"$i\", ${i}_mgfrand },\n"; }
@@ -137,4 +103,40 @@ print OUT <<EOF;
 };
 EOF
 
+foreach my $i (@cipher) {
+  my $I = uc($i);
+  print OUT <<EOF;
+
+static void init_$i(void *ctx, const void *k, size_t ksz) {
+  ${i}_init(ctx, k, ksz);
+}
+static void eblk_$i(const void *ctx, const void *in, void *out) {
+  uint32 w[${I}_BLKSZ / 4];
+  BLKC_LOAD(${I}, w, in);
+  ${i}_eblk(ctx, w, w);
+  BLKC_STORE(${I}, out, w);
+}
+static void dblk_$i(const void *ctx, const void *in, void *out) {
+  uint32 w[${I}_BLKSZ / 4];
+  BLKC_LOAD(${I}, w, in);
+  ${i}_dblk(ctx, w, w);
+  BLKC_STORE(${I}, out, w);
+}
+static PRPClass prp_$i = {
+  "$i",
+  ${i}_keysz, sizeof(${i}_ctx), ${I}_BLKSZ,
+  init_$i, eblk_$i, dblk_$i
+};
+EOF
+}
+
+print OUT <<EOF;
+
+PRPClass *const prptab[] = {
+EOF
+foreach my $i (@cipher) {
+  print OUT "  &prp_$i,\n";
+}
+print OUT "  0\n};\n";
+
 #----- That's all, folks ----------------------------------------------------