106 files changed, 253 insertions, 4 deletions
diff --git a/modules/ciphers/aes/aes.cpp b/modules/cipher/aes/aes.cpp
index 24f1f6213..24f1f6213 100644
--- a/modules/ciphers/aes/aes.cpp
+++ b/modules/cipher/aes/aes.cpp
diff --git a/modules/ciphers/aes/aes.h b/modules/cipher/aes/aes.h
index 5b43735ad..5b43735ad 100644
--- a/modules/ciphers/aes/aes.h
+++ b/modules/cipher/aes/aes.h
diff --git a/modules/ciphers/aes/aes_tab.cpp b/modules/cipher/aes/aes_tab.cpp
index 3665bb746..3665bb746 100644
--- a/modules/ciphers/aes/aes_tab.cpp
+++ b/modules/cipher/aes/aes_tab.cpp
diff --git a/modules/ciphers/aes/modinfo.txt b/modules/cipher/aes/modinfo.txt
index 2803ccc4e..2803ccc4e 100644
--- a/modules/ciphers/aes/modinfo.txt
+++ b/modules/cipher/aes/modinfo.txt
diff --git a/modules/ciphers/arc4/arc4.cpp b/modules/cipher/arc4/arc4.cpp
index 238567cdc..238567cdc 100644
--- a/modules/ciphers/arc4/arc4.cpp
+++ b/modules/cipher/arc4/arc4.cpp
diff --git a/modules/ciphers/arc4/arc4.h b/modules/cipher/arc4/arc4.h
index c99691484..c99691484 100644
--- a/modules/ciphers/arc4/arc4.h
+++ b/modules/cipher/arc4/arc4.h
diff --git a/modules/ciphers/arc4/modinfo.txt b/modules/cipher/arc4/modinfo.txt
index 00f40a9ed..00f40a9ed 100644
--- a/modules/ciphers/arc4/modinfo.txt
+++ b/modules/cipher/arc4/modinfo.txt
diff --git a/modules/ciphers/blowfish/blfs_tab.cpp b/modules/cipher/blowfish/blfs_tab.cpp
index f8fa07ee5..f8fa07ee5 100644
--- a/modules/ciphers/blowfish/blfs_tab.cpp
+++ b/modules/cipher/blowfish/blfs_tab.cpp
diff --git a/modules/ciphers/blowfish/blowfish.cpp b/modules/cipher/blowfish/blowfish.cpp
index ffca9241f..ffca9241f 100644
--- a/modules/ciphers/blowfish/blowfish.cpp
+++ b/modules/cipher/blowfish/blowfish.cpp
diff --git a/modules/ciphers/blowfish/blowfish.h b/modules/cipher/blowfish/blowfish.h
index 79875ba90..79875ba90 100644
--- a/modules/ciphers/blowfish/blowfish.h
+++ b/modules/cipher/blowfish/blowfish.h
diff --git a/modules/ciphers/blowfish/modinfo.txt b/modules/cipher/blowfish/modinfo.txt
index 0a9d2adc2..0a9d2adc2 100644
--- a/modules/ciphers/blowfish/modinfo.txt
+++ b/modules/cipher/blowfish/modinfo.txt
diff --git a/modules/ciphers/cast/cast128.cpp b/modules/cipher/cast/cast128.cpp
index 14e5c9e9d..14e5c9e9d 100644
--- a/modules/ciphers/cast/cast128.cpp
+++ b/modules/cipher/cast/cast128.cpp
diff --git a/modules/ciphers/cast/cast128.h b/modules/cipher/cast/cast128.h
index 0a7c53864..0a7c53864 100644
--- a/modules/ciphers/cast/cast128.h
+++ b/modules/cipher/cast/cast128.h
diff --git a/modules/ciphers/cast/cast256.cpp b/modules/cipher/cast/cast256.cpp
index 24d3e0078..24d3e0078 100644
--- a/modules/ciphers/cast/cast256.cpp
+++ b/modules/cipher/cast/cast256.cpp
diff --git a/modules/ciphers/cast/cast256.h b/modules/cipher/cast/cast256.h
index d4b7c6b18..d4b7c6b18 100644
--- a/modules/ciphers/cast/cast256.h
+++ b/modules/cipher/cast/cast256.h
diff --git a/modules/ciphers/cast/cast_tab.cpp b/modules/cipher/cast/cast_tab.cpp
index 3edab713f..3edab713f 100644
--- a/modules/ciphers/cast/cast_tab.cpp
+++ b/modules/cipher/cast/cast_tab.cpp
diff --git a/modules/ciphers/cast/modinfo.txt b/modules/cipher/cast/modinfo.txt
index e6d88ed2e..73d3f900f 100644
--- a/modules/ciphers/cast/modinfo.txt
+++ b/modules/cipher/cast/modinfo.txt
@@ -1,7 +1,6 @@
 realname "CAST"
 
-define CAST_128
-define CAST_256
+define CAST
 
 load_on auto
 
diff --git a/modules/ciphers/des/des.cpp b/modules/cipher/des/des.cpp
index d09752854..d09752854 100644
--- a/modules/ciphers/des/des.cpp
+++ b/modules/cipher/des/des.cpp
diff --git a/modules/ciphers/des/des.h b/modules/cipher/des/des.h
index 3e53a6166..3e53a6166 100644
--- a/modules/ciphers/des/des.h
+++ b/modules/cipher/des/des.h
diff --git a/modules/ciphers/des/des_tab.cpp b/modules/cipher/des/des_tab.cpp
index 9788cd8c0..9788cd8c0 100644
--- a/modules/ciphers/des/des_tab.cpp
+++ b/modules/cipher/des/des_tab.cpp
diff --git a/modules/ciphers/des/modinfo.txt b/modules/cipher/des/modinfo.txt
index 43ea9a0bc..43ea9a0bc 100644
--- a/modules/ciphers/des/modinfo.txt
+++ b/modules/cipher/des/modinfo.txt
diff --git a/modules/ciphers/gost/gost.cpp b/modules/cipher/gost/gost.cpp
index dc2b397e7..dc2b397e7 100644
--- a/modules/ciphers/gost/gost.cpp
+++ b/modules/cipher/gost/gost.cpp
diff --git a/modules/ciphers/gost/gost.h b/modules/cipher/gost/gost.h
index d78e3245f..d78e3245f 100644
--- a/modules/ciphers/gost/gost.h
+++ b/modules/cipher/gost/gost.h
diff --git a/modules/ciphers/gost/gost_tab.cpp b/modules/cipher/gost/gost_tab.cpp
index 3ef1a0caf..3ef1a0caf 100644
--- a/modules/ciphers/gost/gost_tab.cpp
+++ b/modules/cipher/gost/gost_tab.cpp
diff --git a/modules/ciphers/gost/modinfo.txt b/modules/cipher/gost/modinfo.txt
index f2b997c08..f2b997c08 100644
--- a/modules/ciphers/gost/modinfo.txt
+++ b/modules/cipher/gost/modinfo.txt
diff --git a/modules/ciphers/idea/idea.cpp b/modules/cipher/idea/idea.cpp
index a2b076015..a2b076015 100644
--- a/modules/ciphers/idea/idea.cpp
+++ b/modules/cipher/idea/idea.cpp
diff --git a/modules/ciphers/idea/idea.h b/modules/cipher/idea/idea.h
index 4c5e82aca..4c5e82aca 100644
--- a/modules/ciphers/idea/idea.h
+++ b/modules/cipher/idea/idea.h
diff --git a/modules/ciphers/idea/modinfo.txt b/modules/cipher/idea/modinfo.txt
index 2da3ffb43..2da3ffb43 100644
--- a/modules/ciphers/idea/modinfo.txt
+++ b/modules/cipher/idea/modinfo.txt
diff --git a/modules/ciphers/kasumi/kas_tab.cpp b/modules/cipher/kasumi/kas_tab.cpp
index 74a7bc06e..74a7bc06e 100644
--- a/modules/ciphers/kasumi/kas_tab.cpp
+++ b/modules/cipher/kasumi/kas_tab.cpp
diff --git a/modules/ciphers/kasumi/kasumi.cpp b/modules/cipher/kasumi/kasumi.cpp
index 4e2cba27b..4e2cba27b 100644
--- a/modules/ciphers/kasumi/kasumi.cpp
+++ b/modules/cipher/kasumi/kasumi.cpp
diff --git a/modules/ciphers/kasumi/kasumi.h b/modules/cipher/kasumi/kasumi.h
index 58888d909..58888d909 100644
--- a/modules/ciphers/kasumi/kasumi.h
+++ b/modules/cipher/kasumi/kasumi.h
diff --git a/modules/ciphers/kasumi/modinfo.txt b/modules/cipher/kasumi/modinfo.txt
index 3ca5de20a..3ca5de20a 100644
--- a/modules/ciphers/kasumi/modinfo.txt
+++ b/modules/cipher/kasumi/modinfo.txt
diff --git a/modules/ciphers/lion/lion.cpp b/modules/cipher/lion/lion.cpp
index 009e98408..009e98408 100644
--- a/modules/ciphers/lion/lion.cpp
+++ b/modules/cipher/lion/lion.cpp
diff --git a/modules/ciphers/lion/lion.h b/modules/cipher/lion/lion.h
index 70018838a..70018838a 100644
--- a/modules/ciphers/lion/lion.h
+++ b/modules/cipher/lion/lion.h
diff --git a/modules/ciphers/lion/modinfo.txt b/modules/cipher/lion/modinfo.txt
index 558d71d0c..558d71d0c 100644
--- a/modules/ciphers/lion/modinfo.txt
+++ b/modules/cipher/lion/modinfo.txt
diff --git a/modules/ciphers/lubyrack/lubyrack.cpp b/modules/cipher/lubyrack/lubyrack.cpp
index c9e6fc531..c9e6fc531 100644
--- a/modules/ciphers/lubyrack/lubyrack.cpp
+++ b/modules/cipher/lubyrack/lubyrack.cpp
diff --git a/modules/ciphers/lubyrack/lubyrack.h b/modules/cipher/lubyrack/lubyrack.h
index 2c4813cb6..2c4813cb6 100644
--- a/modules/ciphers/lubyrack/lubyrack.h
+++ b/modules/cipher/lubyrack/lubyrack.h
diff --git a/modules/ciphers/lubyrack/modinfo.txt b/modules/cipher/lubyrack/modinfo.txt
index d83df2409..d83df2409 100644
--- a/modules/ciphers/lubyrack/modinfo.txt
+++ b/modules/cipher/lubyrack/modinfo.txt
diff --git a/modules/ciphers/mars/mars.cpp b/modules/cipher/mars/mars.cpp
index cc671fc06..cc671fc06 100644
--- a/modules/ciphers/mars/mars.cpp
+++ b/modules/cipher/mars/mars.cpp
diff --git a/modules/ciphers/mars/mars.h b/modules/cipher/mars/mars.h
index 6e1bc9f34..6e1bc9f34 100644
--- a/modules/ciphers/mars/mars.h
+++ b/modules/cipher/mars/mars.h
diff --git a/modules/ciphers/mars/mars_tab.cpp b/modules/cipher/mars/mars_tab.cpp
index 07381e9cb..07381e9cb 100644
--- a/modules/ciphers/mars/mars_tab.cpp
+++ b/modules/cipher/mars/mars_tab.cpp
diff --git a/modules/ciphers/mars/modinfo.txt b/modules/cipher/mars/modinfo.txt
index b0ad8af9c..b0ad8af9c 100644
--- a/modules/ciphers/mars/modinfo.txt
+++ b/modules/cipher/mars/modinfo.txt
diff --git a/modules/ciphers/misty1/mist_tab.cpp b/modules/cipher/misty1/mist_tab.cpp
index b72742fb3..b72742fb3 100644
--- a/modules/ciphers/misty1/mist_tab.cpp
+++ b/modules/cipher/misty1/mist_tab.cpp
diff --git a/modules/ciphers/misty1/misty1.cpp b/modules/cipher/misty1/misty1.cpp
index 523d11c84..523d11c84 100644
--- a/modules/ciphers/misty1/misty1.cpp
+++ b/modules/cipher/misty1/misty1.cpp
diff --git a/modules/ciphers/misty1/misty1.h b/modules/cipher/misty1/misty1.h
index 9e506d536..9e506d536 100644
--- a/modules/ciphers/misty1/misty1.h
+++ b/modules/cipher/misty1/misty1.h
diff --git a/modules/ciphers/misty1/modinfo.txt b/modules/cipher/misty1/modinfo.txt
index 36600e5fe..36600e5fe 100644
--- a/modules/ciphers/misty1/modinfo.txt
+++ b/modules/cipher/misty1/modinfo.txt
diff --git a/modules/ciphers/noekeon/modinfo.txt b/modules/cipher/noekeon/modinfo.txt
index 8025c2073..8025c2073 100644
--- a/modules/ciphers/noekeon/modinfo.txt
+++ b/modules/cipher/noekeon/modinfo.txt
diff --git a/modules/ciphers/noekeon/noekeon.cpp b/modules/cipher/noekeon/noekeon.cpp
index 437972fe5..437972fe5 100644
--- a/modules/ciphers/noekeon/noekeon.cpp
+++ b/modules/cipher/noekeon/noekeon.cpp
diff --git a/modules/ciphers/noekeon/noekeon.h b/modules/cipher/noekeon/noekeon.h
index 660ab487a..660ab487a 100644
--- a/modules/ciphers/noekeon/noekeon.h
+++ b/modules/cipher/noekeon/noekeon.h
diff --git a/modules/ciphers/rc2/modinfo.txt b/modules/cipher/rc2/modinfo.txt
index 099141de7..099141de7 100644
--- a/modules/ciphers/rc2/modinfo.txt
+++ b/modules/cipher/rc2/modinfo.txt
diff --git a/modules/ciphers/rc2/rc2.cpp b/modules/cipher/rc2/rc2.cpp
index 6d764e5c4..6d764e5c4 100644
--- a/modules/ciphers/rc2/rc2.cpp
+++ b/modules/cipher/rc2/rc2.cpp
diff --git a/modules/ciphers/rc2/rc2.h b/modules/cipher/rc2/rc2.h
index 8f46821a4..8f46821a4 100644
--- a/modules/ciphers/rc2/rc2.h
+++ b/modules/cipher/rc2/rc2.h
diff --git a/modules/ciphers/rc5/modinfo.txt b/modules/cipher/rc5/modinfo.txt
index 4a150c3b0..4a150c3b0 100644
--- a/modules/ciphers/rc5/modinfo.txt
+++ b/modules/cipher/rc5/modinfo.txt
diff --git a/modules/ciphers/rc5/rc5.cpp b/modules/cipher/rc5/rc5.cpp
index 0c0229b6c..0c0229b6c 100644
--- a/modules/ciphers/rc5/rc5.cpp
+++ b/modules/cipher/rc5/rc5.cpp
diff --git a/modules/ciphers/rc5/rc5.h b/modules/cipher/rc5/rc5.h
index 0827048dc..0827048dc 100644
--- a/modules/ciphers/rc5/rc5.h
+++ b/modules/cipher/rc5/rc5.h
diff --git a/modules/ciphers/rc6/modinfo.txt b/modules/cipher/rc6/modinfo.txt
index 1457e78c1..1457e78c1 100644
--- a/modules/ciphers/rc6/modinfo.txt
+++ b/modules/cipher/rc6/modinfo.txt
diff --git a/modules/ciphers/rc6/rc6.cpp b/modules/cipher/rc6/rc6.cpp
index 67d765222..67d765222 100644
--- a/modules/ciphers/rc6/rc6.cpp
+++ b/modules/cipher/rc6/rc6.cpp
diff --git a/modules/ciphers/rc6/rc6.h b/modules/cipher/rc6/rc6.h
index d629b0995..d629b0995 100644
--- a/modules/ciphers/rc6/rc6.h
+++ b/modules/cipher/rc6/rc6.h
diff --git a/modules/ciphers/safer/modinfo.txt b/modules/cipher/safer/modinfo.txt
index 973cbff19..973cbff19 100644
--- a/modules/ciphers/safer/modinfo.txt
+++ b/modules/cipher/safer/modinfo.txt
diff --git a/modules/ciphers/safer/safe_tab.cpp b/modules/cipher/safer/safe_tab.cpp
index 06de7fa49..06de7fa49 100644
--- a/modules/ciphers/safer/safe_tab.cpp
+++ b/modules/cipher/safer/safe_tab.cpp
diff --git a/modules/ciphers/safer/safer_sk.cpp b/modules/cipher/safer/safer_sk.cpp
index 639130714..639130714 100644
--- a/modules/ciphers/safer/safer_sk.cpp
+++ b/modules/cipher/safer/safer_sk.cpp
diff --git a/modules/ciphers/safer/safer_sk.h b/modules/cipher/safer/safer_sk.h
index 1bc65e2f7..1bc65e2f7 100644
--- a/modules/ciphers/safer/safer_sk.h
+++ b/modules/cipher/safer/safer_sk.h
diff --git a/modules/ciphers/salsa20/modinfo.txt b/modules/cipher/salsa20/modinfo.txt
index de1683643..de1683643 100644
--- a/modules/ciphers/salsa20/modinfo.txt
+++ b/modules/cipher/salsa20/modinfo.txt
diff --git a/modules/ciphers/salsa20/salsa20.cpp b/modules/cipher/salsa20/salsa20.cpp
index d11ba8799..d11ba8799 100644
--- a/modules/ciphers/salsa20/salsa20.cpp
+++ b/modules/cipher/salsa20/salsa20.cpp
diff --git a/modules/ciphers/salsa20/salsa20.h b/modules/cipher/salsa20/salsa20.h
index e107d8569..e107d8569 100644
--- a/modules/ciphers/salsa20/salsa20.h
+++ b/modules/cipher/salsa20/salsa20.h
diff --git a/modules/ciphers/seed/modinfo.txt b/modules/cipher/seed/modinfo.txt
index d04979335..d04979335 100644
--- a/modules/ciphers/seed/modinfo.txt
+++ b/modules/cipher/seed/modinfo.txt
diff --git a/modules/ciphers/seed/seed.cpp b/modules/cipher/seed/seed.cpp
index ecb6a86fa..ecb6a86fa 100644
--- a/modules/ciphers/seed/seed.cpp
+++ b/modules/cipher/seed/seed.cpp
diff --git a/modules/ciphers/seed/seed.h b/modules/cipher/seed/seed.h
index 95ddbe1d5..95ddbe1d5 100644
--- a/modules/ciphers/seed/seed.h
+++ b/modules/cipher/seed/seed.h
diff --git a/modules/ciphers/seed/seed_tab.cpp b/modules/cipher/seed/seed_tab.cpp
index 5880f0489..5880f0489 100644
--- a/modules/ciphers/seed/seed_tab.cpp
+++ b/modules/cipher/seed/seed_tab.cpp
diff --git a/modules/ciphers/serpent/modinfo.txt b/modules/cipher/serpent/modinfo.txt
index baaccbf01..baaccbf01 100644
--- a/modules/ciphers/serpent/modinfo.txt
+++ b/modules/cipher/serpent/modinfo.txt
diff --git a/modules/ciphers/serpent/serpent.cpp b/modules/cipher/serpent/serpent.cpp
index 997daa8b1..997daa8b1 100644
--- a/modules/ciphers/serpent/serpent.cpp
+++ b/modules/cipher/serpent/serpent.cpp
diff --git a/modules/ciphers/serpent/serpent.h b/modules/cipher/serpent/serpent.h
index 685470e4c..685470e4c 100644
--- a/modules/ciphers/serpent/serpent.h
+++ b/modules/cipher/serpent/serpent.h
diff --git a/modules/ciphers/skipjack/modinfo.txt b/modules/cipher/skipjack/modinfo.txt
index 4b38d6d28..4b38d6d28 100644
--- a/modules/ciphers/skipjack/modinfo.txt
+++ b/modules/cipher/skipjack/modinfo.txt
diff --git a/modules/ciphers/skipjack/skipjack.cpp b/modules/cipher/skipjack/skipjack.cpp
index 3cad75436..3cad75436 100644
--- a/modules/ciphers/skipjack/skipjack.cpp
+++ b/modules/cipher/skipjack/skipjack.cpp
diff --git a/modules/ciphers/skipjack/skipjack.h b/modules/cipher/skipjack/skipjack.h
index 240148f19..240148f19 100644
--- a/modules/ciphers/skipjack/skipjack.h
+++ b/modules/cipher/skipjack/skipjack.h
diff --git a/modules/ciphers/square/modinfo.txt b/modules/cipher/square/modinfo.txt
index a20697923..a20697923 100644
--- a/modules/ciphers/square/modinfo.txt
+++ b/modules/cipher/square/modinfo.txt
diff --git a/modules/ciphers/square/sqr_tab.cpp b/modules/cipher/square/sqr_tab.cpp
index 248ace4cd..248ace4cd 100644
--- a/modules/ciphers/square/sqr_tab.cpp
+++ b/modules/cipher/square/sqr_tab.cpp
diff --git a/modules/ciphers/square/square.cpp b/modules/cipher/square/square.cpp
index f2b15499b..f2b15499b 100644
--- a/modules/ciphers/square/square.cpp
+++ b/modules/cipher/square/square.cpp
diff --git a/modules/ciphers/square/square.h b/modules/cipher/square/square.h
index efbc6e730..efbc6e730 100644
--- a/modules/ciphers/square/square.h
+++ b/modules/cipher/square/square.h
diff --git a/modules/ciphers/tea/modinfo.txt b/modules/cipher/tea/modinfo.txt
index 6a0e76b15..6a0e76b15 100644
--- a/modules/ciphers/tea/modinfo.txt
+++ b/modules/cipher/tea/modinfo.txt
diff --git a/modules/ciphers/tea/tea.cpp b/modules/cipher/tea/tea.cpp
index c5bd1b1fa..c5bd1b1fa 100644
--- a/modules/ciphers/tea/tea.cpp
+++ b/modules/cipher/tea/tea.cpp
diff --git a/modules/ciphers/tea/tea.h b/modules/cipher/tea/tea.h
index 2fc9fe838..2fc9fe838 100644
--- a/modules/ciphers/tea/tea.h
+++ b/modules/cipher/tea/tea.h
diff --git a/modules/ciphers/turing/modinfo.txt b/modules/cipher/turing/modinfo.txt
index 95ae2cf48..95ae2cf48 100644
--- a/modules/ciphers/turing/modinfo.txt
+++ b/modules/cipher/turing/modinfo.txt
diff --git a/modules/ciphers/turing/tur_tab.cpp b/modules/cipher/turing/tur_tab.cpp
index 08793f59d..08793f59d 100644
--- a/modules/ciphers/turing/tur_tab.cpp
+++ b/modules/cipher/turing/tur_tab.cpp
diff --git a/modules/ciphers/turing/turing.cpp b/modules/cipher/turing/turing.cpp
index 017b5cf1d..017b5cf1d 100644
--- a/modules/ciphers/turing/turing.cpp
+++ b/modules/cipher/turing/turing.cpp
diff --git a/modules/ciphers/turing/turing.h b/modules/cipher/turing/turing.h
index 14b2e6fd6..14b2e6fd6 100644
--- a/modules/ciphers/turing/turing.h
+++ b/modules/cipher/turing/turing.h
diff --git a/modules/ciphers/twofish/modinfo.txt b/modules/cipher/twofish/modinfo.txt
index 35639d858..35639d858 100644
--- a/modules/ciphers/twofish/modinfo.txt
+++ b/modules/cipher/twofish/modinfo.txt
diff --git a/modules/ciphers/twofish/two_tab.cpp b/modules/cipher/twofish/two_tab.cpp
index 7d349312b..7d349312b 100644
--- a/modules/ciphers/twofish/two_tab.cpp
+++ b/modules/cipher/twofish/two_tab.cpp
diff --git a/modules/ciphers/twofish/twofish.cpp b/modules/cipher/twofish/twofish.cpp
index b2357e347..b2357e347 100644
--- a/modules/ciphers/twofish/twofish.cpp
+++ b/modules/cipher/twofish/twofish.cpp
diff --git a/modules/ciphers/twofish/twofish.h b/modules/cipher/twofish/twofish.h
index 8519a9aa8..8519a9aa8 100644
--- a/modules/ciphers/twofish/twofish.h
+++ b/modules/cipher/twofish/twofish.h
diff --git a/modules/ciphers/wid_wake/modinfo.txt b/modules/cipher/wid_wake/modinfo.txt
index 299ebfdd7..299ebfdd7 100644
--- a/modules/ciphers/wid_wake/modinfo.txt
+++ b/modules/cipher/wid_wake/modinfo.txt
diff --git a/modules/ciphers/wid_wake/wid_wake.cpp b/modules/cipher/wid_wake/wid_wake.cpp
index d7ebdece0..d7ebdece0 100644
--- a/modules/ciphers/wid_wake/wid_wake.cpp
+++ b/modules/cipher/wid_wake/wid_wake.cpp
diff --git a/modules/ciphers/wid_wake/wid_wake.h b/modules/cipher/wid_wake/wid_wake.h
index 09171a8f5..09171a8f5 100644
--- a/modules/ciphers/wid_wake/wid_wake.h
+++ b/modules/cipher/wid_wake/wid_wake.h
diff --git a/modules/ciphers/xtea/modinfo.txt b/modules/cipher/xtea/modinfo.txt
index 0120a3bce..0120a3bce 100644
--- a/modules/ciphers/xtea/modinfo.txt
+++ b/modules/cipher/xtea/modinfo.txt
diff --git a/modules/ciphers/xtea/xtea.cpp b/modules/cipher/xtea/xtea.cpp
index db5c7effc..db5c7effc 100644
--- a/modules/ciphers/xtea/xtea.cpp
+++ b/modules/cipher/xtea/xtea.cpp
diff --git a/modules/ciphers/xtea/xtea.h b/modules/cipher/xtea/xtea.h
index 193c13bb9..193c13bb9 100644
--- a/modules/ciphers/xtea/xtea.h
+++ b/modules/cipher/xtea/xtea.h
diff --git a/modules/hash/ripemd128/modinfo.txt b/modules/hash/rmd128/modinfo.txt
index 318337a25..9be80268b 100644
--- a/modules/hash/ripemd128/modinfo.txt
+++ b/modules/hash/rmd128/modinfo.txt
@@ -1,6 +1,6 @@
 realname "RIPEMD-128"
 
-define RIPEMD128
+define RIPEMD_128
 
 load_on auto
 
diff --git a/modules/hash/ripemd128/rmd128.cpp b/modules/hash/rmd128/rmd128.cpp
index 4c33350b6..4c33350b6 100644
--- a/modules/hash/ripemd128/rmd128.cpp
+++ b/modules/hash/rmd128/rmd128.cpp
diff --git a/modules/hash/ripemd128/rmd128.h b/modules/hash/rmd128/rmd128.h
index 2cb98e516..2cb98e516 100644
--- a/modules/hash/ripemd128/rmd128.h
+++ b/modules/hash/rmd128/rmd128.h
diff --git a/modules/hash/ripemd160/modinfo.txt b/modules/hash/rmd160/modinfo.txt
index a9b204e53..11183b03e 100644
--- a/modules/hash/ripemd160/modinfo.txt
+++ b/modules/hash/rmd160/modinfo.txt
@@ -1,6 +1,6 @@
 realname "RIPEMD-160"
 
-define RIPEMD160
+define RIPEMD_160
 
 load_on auto
 
diff --git a/modules/hash/ripemd160/rmd160.cpp b/modules/hash/rmd160/rmd160.cpp
index 20c0ad4f1..20c0ad4f1 100644
--- a/modules/hash/ripemd160/rmd160.cpp
+++ b/modules/hash/rmd160/rmd160.cpp
diff --git a/modules/hash/ripemd160/rmd160.h b/modules/hash/rmd160/rmd160.h
index 0544f21cc..0544f21cc 100644
--- a/modules/hash/ripemd160/rmd160.h
+++ b/modules/hash/rmd160/rmd160.h
diff --git a/modules/mac/ssl3mac/ssl3_mac.cpp b/modules/mac/ssl3mac/ssl3_mac.cpp
new file mode 100644
index 000000000..ceb04bf44
--- /dev/null
+++ b/modules/mac/ssl3mac/ssl3_mac.cpp
@@ -0,0 +1,88 @@
+/*************************************************
+* SSL3-MAC Source File                           *
+* (C) 1999-2004 Jack Lloyd                       *
+*************************************************/
+
+#include <botan/ssl3_mac.h>
+#include <botan/lookup.h>
+
+namespace Botan {
+
+/*************************************************
+* Update a SSL3-MAC Calculation                  *
+*************************************************/
+void SSL3_MAC::add_data(const byte input[], u32bit length)
+   {
+   hash->update(input, length);
+   }
+
+/*************************************************
+* Finalize a SSL3-MAC Calculation                *
+*************************************************/
+void SSL3_MAC::final_result(byte mac[])
+   {
+   hash->final(mac);
+   hash->update(o_key);
+   hash->update(mac, OUTPUT_LENGTH);
+   hash->final(mac);
+   hash->update(i_key);
+   }
+
+/*************************************************
+* SSL3-MAC Key Schedule                          *
+*************************************************/
+void SSL3_MAC::key(const byte key[], u32bit length)
+   {
+   hash->clear();
+   std::fill(i_key.begin(), i_key.end(), 0x36);
+   std::fill(o_key.begin(), o_key.end(), 0x5C);
+
+   i_key.copy(key, length);
+   o_key.copy(key, length);
+   hash->update(i_key);
+   }
+
+/*************************************************
+* Clear memory of sensitive data                 *
+*************************************************/
+void SSL3_MAC::clear() throw()
+   {
+   hash->clear();
+   i_key.clear();
+   o_key.clear();
+   }
+
+/*************************************************
+* Return the name of this type                   *
+*************************************************/
+std::string SSL3_MAC::name() const
+   {
+   return "SSL3-MAC(" + hash->name() + ")";
+   }
+
+/*************************************************
+* Return a clone of this object                  *
+*************************************************/
+MessageAuthenticationCode* SSL3_MAC::clone() const
+   {
+   return new SSL3_MAC(hash->name());
+   }
+
+/*************************************************
+* SSL3-MAC Constructor                           *
+*************************************************/
+SSL3_MAC::SSL3_MAC(const std::string& hash_name) :
+   MessageAuthenticationCode(output_length_of(hash_name),
+                             output_length_of(hash_name)),
+   hash(get_hash(hash_name))
+   {
+   if(hash->name() != "MD5" && hash->name() != "SHA-160")
+      throw Invalid_Argument("SSL3-MAC cannot be used with " + hash->name());
+
+   const u32bit INNER_HASH_LENGTH = (hash->name() == "MD5") ? 64 : 60;
+
+   i_key.create(INNER_HASH_LENGTH);
+   o_key.create(INNER_HASH_LENGTH);
+   }
+
+}
diff --git a/modules/mac/ssl3mac/ssl3_mac.h b/modules/mac/ssl3mac/ssl3_mac.h
new file mode 100644
index 000000000..8ab08c97d
--- /dev/null
+++ b/modules/mac/ssl3mac/ssl3_mac.h
@@ -0,0 +1,34 @@
+/*************************************************
+* SSL3-MAC Header File                           *
+* (C) 1999-2004 Jack Lloyd                       *
+*************************************************/
+
+#ifndef BOTAN_SSL3_MAC_H__
+#define BOTAN_SSL3_MAC_H__
+
+#include <botan/base.h>
+
+namespace Botan {
+
+/*************************************************
+* SSL3-MAC                                       *
+*************************************************/
+class SSL3_MAC : public MessageAuthenticationCode
+   {
+   public:
+      void clear() throw();
+      std::string name() const;
+      MessageAuthenticationCode* clone() const;
+      SSL3_MAC(const std::string&);
+      ~SSL3_MAC() { delete hash; }
+   private:
+      void add_data(const byte[], u32bit);
+      void final_result(byte[]);
+      void key(const byte[], u32bit);
+      HashFunction* hash;
+      SecureVector<byte> i_key, o_key;
+   };
+
+}
+
+#endif
diff --git a/modules/mac/x919_mac/x919_mac.cpp b/modules/mac/x919_mac/x919_mac.cpp
new file mode 100644
index 000000000..92ec7b7b8
--- /dev/null
+++ b/modules/mac/x919_mac/x919_mac.cpp
@@ -0,0 +1,92 @@
+/*************************************************
+* ANSI X9.19 MAC Source File                     *
+* (C) 1999-2007 Jack Lloyd                       *
+*************************************************/
+
+#include <botan/x919_mac.h>
+#include <botan/lookup.h>
+#include <botan/xor_buf.h>
+#include <algorithm>
+
+namespace Botan {
+
+/*************************************************
+* Update an ANSI X9.19 MAC Calculation           *
+*************************************************/
+void ANSI_X919_MAC::add_data(const byte input[], u32bit length)
+   {
+   u32bit xored = std::min(8 - position, length);
+   xor_buf(state + position, input, xored);
+   position += xored;
+
+   if(position < 8) return;
+
+   e->encrypt(state);
+   input += xored;
+   length -= xored;
+   while(length >= 8)
+      {
+      xor_buf(state, input, 8);
+      e->encrypt(state);
+      input += 8;
+      length -= 8;
+      }
+
+   xor_buf(state, input, length);
+   position = length;
+   }
+
+/*************************************************
+* Finalize an ANSI X9.19 MAC Calculation         *
+*************************************************/
+void ANSI_X919_MAC::final_result(byte mac[])
+   {
+   if(position)
+      e->encrypt(state);
+   d->decrypt(state, mac);
+   e->encrypt(mac);
+   state.clear();
+   position = 0;
+   }
+
+/*************************************************
+* ANSI X9.19 MAC Key Schedule                    *
+*************************************************/
+void ANSI_X919_MAC::key(const byte key[], u32bit length)
+   {
+   e->set_key(key, 8);
+   if(length == 8) d->set_key(key, 8);
+   else            d->set_key(key + 8, 8);
+   }
+
+/*************************************************
+* Clear memory of sensitive data                 *
+*************************************************/
+void ANSI_X919_MAC::clear() throw()
+   {
+   e->clear();
+   d->clear();
+   state.clear();
+   position = 0;
+   }
+
+/*************************************************
+* ANSI X9.19 MAC Constructor                     *
+*************************************************/
+ANSI_X919_MAC::ANSI_X919_MAC() : MessageAuthenticationCode(8, 8, 16, 8)
+   {
+   e = get_block_cipher("DES");
+   d = get_block_cipher("DES");
+   position = 0;
+   }
+
+/*************************************************
+* ANSI X9.19 MAC Destructor                      *
+*************************************************/
+ANSI_X919_MAC::~ANSI_X919_MAC()
+   {
+   delete e;
+   delete d;
+   }
+
+}
diff --git a/modules/mac/x919_mac/x919_mac.h b/modules/mac/x919_mac/x919_mac.h
new file mode 100644
index 000000000..bedb2cf58
--- /dev/null
+++ b/modules/mac/x919_mac/x919_mac.h
@@ -0,0 +1,36 @@
+/*************************************************
+* ANSI X9.19 MAC Header File                     *
+* (C) 1999-2007 Jack Lloyd                       *
+*************************************************/
+
+#ifndef BOTAN_ANSI_X919_MAC_H__
+#define BOTAN_ANSI_X919_MAC_H__
+
+#include <botan/base.h>
+
+namespace Botan {
+
+/*************************************************
+* ANSI X9.19 MAC                                 *
+*************************************************/
+class BOTAN_DLL ANSI_X919_MAC : public MessageAuthenticationCode
+   {
+   public:
+      void clear() throw();
+      std::string name() const { return "X9.19-MAC"; }
+      MessageAuthenticationCode* clone() const { return new ANSI_X919_MAC; }
+      ANSI_X919_MAC();
+      ~ANSI_X919_MAC();
+   private:
+      void add_data(const byte[], u32bit);
+      void final_result(byte[]);
+      void key(const byte[], u32bit);
+      BlockCipher* e;
+      BlockCipher* d;
+      SecureBuffer<byte, 8> state;
+      u32bit position;
+   };
+
+}
+
+#endif