aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2008-11-08 19:46:52 +0000
committerlloyd <[email protected]>2008-11-08 19:46:52 +0000
commitf1c459725da56fd8ed5766e7779300182fa26bcf (patch)
tree32295cec92df1155563ae8a535dc695d6800d7f6
parent8dba7b5264403e781bbb86ff61850e4377dca7b9 (diff)
Split ciphers into block and stream ciphers. Move base class headers
-rw-r--r--src/block/aes/aes.cpp (renamed from src/cipher/aes/aes.cpp)0
-rw-r--r--src/block/aes/aes.h (renamed from src/cipher/aes/aes.h)0
-rw-r--r--src/block/aes/aes_tab.cpp (renamed from src/cipher/aes/aes_tab.cpp)0
-rw-r--r--src/block/aes/info.txt (renamed from src/cipher/aes/info.txt)0
-rw-r--r--src/block/block_cipher.h (renamed from src/core/block_cipher.h)0
-rw-r--r--src/block/blowfish/blfs_tab.cpp (renamed from src/cipher/blowfish/blfs_tab.cpp)0
-rw-r--r--src/block/blowfish/blowfish.cpp (renamed from src/cipher/blowfish/blowfish.cpp)0
-rw-r--r--src/block/blowfish/blowfish.h (renamed from src/cipher/blowfish/blowfish.h)0
-rw-r--r--src/block/blowfish/info.txt (renamed from src/cipher/blowfish/info.txt)0
-rw-r--r--src/block/cast/cast128.cpp (renamed from src/cipher/cast/cast128.cpp)0
-rw-r--r--src/block/cast/cast128.h (renamed from src/cipher/cast/cast128.h)0
-rw-r--r--src/block/cast/cast256.cpp (renamed from src/cipher/cast/cast256.cpp)0
-rw-r--r--src/block/cast/cast256.h (renamed from src/cipher/cast/cast256.h)0
-rw-r--r--src/block/cast/cast_tab.cpp (renamed from src/cipher/cast/cast_tab.cpp)0
-rw-r--r--src/block/cast/info.txt (renamed from src/cipher/cast/info.txt)0
-rw-r--r--src/block/des/des.cpp (renamed from src/cipher/des/des.cpp)0
-rw-r--r--src/block/des/des.h (renamed from src/cipher/des/des.h)0
-rw-r--r--src/block/des/des_tab.cpp (renamed from src/cipher/des/des_tab.cpp)0
-rw-r--r--src/block/des/desx.cpp (renamed from src/cipher/des/desx.cpp)0
-rw-r--r--src/block/des/desx.h (renamed from src/cipher/des/desx.h)0
-rw-r--r--src/block/des/info.txt (renamed from src/cipher/des/info.txt)0
-rw-r--r--src/block/gost/gost.cpp (renamed from src/cipher/gost/gost.cpp)0
-rw-r--r--src/block/gost/gost.h (renamed from src/cipher/gost/gost.h)0
-rw-r--r--src/block/gost/gost_tab.cpp (renamed from src/cipher/gost/gost_tab.cpp)0
-rw-r--r--src/block/gost/info.txt (renamed from src/cipher/gost/info.txt)0
-rw-r--r--src/block/idea/idea.cpp (renamed from src/cipher/idea/idea.cpp)0
-rw-r--r--src/block/idea/idea.h (renamed from src/cipher/idea/idea.h)0
-rw-r--r--src/block/idea/info.txt (renamed from src/cipher/idea/info.txt)0
-rw-r--r--src/block/kasumi/info.txt (renamed from src/cipher/kasumi/info.txt)0
-rw-r--r--src/block/kasumi/kasumi.cpp (renamed from src/cipher/kasumi/kasumi.cpp)0
-rw-r--r--src/block/kasumi/kasumi.h (renamed from src/cipher/kasumi/kasumi.h)0
-rw-r--r--src/block/lion/info.txt (renamed from src/cipher/lion/info.txt)0
-rw-r--r--src/block/lion/lion.cpp (renamed from src/cipher/lion/lion.cpp)0
-rw-r--r--src/block/lion/lion.h (renamed from src/cipher/lion/lion.h)0
-rw-r--r--src/block/lubyrack/info.txt (renamed from src/cipher/lubyrack/info.txt)0
-rw-r--r--src/block/lubyrack/lubyrack.cpp (renamed from src/cipher/lubyrack/lubyrack.cpp)0
-rw-r--r--src/block/lubyrack/lubyrack.h (renamed from src/cipher/lubyrack/lubyrack.h)0
-rw-r--r--src/block/mars/info.txt (renamed from src/cipher/mars/info.txt)0
-rw-r--r--src/block/mars/mars.cpp (renamed from src/cipher/mars/mars.cpp)0
-rw-r--r--src/block/mars/mars.h (renamed from src/cipher/mars/mars.h)0
-rw-r--r--src/block/mars/mars_tab.cpp (renamed from src/cipher/mars/mars_tab.cpp)0
-rw-r--r--src/block/misty1/info.txt (renamed from src/cipher/misty1/info.txt)0
-rw-r--r--src/block/misty1/mist_tab.cpp (renamed from src/cipher/misty1/mist_tab.cpp)0
-rw-r--r--src/block/misty1/misty1.cpp (renamed from src/cipher/misty1/misty1.cpp)0
-rw-r--r--src/block/misty1/misty1.h (renamed from src/cipher/misty1/misty1.h)0
-rw-r--r--src/block/noekeon/info.txt (renamed from src/cipher/noekeon/info.txt)0
-rw-r--r--src/block/noekeon/noekeon.cpp (renamed from src/cipher/noekeon/noekeon.cpp)0
-rw-r--r--src/block/noekeon/noekeon.h (renamed from src/cipher/noekeon/noekeon.h)0
-rw-r--r--src/block/rc2/info.txt (renamed from src/cipher/rc2/info.txt)0
-rw-r--r--src/block/rc2/rc2.cpp (renamed from src/cipher/rc2/rc2.cpp)0
-rw-r--r--src/block/rc2/rc2.h (renamed from src/cipher/rc2/rc2.h)0
-rw-r--r--src/block/rc5/info.txt (renamed from src/cipher/rc5/info.txt)0
-rw-r--r--src/block/rc5/rc5.cpp (renamed from src/cipher/rc5/rc5.cpp)0
-rw-r--r--src/block/rc5/rc5.h (renamed from src/cipher/rc5/rc5.h)0
-rw-r--r--src/block/rc6/info.txt (renamed from src/cipher/rc6/info.txt)0
-rw-r--r--src/block/rc6/rc6.cpp (renamed from src/cipher/rc6/rc6.cpp)0
-rw-r--r--src/block/rc6/rc6.h (renamed from src/cipher/rc6/rc6.h)0
-rw-r--r--src/block/safer/info.txt (renamed from src/cipher/safer/info.txt)0
-rw-r--r--src/block/safer/safe_tab.cpp (renamed from src/cipher/safer/safe_tab.cpp)0
-rw-r--r--src/block/safer/safer_sk.cpp (renamed from src/cipher/safer/safer_sk.cpp)0
-rw-r--r--src/block/safer/safer_sk.h (renamed from src/cipher/safer/safer_sk.h)0
-rw-r--r--src/block/seed/info.txt (renamed from src/cipher/seed/info.txt)0
-rw-r--r--src/block/seed/seed.cpp (renamed from src/cipher/seed/seed.cpp)0
-rw-r--r--src/block/seed/seed.h (renamed from src/cipher/seed/seed.h)0
-rw-r--r--src/block/seed/seed_tab.cpp (renamed from src/cipher/seed/seed_tab.cpp)0
-rw-r--r--src/block/serpent/info.txt (renamed from src/cipher/serpent/info.txt)0
-rw-r--r--src/block/serpent/serpent.cpp (renamed from src/cipher/serpent/serpent.cpp)0
-rw-r--r--src/block/serpent/serpent.h (renamed from src/cipher/serpent/serpent.h)0
-rw-r--r--src/block/serpent_ia32/info.txt (renamed from src/cipher/serpent_ia32/info.txt)0
-rw-r--r--src/block/serpent_ia32/serp_ia32.cpp (renamed from src/cipher/serpent_ia32/serp_ia32.cpp)0
-rw-r--r--src/block/serpent_ia32/serp_ia32.h (renamed from src/cipher/serpent_ia32/serp_ia32.h)0
-rw-r--r--src/block/serpent_ia32/serp_ia32_imp.S (renamed from src/cipher/serpent_ia32/serp_ia32_imp.S)0
-rw-r--r--src/block/skipjack/info.txt (renamed from src/cipher/skipjack/info.txt)0
-rw-r--r--src/block/skipjack/skipjack.cpp (renamed from src/cipher/skipjack/skipjack.cpp)0
-rw-r--r--src/block/skipjack/skipjack.h (renamed from src/cipher/skipjack/skipjack.h)0
-rw-r--r--src/block/square/info.txt (renamed from src/cipher/square/info.txt)0
-rw-r--r--src/block/square/sqr_tab.cpp (renamed from src/cipher/square/sqr_tab.cpp)0
-rw-r--r--src/block/square/square.cpp (renamed from src/cipher/square/square.cpp)0
-rw-r--r--src/block/square/square.h (renamed from src/cipher/square/square.h)0
-rw-r--r--src/block/tea/info.txt (renamed from src/cipher/tea/info.txt)0
-rw-r--r--src/block/tea/tea.cpp (renamed from src/cipher/tea/tea.cpp)0
-rw-r--r--src/block/tea/tea.h (renamed from src/cipher/tea/tea.h)0
-rw-r--r--src/block/twofish/info.txt (renamed from src/cipher/twofish/info.txt)0
-rw-r--r--src/block/twofish/two_tab.cpp (renamed from src/cipher/twofish/two_tab.cpp)0
-rw-r--r--src/block/twofish/twofish.cpp (renamed from src/cipher/twofish/twofish.cpp)0
-rw-r--r--src/block/twofish/twofish.h (renamed from src/cipher/twofish/twofish.h)0
-rw-r--r--src/block/xtea/info.txt (renamed from src/cipher/xtea/info.txt)0
-rw-r--r--src/block/xtea/xtea.cpp (renamed from src/cipher/xtea/xtea.cpp)0
-rw-r--r--src/block/xtea/xtea.h (renamed from src/cipher/xtea/xtea.h)0
-rw-r--r--src/core/info.txt3
-rw-r--r--src/stream/arc4/arc4.cpp (renamed from src/cipher/arc4/arc4.cpp)0
-rw-r--r--src/stream/arc4/arc4.h (renamed from src/cipher/arc4/arc4.h)0
-rw-r--r--src/stream/arc4/info.txt (renamed from src/cipher/arc4/info.txt)4
-rw-r--r--src/stream/salsa20/info.txt (renamed from src/cipher/salsa20/info.txt)0
-rw-r--r--src/stream/salsa20/salsa20.cpp (renamed from src/cipher/salsa20/salsa20.cpp)0
-rw-r--r--src/stream/salsa20/salsa20.h (renamed from src/cipher/salsa20/salsa20.h)0
-rw-r--r--src/stream/stream_cipher.cpp (renamed from src/core/stream_cipher.cpp)0
-rw-r--r--src/stream/stream_cipher.h (renamed from src/core/stream_cipher.h)0
-rw-r--r--src/stream/turing/info.txt (renamed from src/cipher/turing/info.txt)0
-rw-r--r--src/stream/turing/tur_tab.cpp (renamed from src/cipher/turing/tur_tab.cpp)0
-rw-r--r--src/stream/turing/turing.cpp (renamed from src/cipher/turing/turing.cpp)0
-rw-r--r--src/stream/turing/turing.h (renamed from src/cipher/turing/turing.h)0
-rw-r--r--src/stream/wid_wake/info.txt (renamed from src/cipher/wid_wake/info.txt)0
-rw-r--r--src/stream/wid_wake/wid_wake.cpp (renamed from src/cipher/wid_wake/wid_wake.cpp)0
-rw-r--r--src/stream/wid_wake/wid_wake.h (renamed from src/cipher/wid_wake/wid_wake.h)0
105 files changed, 4 insertions, 3 deletions
diff --git a/src/cipher/aes/aes.cpp b/src/block/aes/aes.cpp
index 24f1f6213..24f1f6213 100644
--- a/src/cipher/aes/aes.cpp
+++ b/src/block/aes/aes.cpp
diff --git a/src/cipher/aes/aes.h b/src/block/aes/aes.h
index e287a303d..e287a303d 100644
--- a/src/cipher/aes/aes.h
+++ b/src/block/aes/aes.h
diff --git a/src/cipher/aes/aes_tab.cpp b/src/block/aes/aes_tab.cpp
index 3665bb746..3665bb746 100644
--- a/src/cipher/aes/aes_tab.cpp
+++ b/src/block/aes/aes_tab.cpp
diff --git a/src/cipher/aes/info.txt b/src/block/aes/info.txt
index 2803ccc4e..2803ccc4e 100644
--- a/src/cipher/aes/info.txt
+++ b/src/block/aes/info.txt
diff --git a/src/core/block_cipher.h b/src/block/block_cipher.h
index 1a4302581..1a4302581 100644
--- a/src/core/block_cipher.h
+++ b/src/block/block_cipher.h
diff --git a/src/cipher/blowfish/blfs_tab.cpp b/src/block/blowfish/blfs_tab.cpp
index f8fa07ee5..f8fa07ee5 100644
--- a/src/cipher/blowfish/blfs_tab.cpp
+++ b/src/block/blowfish/blfs_tab.cpp
diff --git a/src/cipher/blowfish/blowfish.cpp b/src/block/blowfish/blowfish.cpp
index ffca9241f..ffca9241f 100644
--- a/src/cipher/blowfish/blowfish.cpp
+++ b/src/block/blowfish/blowfish.cpp
diff --git a/src/cipher/blowfish/blowfish.h b/src/block/blowfish/blowfish.h
index 16f5239e3..16f5239e3 100644
--- a/src/cipher/blowfish/blowfish.h
+++ b/src/block/blowfish/blowfish.h
diff --git a/src/cipher/blowfish/info.txt b/src/block/blowfish/info.txt
index 0a9d2adc2..0a9d2adc2 100644
--- a/src/cipher/blowfish/info.txt
+++ b/src/block/blowfish/info.txt
diff --git a/src/cipher/cast/cast128.cpp b/src/block/cast/cast128.cpp
index 14e5c9e9d..14e5c9e9d 100644
--- a/src/cipher/cast/cast128.cpp
+++ b/src/block/cast/cast128.cpp
diff --git a/src/cipher/cast/cast128.h b/src/block/cast/cast128.h
index b9d02cd7a..b9d02cd7a 100644
--- a/src/cipher/cast/cast128.h
+++ b/src/block/cast/cast128.h
diff --git a/src/cipher/cast/cast256.cpp b/src/block/cast/cast256.cpp
index 24d3e0078..24d3e0078 100644
--- a/src/cipher/cast/cast256.cpp
+++ b/src/block/cast/cast256.cpp
diff --git a/src/cipher/cast/cast256.h b/src/block/cast/cast256.h
index cf0bcc953..cf0bcc953 100644
--- a/src/cipher/cast/cast256.h
+++ b/src/block/cast/cast256.h
diff --git a/src/cipher/cast/cast_tab.cpp b/src/block/cast/cast_tab.cpp
index 3edab713f..3edab713f 100644
--- a/src/cipher/cast/cast_tab.cpp
+++ b/src/block/cast/cast_tab.cpp
diff --git a/src/cipher/cast/info.txt b/src/block/cast/info.txt
index 73d3f900f..73d3f900f 100644
--- a/src/cipher/cast/info.txt
+++ b/src/block/cast/info.txt
diff --git a/src/cipher/des/des.cpp b/src/block/des/des.cpp
index 53a1a278e..53a1a278e 100644
--- a/src/cipher/des/des.cpp
+++ b/src/block/des/des.cpp
diff --git a/src/cipher/des/des.h b/src/block/des/des.h
index 8cd490b3c..8cd490b3c 100644
--- a/src/cipher/des/des.h
+++ b/src/block/des/des.h
diff --git a/src/cipher/des/des_tab.cpp b/src/block/des/des_tab.cpp
index aa3b7cd45..aa3b7cd45 100644
--- a/src/cipher/des/des_tab.cpp
+++ b/src/block/des/des_tab.cpp
diff --git a/src/cipher/des/desx.cpp b/src/block/des/desx.cpp
index fb76ec731..fb76ec731 100644
--- a/src/cipher/des/desx.cpp
+++ b/src/block/des/desx.cpp
diff --git a/src/cipher/des/desx.h b/src/block/des/desx.h
index c7e407b62..c7e407b62 100644
--- a/src/cipher/des/desx.h
+++ b/src/block/des/desx.h
diff --git a/src/cipher/des/info.txt b/src/block/des/info.txt
index ed05979c9..ed05979c9 100644
--- a/src/cipher/des/info.txt
+++ b/src/block/des/info.txt
diff --git a/src/cipher/gost/gost.cpp b/src/block/gost/gost.cpp
index dc2b397e7..dc2b397e7 100644
--- a/src/cipher/gost/gost.cpp
+++ b/src/block/gost/gost.cpp
diff --git a/src/cipher/gost/gost.h b/src/block/gost/gost.h
index ef2897fae..ef2897fae 100644
--- a/src/cipher/gost/gost.h
+++ b/src/block/gost/gost.h
diff --git a/src/cipher/gost/gost_tab.cpp b/src/block/gost/gost_tab.cpp
index 3ef1a0caf..3ef1a0caf 100644
--- a/src/cipher/gost/gost_tab.cpp
+++ b/src/block/gost/gost_tab.cpp
diff --git a/src/cipher/gost/info.txt b/src/block/gost/info.txt
index f2b997c08..f2b997c08 100644
--- a/src/cipher/gost/info.txt
+++ b/src/block/gost/info.txt
diff --git a/src/cipher/idea/idea.cpp b/src/block/idea/idea.cpp
index a2b076015..a2b076015 100644
--- a/src/cipher/idea/idea.cpp
+++ b/src/block/idea/idea.cpp
diff --git a/src/cipher/idea/idea.h b/src/block/idea/idea.h
index 824a9c6ed..824a9c6ed 100644
--- a/src/cipher/idea/idea.h
+++ b/src/block/idea/idea.h
diff --git a/src/cipher/idea/info.txt b/src/block/idea/info.txt
index 2da3ffb43..2da3ffb43 100644
--- a/src/cipher/idea/info.txt
+++ b/src/block/idea/info.txt
diff --git a/src/cipher/kasumi/info.txt b/src/block/kasumi/info.txt
index 8ea879b6d..8ea879b6d 100644
--- a/src/cipher/kasumi/info.txt
+++ b/src/block/kasumi/info.txt
diff --git a/src/cipher/kasumi/kasumi.cpp b/src/block/kasumi/kasumi.cpp
index 4b56cc06f..4b56cc06f 100644
--- a/src/cipher/kasumi/kasumi.cpp
+++ b/src/block/kasumi/kasumi.cpp
diff --git a/src/cipher/kasumi/kasumi.h b/src/block/kasumi/kasumi.h
index 40fa7c36a..40fa7c36a 100644
--- a/src/cipher/kasumi/kasumi.h
+++ b/src/block/kasumi/kasumi.h
diff --git a/src/cipher/lion/info.txt b/src/block/lion/info.txt
index 558d71d0c..558d71d0c 100644
--- a/src/cipher/lion/info.txt
+++ b/src/block/lion/info.txt
diff --git a/src/cipher/lion/lion.cpp b/src/block/lion/lion.cpp
index 629badd3d..629badd3d 100644
--- a/src/cipher/lion/lion.cpp
+++ b/src/block/lion/lion.cpp
diff --git a/src/cipher/lion/lion.h b/src/block/lion/lion.h
index d541eb76e..d541eb76e 100644
--- a/src/cipher/lion/lion.h
+++ b/src/block/lion/lion.h
diff --git a/src/cipher/lubyrack/info.txt b/src/block/lubyrack/info.txt
index d83df2409..d83df2409 100644
--- a/src/cipher/lubyrack/info.txt
+++ b/src/block/lubyrack/info.txt
diff --git a/src/cipher/lubyrack/lubyrack.cpp b/src/block/lubyrack/lubyrack.cpp
index c9e6fc531..c9e6fc531 100644
--- a/src/cipher/lubyrack/lubyrack.cpp
+++ b/src/block/lubyrack/lubyrack.cpp
diff --git a/src/cipher/lubyrack/lubyrack.h b/src/block/lubyrack/lubyrack.h
index ba5a4d052..ba5a4d052 100644
--- a/src/cipher/lubyrack/lubyrack.h
+++ b/src/block/lubyrack/lubyrack.h
diff --git a/src/cipher/mars/info.txt b/src/block/mars/info.txt
index b0ad8af9c..b0ad8af9c 100644
--- a/src/cipher/mars/info.txt
+++ b/src/block/mars/info.txt
diff --git a/src/cipher/mars/mars.cpp b/src/block/mars/mars.cpp
index cc671fc06..cc671fc06 100644
--- a/src/cipher/mars/mars.cpp
+++ b/src/block/mars/mars.cpp
diff --git a/src/cipher/mars/mars.h b/src/block/mars/mars.h
index 950c1eb6a..950c1eb6a 100644
--- a/src/cipher/mars/mars.h
+++ b/src/block/mars/mars.h
diff --git a/src/cipher/mars/mars_tab.cpp b/src/block/mars/mars_tab.cpp
index 07381e9cb..07381e9cb 100644
--- a/src/cipher/mars/mars_tab.cpp
+++ b/src/block/mars/mars_tab.cpp
diff --git a/src/cipher/misty1/info.txt b/src/block/misty1/info.txt
index 36600e5fe..36600e5fe 100644
--- a/src/cipher/misty1/info.txt
+++ b/src/block/misty1/info.txt
diff --git a/src/cipher/misty1/mist_tab.cpp b/src/block/misty1/mist_tab.cpp
index b72742fb3..b72742fb3 100644
--- a/src/cipher/misty1/mist_tab.cpp
+++ b/src/block/misty1/mist_tab.cpp
diff --git a/src/cipher/misty1/misty1.cpp b/src/block/misty1/misty1.cpp
index 523d11c84..523d11c84 100644
--- a/src/cipher/misty1/misty1.cpp
+++ b/src/block/misty1/misty1.cpp
diff --git a/src/cipher/misty1/misty1.h b/src/block/misty1/misty1.h
index 0bd3ca1e4..0bd3ca1e4 100644
--- a/src/cipher/misty1/misty1.h
+++ b/src/block/misty1/misty1.h
diff --git a/src/cipher/noekeon/info.txt b/src/block/noekeon/info.txt
index 8025c2073..8025c2073 100644
--- a/src/cipher/noekeon/info.txt
+++ b/src/block/noekeon/info.txt
diff --git a/src/cipher/noekeon/noekeon.cpp b/src/block/noekeon/noekeon.cpp
index 437972fe5..437972fe5 100644
--- a/src/cipher/noekeon/noekeon.cpp
+++ b/src/block/noekeon/noekeon.cpp
diff --git a/src/cipher/noekeon/noekeon.h b/src/block/noekeon/noekeon.h
index fb06f8c79..fb06f8c79 100644
--- a/src/cipher/noekeon/noekeon.h
+++ b/src/block/noekeon/noekeon.h
diff --git a/src/cipher/rc2/info.txt b/src/block/rc2/info.txt
index 099141de7..099141de7 100644
--- a/src/cipher/rc2/info.txt
+++ b/src/block/rc2/info.txt
diff --git a/src/cipher/rc2/rc2.cpp b/src/block/rc2/rc2.cpp
index 6d764e5c4..6d764e5c4 100644
--- a/src/cipher/rc2/rc2.cpp
+++ b/src/block/rc2/rc2.cpp
diff --git a/src/cipher/rc2/rc2.h b/src/block/rc2/rc2.h
index ddf5154b8..ddf5154b8 100644
--- a/src/cipher/rc2/rc2.h
+++ b/src/block/rc2/rc2.h
diff --git a/src/cipher/rc5/info.txt b/src/block/rc5/info.txt
index 4a150c3b0..4a150c3b0 100644
--- a/src/cipher/rc5/info.txt
+++ b/src/block/rc5/info.txt
diff --git a/src/cipher/rc5/rc5.cpp b/src/block/rc5/rc5.cpp
index 0c0229b6c..0c0229b6c 100644
--- a/src/cipher/rc5/rc5.cpp
+++ b/src/block/rc5/rc5.cpp
diff --git a/src/cipher/rc5/rc5.h b/src/block/rc5/rc5.h
index bb91c3e68..bb91c3e68 100644
--- a/src/cipher/rc5/rc5.h
+++ b/src/block/rc5/rc5.h
diff --git a/src/cipher/rc6/info.txt b/src/block/rc6/info.txt
index 1457e78c1..1457e78c1 100644
--- a/src/cipher/rc6/info.txt
+++ b/src/block/rc6/info.txt
diff --git a/src/cipher/rc6/rc6.cpp b/src/block/rc6/rc6.cpp
index 67d765222..67d765222 100644
--- a/src/cipher/rc6/rc6.cpp
+++ b/src/block/rc6/rc6.cpp
diff --git a/src/cipher/rc6/rc6.h b/src/block/rc6/rc6.h
index 3517b4671..3517b4671 100644
--- a/src/cipher/rc6/rc6.h
+++ b/src/block/rc6/rc6.h
diff --git a/src/cipher/safer/info.txt b/src/block/safer/info.txt
index 973cbff19..973cbff19 100644
--- a/src/cipher/safer/info.txt
+++ b/src/block/safer/info.txt
diff --git a/src/cipher/safer/safe_tab.cpp b/src/block/safer/safe_tab.cpp
index 06de7fa49..06de7fa49 100644
--- a/src/cipher/safer/safe_tab.cpp
+++ b/src/block/safer/safe_tab.cpp
diff --git a/src/cipher/safer/safer_sk.cpp b/src/block/safer/safer_sk.cpp
index 639130714..639130714 100644
--- a/src/cipher/safer/safer_sk.cpp
+++ b/src/block/safer/safer_sk.cpp
diff --git a/src/cipher/safer/safer_sk.h b/src/block/safer/safer_sk.h
index 121cf545b..121cf545b 100644
--- a/src/cipher/safer/safer_sk.h
+++ b/src/block/safer/safer_sk.h
diff --git a/src/cipher/seed/info.txt b/src/block/seed/info.txt
index d04979335..d04979335 100644
--- a/src/cipher/seed/info.txt
+++ b/src/block/seed/info.txt
diff --git a/src/cipher/seed/seed.cpp b/src/block/seed/seed.cpp
index ecb6a86fa..ecb6a86fa 100644
--- a/src/cipher/seed/seed.cpp
+++ b/src/block/seed/seed.cpp
diff --git a/src/cipher/seed/seed.h b/src/block/seed/seed.h
index 9e96ec8c2..9e96ec8c2 100644
--- a/src/cipher/seed/seed.h
+++ b/src/block/seed/seed.h
diff --git a/src/cipher/seed/seed_tab.cpp b/src/block/seed/seed_tab.cpp
index 5880f0489..5880f0489 100644
--- a/src/cipher/seed/seed_tab.cpp
+++ b/src/block/seed/seed_tab.cpp
diff --git a/src/cipher/serpent/info.txt b/src/block/serpent/info.txt
index baaccbf01..baaccbf01 100644
--- a/src/cipher/serpent/info.txt
+++ b/src/block/serpent/info.txt
diff --git a/src/cipher/serpent/serpent.cpp b/src/block/serpent/serpent.cpp
index 997daa8b1..997daa8b1 100644
--- a/src/cipher/serpent/serpent.cpp
+++ b/src/block/serpent/serpent.cpp
diff --git a/src/cipher/serpent/serpent.h b/src/block/serpent/serpent.h
index cac042185..cac042185 100644
--- a/src/cipher/serpent/serpent.h
+++ b/src/block/serpent/serpent.h
diff --git a/src/cipher/serpent_ia32/info.txt b/src/block/serpent_ia32/info.txt
index d6a29229d..d6a29229d 100644
--- a/src/cipher/serpent_ia32/info.txt
+++ b/src/block/serpent_ia32/info.txt
diff --git a/src/cipher/serpent_ia32/serp_ia32.cpp b/src/block/serpent_ia32/serp_ia32.cpp
index 2cd607c18..2cd607c18 100644
--- a/src/cipher/serpent_ia32/serp_ia32.cpp
+++ b/src/block/serpent_ia32/serp_ia32.cpp
diff --git a/src/cipher/serpent_ia32/serp_ia32.h b/src/block/serpent_ia32/serp_ia32.h
index 83079e9c2..83079e9c2 100644
--- a/src/cipher/serpent_ia32/serp_ia32.h
+++ b/src/block/serpent_ia32/serp_ia32.h
diff --git a/src/cipher/serpent_ia32/serp_ia32_imp.S b/src/block/serpent_ia32/serp_ia32_imp.S
index ddfcc7806..ddfcc7806 100644
--- a/src/cipher/serpent_ia32/serp_ia32_imp.S
+++ b/src/block/serpent_ia32/serp_ia32_imp.S
diff --git a/src/cipher/skipjack/info.txt b/src/block/skipjack/info.txt
index 4b38d6d28..4b38d6d28 100644
--- a/src/cipher/skipjack/info.txt
+++ b/src/block/skipjack/info.txt
diff --git a/src/cipher/skipjack/skipjack.cpp b/src/block/skipjack/skipjack.cpp
index 3cad75436..3cad75436 100644
--- a/src/cipher/skipjack/skipjack.cpp
+++ b/src/block/skipjack/skipjack.cpp
diff --git a/src/cipher/skipjack/skipjack.h b/src/block/skipjack/skipjack.h
index c7c9ec9b9..c7c9ec9b9 100644
--- a/src/cipher/skipjack/skipjack.h
+++ b/src/block/skipjack/skipjack.h
diff --git a/src/cipher/square/info.txt b/src/block/square/info.txt
index a20697923..a20697923 100644
--- a/src/cipher/square/info.txt
+++ b/src/block/square/info.txt
diff --git a/src/cipher/square/sqr_tab.cpp b/src/block/square/sqr_tab.cpp
index 248ace4cd..248ace4cd 100644
--- a/src/cipher/square/sqr_tab.cpp
+++ b/src/block/square/sqr_tab.cpp
diff --git a/src/cipher/square/square.cpp b/src/block/square/square.cpp
index f2b15499b..f2b15499b 100644
--- a/src/cipher/square/square.cpp
+++ b/src/block/square/square.cpp
diff --git a/src/cipher/square/square.h b/src/block/square/square.h
index 97326e7ea..97326e7ea 100644
--- a/src/cipher/square/square.h
+++ b/src/block/square/square.h
diff --git a/src/cipher/tea/info.txt b/src/block/tea/info.txt
index 6a0e76b15..6a0e76b15 100644
--- a/src/cipher/tea/info.txt
+++ b/src/block/tea/info.txt
diff --git a/src/cipher/tea/tea.cpp b/src/block/tea/tea.cpp
index c5bd1b1fa..c5bd1b1fa 100644
--- a/src/cipher/tea/tea.cpp
+++ b/src/block/tea/tea.cpp
diff --git a/src/cipher/tea/tea.h b/src/block/tea/tea.h
index 71d4e02f9..71d4e02f9 100644
--- a/src/cipher/tea/tea.h
+++ b/src/block/tea/tea.h
diff --git a/src/cipher/twofish/info.txt b/src/block/twofish/info.txt
index 35639d858..35639d858 100644
--- a/src/cipher/twofish/info.txt
+++ b/src/block/twofish/info.txt
diff --git a/src/cipher/twofish/two_tab.cpp b/src/block/twofish/two_tab.cpp
index 7d349312b..7d349312b 100644
--- a/src/cipher/twofish/two_tab.cpp
+++ b/src/block/twofish/two_tab.cpp
diff --git a/src/cipher/twofish/twofish.cpp b/src/block/twofish/twofish.cpp
index b2357e347..b2357e347 100644
--- a/src/cipher/twofish/twofish.cpp
+++ b/src/block/twofish/twofish.cpp
diff --git a/src/cipher/twofish/twofish.h b/src/block/twofish/twofish.h
index f7788722c..f7788722c 100644
--- a/src/cipher/twofish/twofish.h
+++ b/src/block/twofish/twofish.h
diff --git a/src/cipher/xtea/info.txt b/src/block/xtea/info.txt
index 0120a3bce..0120a3bce 100644
--- a/src/cipher/xtea/info.txt
+++ b/src/block/xtea/info.txt
diff --git a/src/cipher/xtea/xtea.cpp b/src/block/xtea/xtea.cpp
index db5c7effc..db5c7effc 100644
--- a/src/cipher/xtea/xtea.cpp
+++ b/src/block/xtea/xtea.cpp
diff --git a/src/cipher/xtea/xtea.h b/src/block/xtea/xtea.h
index 03b41f683..03b41f683 100644
--- a/src/cipher/xtea/xtea.h
+++ b/src/block/xtea/xtea.h
diff --git a/src/core/info.txt b/src/core/info.txt
index c5276ce46..d4a48f378 100644
--- a/src/core/info.txt
+++ b/src/core/info.txt
@@ -15,7 +15,6 @@ timer
<add>
allocate.h
-block_cipher.h
botan.h
data_src.cpp
buf_comp.h
@@ -32,6 +31,4 @@ secmem.h
sym_algo.h
symkey.cpp
symkey.h
-stream_cipher.h
-stream_cipher.cpp
</add>
diff --git a/src/cipher/arc4/arc4.cpp b/src/stream/arc4/arc4.cpp
index 238567cdc..238567cdc 100644
--- a/src/cipher/arc4/arc4.cpp
+++ b/src/stream/arc4/arc4.cpp
diff --git a/src/cipher/arc4/arc4.h b/src/stream/arc4/arc4.h
index 0976ce7ea..0976ce7ea 100644
--- a/src/cipher/arc4/arc4.h
+++ b/src/stream/arc4/arc4.h
diff --git a/src/cipher/arc4/info.txt b/src/stream/arc4/info.txt
index 00f40a9ed..e4689cf69 100644
--- a/src/cipher/arc4/info.txt
+++ b/src/stream/arc4/info.txt
@@ -4,6 +4,10 @@ define ARC4
load_on auto
+<requires>
+stream
+</requires>
+
<add>
arc4.cpp
arc4.h
diff --git a/src/cipher/salsa20/info.txt b/src/stream/salsa20/info.txt
index de1683643..de1683643 100644
--- a/src/cipher/salsa20/info.txt
+++ b/src/stream/salsa20/info.txt
diff --git a/src/cipher/salsa20/salsa20.cpp b/src/stream/salsa20/salsa20.cpp
index c2c8f289f..c2c8f289f 100644
--- a/src/cipher/salsa20/salsa20.cpp
+++ b/src/stream/salsa20/salsa20.cpp
diff --git a/src/cipher/salsa20/salsa20.h b/src/stream/salsa20/salsa20.h
index 345a8dbbd..345a8dbbd 100644
--- a/src/cipher/salsa20/salsa20.h
+++ b/src/stream/salsa20/salsa20.h
diff --git a/src/core/stream_cipher.cpp b/src/stream/stream_cipher.cpp
index 04bb54484..04bb54484 100644
--- a/src/core/stream_cipher.cpp
+++ b/src/stream/stream_cipher.cpp
diff --git a/src/core/stream_cipher.h b/src/stream/stream_cipher.h
index 6c013c6d6..6c013c6d6 100644
--- a/src/core/stream_cipher.h
+++ b/src/stream/stream_cipher.h
diff --git a/src/cipher/turing/info.txt b/src/stream/turing/info.txt
index 95ae2cf48..95ae2cf48 100644
--- a/src/cipher/turing/info.txt
+++ b/src/stream/turing/info.txt
diff --git a/src/cipher/turing/tur_tab.cpp b/src/stream/turing/tur_tab.cpp
index 8162a999e..8162a999e 100644
--- a/src/cipher/turing/tur_tab.cpp
+++ b/src/stream/turing/tur_tab.cpp
diff --git a/src/cipher/turing/turing.cpp b/src/stream/turing/turing.cpp
index df0d3f5e8..df0d3f5e8 100644
--- a/src/cipher/turing/turing.cpp
+++ b/src/stream/turing/turing.cpp
diff --git a/src/cipher/turing/turing.h b/src/stream/turing/turing.h
index f50fd9370..f50fd9370 100644
--- a/src/cipher/turing/turing.h
+++ b/src/stream/turing/turing.h
diff --git a/src/cipher/wid_wake/info.txt b/src/stream/wid_wake/info.txt
index 299ebfdd7..299ebfdd7 100644
--- a/src/cipher/wid_wake/info.txt
+++ b/src/stream/wid_wake/info.txt
diff --git a/src/cipher/wid_wake/wid_wake.cpp b/src/stream/wid_wake/wid_wake.cpp
index d7ebdece0..d7ebdece0 100644
--- a/src/cipher/wid_wake/wid_wake.cpp
+++ b/src/stream/wid_wake/wid_wake.cpp
diff --git a/src/cipher/wid_wake/wid_wake.h b/src/stream/wid_wake/wid_wake.h
index 284572910..284572910 100644
--- a/src/cipher/wid_wake/wid_wake.h
+++ b/src/stream/wid_wake/wid_wake.h