Split 'cast' module into CAST-128 and CAST-256

They were only in the same place because of the desire to share
the sbox tables, but that can be handled by adding a dependency.

This makes it possible to disable CAST-256 while leaving CAST-128.

7 files changed, 7 insertions, 2 deletions

diff --git a/src/lib/block/cast/cast128.cpp b/src/lib/block/cast128/cast128.cpp
index 442c6fc58..442c6fc58 100644
--- a/src/lib/block/cast/cast128.cpp
+++ b/src/lib/block/cast128/cast128.cpp
diff --git a/src/lib/block/cast/cast128.h b/src/lib/block/cast128/cast128.h
index 3a1740777..3a1740777 100644
--- a/src/lib/block/cast/cast128.h
+++ b/src/lib/block/cast128/cast128.h
diff --git a/src/lib/block/cast/cast_sboxes.h b/src/lib/block/cast128/cast_sboxes.h
index 9d52f6f6c..9d52f6f6c 100644
--- a/src/lib/block/cast/cast_sboxes.h
+++ b/src/lib/block/cast128/cast_sboxes.h
diff --git a/src/lib/block/cast/info.txt b/src/lib/block/cast128/info.txt
index 3f2749953..6e6cf30ab 100644
--- a/src/lib/block/cast/info.txt
+++ b/src/lib/block/cast128/info.txt
@@ -1,7 +1,6 @@
 <defines>
 CAST -> 20131128
 CAST_128 -> 20171203
-CAST_256 -> 20171203
 </defines>
 
 <header:internal>
@@ -10,5 +9,4 @@ cast_sboxes.h
 
 <header:public>
 cast128.h
-cast256.h
 </header:public>
diff --git a/src/lib/block/cast/cast256.cpp b/src/lib/block/cast256/cast256.cpp
index cd5175dd7..cd5175dd7 100644
--- a/src/lib/block/cast/cast256.cpp
+++ b/src/lib/block/cast256/cast256.cpp
diff --git a/src/lib/block/cast/cast256.h b/src/lib/block/cast256/cast256.h
index 798649ef7..798649ef7 100644
--- a/src/lib/block/cast/cast256.h
+++ b/src/lib/block/cast256/cast256.h
diff --git a/src/lib/block/cast256/info.txt b/src/lib/block/cast256/info.txt
new file mode 100644
index 000000000..b109fe053
--- /dev/null
+++ b/src/lib/block/cast256/info.txt
@@ -0,0 +1,7 @@
+<defines>
+CAST_256 -> 20171203
+</defines>
+
+<requires>
+cast128
+</requires>