diff options
| author | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2007-05-05 19:03:05 +0000 |
|---|---|---|
| committer | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2007-05-05 19:03:05 +0000 |
| commit | 3c3c94bee47e9b5cd3e55bc6f8af8bf0394ed9fc (patch) | |
| tree | 6701a61dd443682898121566ec3bf8d2016e3bae | |
| parent | c6263537312a1ab21ff8bb344434b903a3f632f2 (diff) | |
| download | cryptopp-3c3c94bee47e9b5cd3e55bc6f8af8bf0394ed9fc.tar.gz | |
fix VC 6 compile
git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk@366 57ff6487-cd31-0410-9ec3-f628ee90f5f0
| -rw-r--r-- | c5/secblock.h | 4 | ||||
| -rw-r--r-- | c5/skipjack.cpp | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/c5/secblock.h b/c5/secblock.h index 6ba0656..4e082b8 100644 --- a/c5/secblock.h +++ b/c5/secblock.h @@ -71,11 +71,9 @@ typename A::pointer StandardReallocate(A& a, T *p, typename A::size_type oldSize if (preserve) { - A b; - typename A::pointer newPointer = b.allocate(newSize, NULL); + typename A::pointer newPointer = a.allocate(newSize, NULL); memcpy_s(newPointer, sizeof(T)*newSize, p, sizeof(T)*STDMIN(oldSize, newSize)); a.deallocate(p, oldSize); - std::swap(a, b); return newPointer; } else diff --git a/c5/skipjack.cpp b/c5/skipjack.cpp index 2405fab..e9ec586 100644 --- a/c5/skipjack.cpp +++ b/c5/skipjack.cpp @@ -100,7 +100,7 @@ typedef BlockGetAndPut<word16, LittleEndian> Block; */ void SKIPJACK::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const { - word w1, w2, w3, w4; + word16 w1, w2, w3, w4; Block::Get(inBlock)(w4)(w3)(w2)(w1); /* stepping rule A: */ @@ -151,7 +151,7 @@ void SKIPJACK::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock */ void SKIPJACK::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const { - word w1, w2, w3, w4; + word16 w1, w2, w3, w4; Block::Get(inBlock)(w4)(w3)(w2)(w1); /* stepping rule A: */ |