From d66be84b420fbb0afb6a22610cfd5b46b76a5150 Mon Sep 17 00:00:00 2001 From: lloyd Date: Tue, 23 Mar 2010 01:17:41 +0000 Subject: 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 P{18}; instead --- src/block/cast/cast128.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/block/cast/cast128.cpp') diff --git a/src/block/cast/cast128.cpp b/src/block/cast/cast128.cpp index 887dcf994..cabde4b4f 100644 --- a/src/block/cast/cast128.cpp +++ b/src/block/cast/cast128.cpp @@ -119,7 +119,7 @@ void CAST_128::decrypt_n(const byte in[], byte out[], u32bit blocks) const void CAST_128::key_schedule(const byte key[], u32bit length) { clear(); - SecureBuffer X; + SecureVector X; for(u32bit j = 0; j != length; ++j) X[j/4] = (X[j/4] << 8) + key[j]; @@ -144,7 +144,7 @@ void CAST_128::key_schedule(u32bit K[16], u32bit X[4]) const u32bit* X; }; - SecureBuffer Z; + SecureVector Z; ByteReader x(X), z(Z); Z[0] = X[0] ^ S5[x(13)] ^ S6[x(15)] ^ S7[x(12)] ^ S8[x(14)] ^ S7[x( 8)]; -- cgit v1.2.3