summaryrefslogtreecommitdiff
path: root/regtest.cpp
diff options
context:
space:
mode:
authorweidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0>2009-03-02 02:39:17 +0000
committerweidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0>2009-03-02 02:39:17 +0000
commitcaf9e032e6b4ccb114a74a3936c916bcfaba262d (patch)
tree0fecaa7a6728d07549a41864ea2cedfb245f0bd3 /regtest.cpp
parent4e4793cc591e26c788b53c487bee7cab2d377f5e (diff)
downloadcryptopp-caf9e032e6b4ccb114a74a3936c916bcfaba262d.tar.gz
changes for 5.6:
- added AuthenticatedSymmetricCipher interface class and Filter wrappers - added CCM, GCM (with SSE2 assembly), CMAC, and SEED - improved AES speed on x86 and x64 - removed WORD64_AVAILABLE; compiler 64-bit int support is now required git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@433 57ff6487-cd31-0410-9ec3-f628ee90f5f0
Diffstat (limited to 'regtest.cpp')
-rw-r--r--regtest.cpp43
1 files changed, 41 insertions, 2 deletions
diff --git a/regtest.cpp b/regtest.cpp
index b89eaad..8f85bc9 100644
--- a/regtest.cpp
+++ b/regtest.cpp
@@ -25,6 +25,23 @@
#include "md5.h"
#include "sosemanuk.h"
#include "arc4.h"
+#include "ccm.h"
+#include "gcm.h"
+#include "twofish.h"
+#include "serpent.h"
+#include "cast.h"
+#include "rc6.h"
+#include "mars.h"
+#include "shacal2.h"
+#include "des.h"
+#include "idea.h"
+#include "rc5.h"
+#include "tea.h"
+#include "skipjack.h"
+#include "cmac.h"
+#include "dmac.h"
+#include "blowfish.h"
+#include "seed.h"
USING_NAMESPACE(CryptoPP)
@@ -39,12 +56,10 @@ void RegisterFactories()
RegisterDefaultFactoryFor<HashTransformation, SHA1>();
RegisterDefaultFactoryFor<HashTransformation, SHA224>();
RegisterDefaultFactoryFor<HashTransformation, SHA256>();
-#ifdef WORD64_AVAILABLE
RegisterDefaultFactoryFor<HashTransformation, SHA384>();
RegisterDefaultFactoryFor<HashTransformation, SHA512>();
RegisterDefaultFactoryFor<HashTransformation, Whirlpool>();
RegisterDefaultFactoryFor<HashTransformation, Tiger>();
-#endif
RegisterDefaultFactoryFor<HashTransformation, RIPEMD160>();
RegisterDefaultFactoryFor<HashTransformation, RIPEMD320>();
RegisterDefaultFactoryFor<HashTransformation, RIPEMD128>();
@@ -59,6 +74,9 @@ void RegisterFactories()
RegisterDefaultFactoryFor<MessageAuthenticationCode, VMAC<AES, 64> >();
RegisterDefaultFactoryFor<MessageAuthenticationCode, Weak::PanamaMAC<LittleEndian> >();
RegisterDefaultFactoryFor<MessageAuthenticationCode, Weak::PanamaMAC<BigEndian> >();
+ RegisterDefaultFactoryFor<MessageAuthenticationCode, CMAC<AES> >();
+ RegisterDefaultFactoryFor<MessageAuthenticationCode, DMAC<AES> >();
+ RegisterDefaultFactoryFor<MessageAuthenticationCode, CMAC<DES_EDE3> >();
RegisterAsymmetricCipherDefaultFactories<RSAES<OAEP<SHA1> > >("RSA/OAEP-MGF1(SHA-1)");
RegisterAsymmetricCipherDefaultFactories<DLIES<> >("DLIES(NoCofactorMultiplication, KDF2(SHA-1), XOR, HMAC(SHA-1), DHAES)");
RegisterSignatureSchemeDefaultFactories<DSA>("DSA(1363)");
@@ -84,6 +102,27 @@ void RegisterFactories()
RegisterSymmetricCipherDefaultFactories<Salsa20>();
RegisterSymmetricCipherDefaultFactories<Sosemanuk>();
RegisterSymmetricCipherDefaultFactories<Weak::MARC4>();
+ RegisterAuthenticatedSymmetricCipherDefaultFactories<CCM<AES> >();
+ RegisterAuthenticatedSymmetricCipherDefaultFactories<GCM<AES> >();
+ RegisterSymmetricCipherDefaultFactories<CTR_Mode<Camellia> >();
+ RegisterSymmetricCipherDefaultFactories<CTR_Mode<Twofish> >();
+ RegisterSymmetricCipherDefaultFactories<CTR_Mode<Serpent> >();
+ RegisterSymmetricCipherDefaultFactories<CTR_Mode<CAST256> >();
+ RegisterSymmetricCipherDefaultFactories<CTR_Mode<RC6> >();
+ RegisterSymmetricCipherDefaultFactories<CTR_Mode<MARS> >();
+ RegisterSymmetricCipherDefaultFactories<CTR_Mode<SHACAL2> >();
+ RegisterSymmetricCipherDefaultFactories<CTR_Mode<DES> >();
+ RegisterSymmetricCipherDefaultFactories<CTR_Mode<DES_XEX3> >();
+ RegisterSymmetricCipherDefaultFactories<CTR_Mode<DES_EDE3> >();
+ RegisterSymmetricCipherDefaultFactories<CTR_Mode<IDEA> >();
+ RegisterSymmetricCipherDefaultFactories<CTR_Mode<RC5> >();
+ RegisterSymmetricCipherDefaultFactories<CTR_Mode<TEA> >();
+ RegisterSymmetricCipherDefaultFactories<CTR_Mode<XTEA> >();
+ RegisterSymmetricCipherDefaultFactories<CTR_Mode<CAST128> >();
+ RegisterSymmetricCipherDefaultFactories<CTR_Mode<SKIPJACK> >();
+ RegisterSymmetricCipherDefaultFactories<CTR_Mode<Blowfish> >();
+ RegisterSymmetricCipherDefaultFactories<ECB_Mode<SEED> >();
+ RegisterSymmetricCipherDefaultFactories<CTR_Mode<SEED> >();
s_registered = true;
}