diff options
| author | weidai <weidai11@users.noreply.github.com> | 2009-03-02 02:39:17 +0000 |
|---|---|---|
| committer | weidai <weidai11@users.noreply.github.com> | 2009-03-02 02:39:17 +0000 |
| commit | d8a644fc4ee2af9dc62f2a8c167b023d0c71d13b (patch) | |
| tree | 0fecaa7a6728d07549a41864ea2cedfb245f0bd3 /fipstest.cpp | |
| parent | fa25129ac981ceed9569496c02b83771b394fa40 (diff) | |
| download | cryptopp-git-d8a644fc4ee2af9dc62f2a8c167b023d0c71d13b.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
Diffstat (limited to 'fipstest.cpp')
| -rw-r--r-- | fipstest.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fipstest.cpp b/fipstest.cpp index 3298a400..9a6c5607 100644 --- a/fipstest.cpp +++ b/fipstest.cpp @@ -399,7 +399,7 @@ bool IntegrityCheckModule(const char *moduleFilename, const byte *expectedModule #ifdef CRYPTOPP_WIN32_AVAILABLE // if that fails (could be caused by debug breakpoints or DLL base relocation modifying image in memory), // hash from disk instead - if (memcmp(expectedModuleMac, actualMac, macSize) != 0) + if (!VerifyBufsEqual(expectedModuleMac, actualMac, macSize)) { OutputDebugString("In memory integrity check failed. This may be caused by debug breakpoints or DLL relocation.\n"); moduleStream.clear(); @@ -414,7 +414,7 @@ bool IntegrityCheckModule(const char *moduleFilename, const byte *expectedModule } #endif - if (memcmp(expectedModuleMac, actualMac, macSize) == 0) + if (VerifyBufsEqual(expectedModuleMac, actualMac, macSize)) return true; #ifdef CRYPTOPP_WIN32_AVAILABLE @@ -499,7 +499,6 @@ void DoPowerUpSelfTest(const char *moduleFilename, const byte *expectedModuleMac "abc", "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad"); -#ifdef WORD64_AVAILABLE SecureHashKnownAnswerTest<SHA384>( "abc", "cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7"); @@ -507,7 +506,6 @@ void DoPowerUpSelfTest(const char *moduleFilename, const byte *expectedModuleMac SecureHashKnownAnswerTest<SHA512>( "abc", "ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f"); -#endif MAC_KnownAnswerTest<HMAC<SHA1> >( "303132333435363738393a3b3c3d3e3f40414243", |