aboutsummaryrefslogtreecommitdiffstats
path: root/src/block/misty1
diff options
context:
space:
mode:
authorlloyd <lloyd@randombit.net>2010-03-23 01:17:41 +0000
committerlloyd <lloyd@randombit.net>2010-03-23 01:17:41 +0000
commitd66be84b420fbb0afb6a22610cfd5b46b76a5150 (patch)
tree2a13c36cf1a0e51dc945fbc27da373bbed7123c1 /src/block/misty1
parentd695d7832a86c0c7f165ab8b052c59525d210966 (diff)
Remove SecureBuffer, which is the fixed-size variant of SecureVector.
Add a second template param to SecureVector which specifies the initial length. Change all callers to be SecureVector instead of SecureBuffer. This can go away in C++0x, once compilers implement N2712 ("Non-static data member initializers"), and we can just write code as SecureVector<byte> P{18}; instead
Diffstat (limited to 'src/block/misty1')
-rw-r--r--src/block/misty1/misty1.cpp2
-rw-r--r--src/block/misty1/misty1.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/block/misty1/misty1.cpp b/src/block/misty1/misty1.cpp
index 8a92824cc..9ab4d11f4 100644
--- a/src/block/misty1/misty1.cpp
+++ b/src/block/misty1/misty1.cpp
@@ -204,7 +204,7 @@ void MISTY1::decrypt_n(const byte in[], byte out[], u32bit blocks) const
*/
void MISTY1::key_schedule(const byte key[], u32bit length)
{
- SecureBuffer<u16bit, 32> KS;
+ SecureVector<u16bit, 32> KS;
for(u32bit j = 0; j != length / 2; ++j)
KS[j] = load_be<u16bit>(key, j);
diff --git a/src/block/misty1/misty1.h b/src/block/misty1/misty1.h
index 000830915..7b4d91def 100644
--- a/src/block/misty1/misty1.h
+++ b/src/block/misty1/misty1.h
@@ -29,7 +29,7 @@ class BOTAN_DLL MISTY1 : public BlockCipher
private:
void key_schedule(const byte[], u32bit);
- SecureBuffer<u16bit, 100> EK, DK;
+ SecureVector<u16bit, 100> EK, DK;
};
}