minor changes related to NESSIE algorithms

git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@63 57ff6487-cd31-0410-9ec3-f628ee90f5f0

3 files changed, 10 insertions, 24 deletions

diff --git a/camellia.cpp b/camellia.cpp
index 3d8d5e3..4fff64c 100644
--- a/camellia.cpp
+++ b/camellia.cpp
@@ -73,8 +73,6 @@ void Camellia::Base::UncheckedSetKey(CipherDir dir, const byte *key, unsigned in
 #define KA	(kw+4)
 #define KB	(kw+6)
 
-//???	GetBlock<word64, BigEndian> keyblock(key);
-//???	keyblock(KL[0])(KL[1]);
 	if (keylen == 16)
 	{
 		GetUserKey(BIG_ENDIAN_ORDER, kw, 2, key, keylen);
@@ -92,15 +90,6 @@ void Camellia::Base::UncheckedSetKey(CipherDir dir, const byte *key, unsigned in
 		{
 			GetUserKey(BIG_ENDIAN_ORDER, kw, 4, key, keylen);
 		}
-//???		keyblock(KR[0]);
-//???		if (keylen == 32)
-//???		{
-//???			keyblock(KR[1]);
-//???		}
-//???		else
-//???		{
-//???			KR[1] = ~KR[0];
-//???		}
 		KA[0] = KL[0] ^ KR[0];
 		KA[1] = KL[1] ^ KR[1];
 	}
diff --git a/cryptest.dsp b/cryptest.dsp
index f7fb19e..7c95f53 100644
--- a/cryptest.dsp
+++ b/cryptest.dsp
@@ -135,6 +135,7 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /OPT:NOWIN98
+# SUBTRACT LINK32 /pdb:none
 
 !ENDIF 
 
@@ -157,10 +158,6 @@ SOURCE=.\3wayval.dat
 # End Source File
 # Begin Source File
 
-SOURCE=.\anubisv.dat
-# End Source File
-# Begin Source File
-
 SOURCE=.\camellia.dat
 # End Source File
 # Begin Source File
@@ -233,10 +230,6 @@ SOURCE=.\ideaval.dat
 # End Source File
 # Begin Source File
 
-SOURCE=.\khazadv.dat
-# End Source File
-# Begin Source File
-
 SOURCE=.\luc1024.dat
 # End Source File
 # Begin Source File
@@ -349,10 +342,6 @@ SOURCE=.\serpentv.dat
 # End Source File
 # Begin Source File
 
-SOURCE=.\shacal1v.dat
-# End Source File
-# Begin Source File
-
 SOURCE=.\shacal2v.dat
 # End Source File
 # Begin Source File
@@ -409,6 +398,10 @@ SOURCE=.\factory.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\fipsalgt.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\regtest.cpp
 # End Source File
 # Begin Source File
diff --git a/regtest.cpp b/regtest.cpp
index 60e59f7..0e3d81d 100644
--- a/regtest.cpp
+++ b/regtest.cpp
@@ -23,8 +23,10 @@ void RegisterFactories()
 	RegisterDefaultFactoryFor<SimpleKeyAgreementDomain, DH>("DH");
 	RegisterDefaultFactoryFor<HashTransformation, SHA1>("SHA-1");
 	RegisterDefaultFactoryFor<HashTransformation, SHA256>("SHA-256");
+#ifdef WORD64_AVAILABLE
 	RegisterDefaultFactoryFor<HashTransformation, SHA384>("SHA-384");
 	RegisterDefaultFactoryFor<HashTransformation, SHA512>("SHA-512");
+#endif
 	RegisterDefaultFactoryFor<HashTransformation, Whirlpool>("Whirlpool");
 	RegisterDefaultFactoryFor<MessageAuthenticationCode, HMAC<MD5> >("HMAC(MD5)");
 	RegisterDefaultFactoryFor<MessageAuthenticationCode, HMAC<SHA1> >("HMAC(SHA-1)");
@@ -41,6 +43,8 @@ void RegisterFactories()
 	RegisterSignatureSchemeDefaultFactories<RWSS<P1363_EMSA2, SHA1> >("RW/EMSA2(SHA-1)");
 	RegisterSignatureSchemeDefaultFactories<RSASS<PSS, SHA1> >("RSA/PSS-MGF1(SHA-1)");
 	RegisterSymmetricCipherDefaultFactories<SEAL<> >("SEAL-3.0-BE");
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<Camellia> >("Camellia(ECB)");
 	RegisterSymmetricCipherDefaultFactories<ECB_Mode<SHACAL2> >("SHACAL-2(ECB)");
+#ifdef WORD64_AVAILABLE
+	RegisterSymmetricCipherDefaultFactories<ECB_Mode<Camellia> >("Camellia(ECB)");
+#endif
 }