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

change default FIPS RNG to use AES instead of DES_EDE

pull/2/head
weidai 2007-05-04 15:31:46 +00:00
parent a786529072
commit 7a18924f02
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlltest.cpp
View File

@ -93,7 +93,7 @@ void FIPS140_SampleApplication()
// create auto-seeded X9.17 RNG object, if available // create auto-seeded X9.17 RNG object, if available
#ifdef OS_RNG_AVAILABLE #ifdef OS_RNG_AVAILABLE
AutoSeededX917RNG<DES_EDE3> rng; AutoSeededX917RNG<AES> rng;
#else #else
// this is used to allow this function to compile on platforms that don't have auto-seeded RNGs // this is used to allow this function to compile on platforms that don't have auto-seeded RNGs
RandomNumberGenerator &rng(NullRNG()); RandomNumberGenerator &rng(NullRNG());

2
fipsalgt.cpp
View File

@ -1200,7 +1200,7 @@ protected:
Map2 m_data2; Map2 m_data2;
int m_count; int m_count;
AutoSeededX917RNG<DES_EDE3> m_rng; AutoSeededX917RNG<AES> m_rng;
std::vector<unsigned int> m_compactString; std::vector<unsigned int> m_compactString;
}; };

18
fipstest.cpp
View File

@ -21,6 +21,8 @@ extern "C" {_CRTIMP void __cdecl _CRT_DEBUGGER_HOOK(int);}
#endif #endif
#endif #endif
#include <iostream>
NAMESPACE_BEGIN(CryptoPP) NAMESPACE_BEGIN(CryptoPP)
extern PowerUpSelfTestStatus g_powerUpSelfTestStatus; extern PowerUpSelfTestStatus g_powerUpSelfTestStatus;
@ -153,7 +155,7 @@ template <class SCHEME>
void SignatureKnownAnswerTest(const char *key, const char *message, const char *signature, SCHEME *dummy = NULL) void SignatureKnownAnswerTest(const char *key, const char *message, const char *signature, SCHEME *dummy = NULL)
{ {
#ifdef OS_RNG_AVAILABLE #ifdef OS_RNG_AVAILABLE
AutoSeededX917RNG<DES_EDE3> rng; DefaultAutoSeededRNG rng;
#else #else
RandomNumberGenerator &rng = NullRNG(); RandomNumberGenerator &rng = NullRNG();
#endif #endif
@ -179,7 +181,7 @@ void EncryptionPairwiseConsistencyTest(const PK_Encryptor &encryptor, const PK_D
try try
{ {
#ifdef OS_RNG_AVAILABLE #ifdef OS_RNG_AVAILABLE
AutoSeededX917RNG<DES_EDE3> rng; DefaultAutoSeededRNG rng;
#else #else
RandomNumberGenerator &rng = NullRNG(); RandomNumberGenerator &rng = NullRNG();
#endif #endif
@ -219,7 +221,7 @@ void SignaturePairwiseConsistencyTest(const PK_Signer &signer, const PK_Verifier
try try
{ {
#ifdef OS_RNG_AVAILABLE #ifdef OS_RNG_AVAILABLE
AutoSeededX917RNG<DES_EDE3> rng; DefaultAutoSeededRNG rng;
#else #else
RandomNumberGenerator &rng = NullRNG(); RandomNumberGenerator &rng = NullRNG();
#endif #endif
@ -438,11 +440,11 @@ void DoPowerUpSelfTest(const char *moduleFilename, const byte *expectedModuleMac
// algorithm tests // algorithm tests
X917RNG_KnownAnswerTest<DES_EDE3>( X917RNG_KnownAnswerTest<AES>(
"48851090B4992453E83CDA86416534E53EA2FCE1A0B3A40C", // key "2b7e151628aed2a6abf7158809cf4f3c", // key
"7D00BD0A79F6B0F5", // seed "000102030405060708090a0b0c0d0e0f", // seed
"0000000000000001", // time vector "00000000000000000000000000000001", // time vector
"fdc31a6dd6b43aca81dfe8a696a2f9cf661955a44124a05033b7fff71b5b0341"); // output "D176EDD27493B0395F4D10546232B0693DC7061C03C3A554F09CECF6F6B46D945A"); // output
SymmetricEncryptionKnownAnswerTest<DES_EDE3>( SymmetricEncryptionKnownAnswerTest<DES_EDE3>(
"385D7189A5C3D485E1370AA5D408082B5CCCCB5E19F2D90E", "385D7189A5C3D485E1370AA5D408082B5CCCCB5E19F2D90E",