arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor changes related to NESSIE algorithms

pull/2/head
weidai 2003-04-23 00:51:42 +00:00
parent 5801fd7b19
commit 3e15ae72b5
3 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
camellia.cpp
View File

@ -73,8 +73,6 @@ void Camellia::Base::UncheckedSetKey(CipherDir dir, const byte *key, unsigned in
#define KA (kw+4) #define KA (kw+4)
#define KB (kw+6) #define KB (kw+6)
//??? GetBlock<word64, BigEndian> keyblock(key);
//??? keyblock(KL[0])(KL[1]);
if (keylen == 16) if (keylen == 16)
{ {
GetUserKey(BIG_ENDIAN_ORDER, kw, 2, key, keylen); 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); 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[0] = KL[0] ^ KR[0];
KA[1] = KL[1] ^ KR[1]; KA[1] = KL[1] ^ KR[1];
} }

17
cryptest.dsp
View File

@ -135,6 +135,7 @@ BSC32=bscmake.exe
LINK32=link.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 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 # 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 !ENDIF
@ -157,10 +158,6 @@ SOURCE=.\3wayval.dat
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\anubisv.dat
# End Source File
# Begin Source File
SOURCE=.\camellia.dat SOURCE=.\camellia.dat
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -233,10 +230,6 @@ SOURCE=.\ideaval.dat
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\khazadv.dat
# End Source File
# Begin Source File
SOURCE=.\luc1024.dat SOURCE=.\luc1024.dat
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -349,10 +342,6 @@ SOURCE=.\serpentv.dat
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\shacal1v.dat
# End Source File
# Begin Source File
SOURCE=.\shacal2v.dat SOURCE=.\shacal2v.dat
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -409,6 +398,10 @@ SOURCE=.\factory.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\fipsalgt.cpp
# End Source File
# Begin Source File
SOURCE=.\regtest.cpp SOURCE=.\regtest.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File

6
regtest.cpp
View File

@ -23,8 +23,10 @@ void RegisterFactories()
RegisterDefaultFactoryFor<SimpleKeyAgreementDomain, DH>("DH"); RegisterDefaultFactoryFor<SimpleKeyAgreementDomain, DH>("DH");
RegisterDefaultFactoryFor<HashTransformation, SHA1>("SHA-1"); RegisterDefaultFactoryFor<HashTransformation, SHA1>("SHA-1");
RegisterDefaultFactoryFor<HashTransformation, SHA256>("SHA-256"); RegisterDefaultFactoryFor<HashTransformation, SHA256>("SHA-256");
#ifdef WORD64_AVAILABLE
RegisterDefaultFactoryFor<HashTransformation, SHA384>("SHA-384"); RegisterDefaultFactoryFor<HashTransformation, SHA384>("SHA-384");
RegisterDefaultFactoryFor<HashTransformation, SHA512>("SHA-512"); RegisterDefaultFactoryFor<HashTransformation, SHA512>("SHA-512");
#endif
RegisterDefaultFactoryFor<HashTransformation, Whirlpool>("Whirlpool"); RegisterDefaultFactoryFor<HashTransformation, Whirlpool>("Whirlpool");
RegisterDefaultFactoryFor<MessageAuthenticationCode, HMAC<MD5> >("HMAC(MD5)"); RegisterDefaultFactoryFor<MessageAuthenticationCode, HMAC<MD5> >("HMAC(MD5)");
RegisterDefaultFactoryFor<MessageAuthenticationCode, HMAC<SHA1> >("HMAC(SHA-1)"); RegisterDefaultFactoryFor<MessageAuthenticationCode, HMAC<SHA1> >("HMAC(SHA-1)");
@ -41,6 +43,8 @@ void RegisterFactories()
RegisterSignatureSchemeDefaultFactories<RWSS<P1363_EMSA2, SHA1> >("RW/EMSA2(SHA-1)"); RegisterSignatureSchemeDefaultFactories<RWSS<P1363_EMSA2, SHA1> >("RW/EMSA2(SHA-1)");
RegisterSignatureSchemeDefaultFactories<RSASS<PSS, SHA1> >("RSA/PSS-MGF1(SHA-1)"); RegisterSignatureSchemeDefaultFactories<RSASS<PSS, SHA1> >("RSA/PSS-MGF1(SHA-1)");
RegisterSymmetricCipherDefaultFactories<SEAL<> >("SEAL-3.0-BE"); RegisterSymmetricCipherDefaultFactories<SEAL<> >("SEAL-3.0-BE");
RegisterSymmetricCipherDefaultFactories<ECB_Mode<Camellia> >("Camellia(ECB)");
RegisterSymmetricCipherDefaultFactories<ECB_Mode<SHACAL2> >("SHACAL-2(ECB)"); RegisterSymmetricCipherDefaultFactories<ECB_Mode<SHACAL2> >("SHACAL-2(ECB)");
#ifdef WORD64_AVAILABLE
RegisterSymmetricCipherDefaultFactories<ECB_Mode<Camellia> >("Camellia(ECB)");
#endif
} }