X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/ceded83441a661c6c5dee0ec3853b8548df35a5a..ea0540598e8259ebf543c9485d8afacd880e4d7b:/symm/Makefile.am

diff --git a/symm/Makefile.am b/symm/Makefile.am
index 24a0afcc..2af0945b 100644
--- a/symm/Makefile.am
+++ b/symm/Makefile.am
@@ -133,13 +133,14 @@ endif
 BLKCS			+= cast128 cast256
 libsymm_la_SOURCES	+= cast-s.c cast-sk.c cast-base.h
 cast256.log: t/cast256
-EXTRA_DIST		+= t/cast256.aes
+EXTRA_DIST		+= t/cast256.aes t/cast256.local
 MAINTAINERCLEANFILES	+= $(srcdir)/t/cast256
-t/cast256: t/cast256.aes
-	$(AM_V_GEN)$(srcdir)/aes-trans CAST256 \
-		<$(srcdir)/t/cast256.aes \
-		>$(srcdir)/t/cast256.new && \
-	mv $(srcdir)/t/cast256.new $(srcdir)/t/cast256
+t/cast256: t/cast256.aes t/cast256.local
+	$(AM_V_GEN)cd $(srcdir) && \
+		{ ./aes-trans CAST256 <t/cast256.aes && \
+		  cat t/cast256.local; \
+		} >t/cast256.new && \
+		mv t/cast256.new t/cast256
 
 ## IBM's `DES' block cipher, by Feistel, Coppersmith, and others.
 BLKCS			+= des des3
@@ -175,13 +176,14 @@ $(precomp)/symm/mars-tab.c:
 		mv $(precomp)/symm/mars-tab.c.new $(precomp)/symm/mars-tab.c
 endif
 mars.log: t/mars
-EXTRA_DIST		+= t/mars.aes
+EXTRA_DIST		+= t/mars.aes t/mars.local
 MAINTAINERCLEANFILES	+= $(srcdir)/t/mars
-t/mars: t/mars.aes
-	$(AM_V_GEN)$(srcdir)/aes-trans Mars \
-		<$(srcdir)/t/mars.aes \
-		>$(srcdir)/t/mars.new && \
-	mv $(srcdir)/t/mars.new $(srcdir)/t/mars
+t/mars: t/mars.aes t/mars.local
+	$(AM_V_GEN)cd $(srcdir) && \
+		{ ./aes-trans Mars <t/mars.aes && \
+		  cat t/mars.local; \
+		} >t/mars.new && \
+		mv t/mars.new t/mars
 
 ## Daemen, Peeters, Van Assche and Rijmen's `Noekeon'.
 BLKCS			+= noekeon
@@ -222,13 +224,14 @@ $(precomp)/symm/rijndael-tab.c:
 			$(precomp)/symm/rijndael-tab.c
 endif
 rijndael.log: t/rijndael
-EXTRA_DIST		+= t/rijndael.aes
+EXTRA_DIST		+= t/rijndael.aes t/rijndael.local
 MAINTAINERCLEANFILES	+= $(srcdir)/t/rijndael
-t/rijndael: t/rijndael.aes
-	$(AM_V_GEN)$(srcdir)/aes-trans Rijndael \
-		<$(srcdir)/t/rijndael.aes \
-		>$(srcdir)/t/rijndael.new && \
-	mv $(srcdir)/t/rijndael.new $(srcdir)/t/rijndael
+t/rijndael: t/rijndael.aes t/rijndael.local
+	$(AM_V_GEN)cd $(srcdir) && \
+		{ ./aes-trans Rijndael <t/rijndael.aes && \
+		  cat t/rijndael.local; \
+		} >t/rijndael.new && \
+		mv t/rijndael.new t/rijndael
 
 ## Massey's `SAFER' block ciphers.
 BLKCS			+= safer safersk
@@ -252,13 +255,14 @@ libsymm_la_SOURCES	+= serpent-sbox.h
 check_PROGRAMS		+= serpent-check
 TESTS			+= serpent-check
 serpent.log: t/serpent
-EXTRA_DIST		+= t/serpent.aes
+EXTRA_DIST		+= t/serpent.aes t/serpent.local
 MAINTAINERCLEANFILES	+= $(srcdir)/t/serpent
-t/serpent: t/serpent.aes
-	$(AM_V_GEN)$(srcdir)/aes-trans Serpent -v rev=1 \
-		<$(srcdir)/t/serpent.aes \
-		>$(srcdir)/t/serpent.new && \
-	mv $(srcdir)/t/serpent.new $(srcdir)/t/serpent
+t/serpent: t/serpent.aes t/serpent.local
+	$(AM_V_GEN)cd $(srcdir) && \
+		{ ./aes-trans Serpent -v rev=1 <t/serpent.aes && \
+		  cat t/serpent.local; \
+		} >t/serpent.new && \
+		mv t/serpent.new t/serpent
 
 ## The National Security Agency's `Skipjack' block cipher.  You don't want to
 ## use this.
@@ -297,13 +301,14 @@ $(precomp)/symm/twofish-tab.c:
 			$(precomp)/symm/twofish-tab.c
 endif
 twofish.log: t/twofish
-EXTRA_DIST		+= t/twofish.aes
+EXTRA_DIST		+= t/twofish.aes t/twofish.local
 MAINTAINERCLEANFILES	+= $(srcdir)/t/twofish
-t/twofish: t/twofish.aes
-	$(AM_V_GEN)$(srcdir)/aes-trans Twofish \
-		<$(srcdir)/t/twofish.aes \
-		>$(srcdir)/t/twofish.new && \
-	mv $(srcdir)/t/twofish.new $(srcdir)/t/twofish
+t/twofish: t/twofish.aes t/twofish.local
+	$(AM_V_GEN)cd $(srcdir) && \
+		{ ./aes-trans Twofish <t/twofish.aes && \
+		  cat t/twofish.local; \
+		} >t/twofish.new && \
+		mv t/twofish.new t/twofish
 
 ## The old NIST modes for DES.
 BLKCCIPHERMODES		+= cbc cfb ecb ofb
@@ -311,6 +316,9 @@ BLKCCIPHERMODES		+= cbc cfb ecb ofb
 ## Counter mode.
 BLKCCIPHERMODES		+= counter
 
+## CMAC mode.
+BLKCMACMODES		+= cmac
+
 ###--------------------------------------------------------------------------
 ### Hash functions.