Rearrange the file tree.

[catacomb] / symm / modes.am.in

diff --git a/modes.am.in b/symm/modes.am.in
similarity index 56%
rename from modes.am.in
rename to symm/modes.am.in
index 88ee21787d6abbb3ac068ee9601359df151944b0..4cbc88f2d0ab8f92f86994fb8e9a9008fa624532 100644 (file)
--- a/modes.am.in
+++ b/symm/modes.am.in
@@ -4,23 +4,28 @@
 ###
 ### Lots of lists of crypto primitives in various modes of operation.
 
+## Test programs for symmetric primitives.
 SYMM_TESTS =
 
+## Source and header files for primitives under modes of operation.
 GENMODES_C =
 GENMODES_H =
 
+## Block cipher modes.
 %repeat
-GENMODES_C += @blkc-@blkcmode.c
-GENMODES_H += @blkc-@blkcmode.h
+GENMODES_C += modes/@blkc-@blkcmode.c
+GENMODES_H += modes/@blkc-@blkcmode.h
 SYMM_TESTS += @blkc-@blkcmode.$t
 %end
 
+## Hash function modes.
 %repeat
-GENMODES_C += @hash-@hashmode.c
-GENMODES_H += @hash-@hashmode.h
+GENMODES_C += modes/@hash-@hashmode.c
+GENMODES_H += modes/@hash-@hashmode.h
 SYMM_TESTS += @hash-@hashmode.$t
 %end
 
+## Interface and implementation headers for the various modes.
 MODE_H =
 %repeat
 MODE_H += @blkcmode.h @blkcmode-def.h
@@ -29,6 +34,7 @@ MODE_H += @blkcmode.h @blkcmode-def.h
 MODE_H += @hashmode.h @hashmode-def.h
 %end
 
+## Block cipher interfaces and implementations.
 BLKC_C =
 BLKC_H =
 %repeat
@@ -37,6 +43,7 @@ BLKC_H += @blkc.h
 SYMM_TESTS += @blkc.$t
 %end
 
+## Hash function interfaces and implementations.
 HASH_C =
 HASH_H =
 %repeat
@@ -45,6 +52,7 @@ HASH_H += @hash.h
 SYMM_TESTS += @hash.$t
 %end
 
+## Modes for symmetric encryption.
 CIPHER_MODES =
 %repeat
 CIPHER_MODES += @blkc-@blkcciphermode
@@ -53,15 +61,17 @@ CIPHER_MODES += @blkc-@blkcciphermode
 CIPHER_MODES += @hash-@hashciphermode
 %end
 
+## Modes for message authentication.
 MAC_MODES =
 %repeat
 MAC_MODES += @hash-@hashmacmode
 %end
 
+## Test input files.
 SYMM_TEST_FILES =
 %repeat
-SYMM_TEST_FILES += tests/@blkc
+SYMM_TEST_FILES += t/@blkc
 %end
 %repeat
-SYMM_TEST_FILES += tests/@hash
+SYMM_TEST_FILES += t/@hash
 %end