diff options
Diffstat (limited to 'src/hash')
-rw-r--r-- | src/hash/bmw/bmw_512.h | 4 | ||||
-rw-r--r-- | src/hash/fork256/fork256.h | 4 | ||||
-rw-r--r-- | src/hash/gost_3411/gost_3411.cpp | 4 | ||||
-rw-r--r-- | src/hash/gost_3411/gost_3411.h | 6 | ||||
-rw-r--r-- | src/hash/has160/has160.h | 4 | ||||
-rw-r--r-- | src/hash/md2/md2.h | 4 | ||||
-rw-r--r-- | src/hash/md4/md4.h | 4 | ||||
-rw-r--r-- | src/hash/md5/md5.h | 4 | ||||
-rw-r--r-- | src/hash/rmd128/rmd128.h | 4 | ||||
-rw-r--r-- | src/hash/rmd160/rmd160.h | 4 | ||||
-rw-r--r-- | src/hash/sha1/sha160.h | 2 | ||||
-rw-r--r-- | src/hash/sha2/sha2_32.h | 4 | ||||
-rw-r--r-- | src/hash/sha2/sha2_64.h | 4 | ||||
-rw-r--r-- | src/hash/skein/skein_512.cpp | 2 | ||||
-rw-r--r-- | src/hash/skein/skein_512.h | 6 | ||||
-rw-r--r-- | src/hash/tiger/tiger.h | 4 | ||||
-rw-r--r-- | src/hash/whirlpool/whrlpool.h | 2 |
17 files changed, 33 insertions, 33 deletions
diff --git a/src/hash/bmw/bmw_512.h b/src/hash/bmw/bmw_512.h index 8130a88e4..c1c5238bd 100644 --- a/src/hash/bmw/bmw_512.h +++ b/src/hash/bmw/bmw_512.h @@ -23,8 +23,8 @@ class BOTAN_DLL BMW_512 : public MDx_HashFunction void compress_n(const byte input[], u32bit blocks); void copy_out(byte output[]); - SecureBuffer<u64bit, 16> H, M; - SecureBuffer<u64bit, 32> Q; + SecureVector<u64bit, 16> H, M; + SecureVector<u64bit, 32> Q; }; } diff --git a/src/hash/fork256/fork256.h b/src/hash/fork256/fork256.h index f535370e6..ed945b9d8 100644 --- a/src/hash/fork256/fork256.h +++ b/src/hash/fork256/fork256.h @@ -26,8 +26,8 @@ class BOTAN_DLL FORK_256 : public MDx_HashFunction void compress_n(const byte[], u32bit blocks); void copy_out(byte[]); - SecureBuffer<u32bit, 8> digest; - SecureBuffer<u32bit, 16> M; + SecureVector<u32bit, 8> digest; + SecureVector<u32bit, 16> M; }; } diff --git a/src/hash/gost_3411/gost_3411.cpp b/src/hash/gost_3411/gost_3411.cpp index 244a3fddf..f09b0fc60 100644 --- a/src/hash/gost_3411/gost_3411.cpp +++ b/src/hash/gost_3411/gost_3411.cpp @@ -223,11 +223,11 @@ void GOST_34_11::final_result(byte out[]) compress_n(buffer, 1); } - SecureBuffer<byte, 32> length_buf; + SecureVector<byte, 32> length_buf; const u64bit bit_count = count * 8; store_le(bit_count, length_buf); - SecureBuffer<byte, 32> sum_buf(sum); + SecureVector<byte, 32> sum_buf(sum); compress_n(length_buf, 1); compress_n(sum_buf, 1); diff --git a/src/hash/gost_3411/gost_3411.h b/src/hash/gost_3411/gost_3411.h index 7b17bdc1f..d2bada7ab 100644 --- a/src/hash/gost_3411/gost_3411.h +++ b/src/hash/gost_3411/gost_3411.h @@ -31,9 +31,9 @@ class BOTAN_DLL GOST_34_11 : public HashFunction void final_result(byte[]); GOST_28147_89 cipher; - SecureBuffer<byte, 32> buffer; - SecureBuffer<byte, 32> sum; - SecureBuffer<byte, 32> hash; + SecureVector<byte, 32> buffer; + SecureVector<byte, 32> sum; + SecureVector<byte, 32> hash; u64bit count; u32bit position; }; diff --git a/src/hash/has160/has160.h b/src/hash/has160/has160.h index cae66c93a..210145484 100644 --- a/src/hash/has160/has160.h +++ b/src/hash/has160/has160.h @@ -26,8 +26,8 @@ class BOTAN_DLL HAS_160 : public MDx_HashFunction void compress_n(const byte[], u32bit blocks); void copy_out(byte[]); - SecureBuffer<u32bit, 20> X; - SecureBuffer<u32bit, 5> digest; + SecureVector<u32bit, 20> X; + SecureVector<u32bit, 5> digest; }; } diff --git a/src/hash/md2/md2.h b/src/hash/md2/md2.h index 0a7125759..df056dc12 100644 --- a/src/hash/md2/md2.h +++ b/src/hash/md2/md2.h @@ -27,8 +27,8 @@ class BOTAN_DLL MD2 : public HashFunction void hash(const byte[]); void final_result(byte[]); - SecureBuffer<byte, 48> X; - SecureBuffer<byte, 16> checksum, buffer; + SecureVector<byte, 48> X; + SecureVector<byte, 16> checksum, buffer; u32bit position; }; diff --git a/src/hash/md4/md4.h b/src/hash/md4/md4.h index 0bff5a4ce..843727f6d 100644 --- a/src/hash/md4/md4.h +++ b/src/hash/md4/md4.h @@ -27,8 +27,8 @@ class BOTAN_DLL MD4 : public MDx_HashFunction void hash_old(const byte[]); void copy_out(byte[]); - SecureBuffer<u32bit, 16> M; - SecureBuffer<u32bit, 4> digest; + SecureVector<u32bit, 16> M; + SecureVector<u32bit, 4> digest; }; } diff --git a/src/hash/md5/md5.h b/src/hash/md5/md5.h index 456a02c28..d1f294a87 100644 --- a/src/hash/md5/md5.h +++ b/src/hash/md5/md5.h @@ -26,8 +26,8 @@ class BOTAN_DLL MD5 : public MDx_HashFunction void compress_n(const byte[], u32bit blocks); void copy_out(byte[]); - SecureBuffer<u32bit, 16> M; - SecureBuffer<u32bit, 4> digest; + SecureVector<u32bit, 16> M; + SecureVector<u32bit, 4> digest; }; } diff --git a/src/hash/rmd128/rmd128.h b/src/hash/rmd128/rmd128.h index d9cb4ebb4..9ae43483c 100644 --- a/src/hash/rmd128/rmd128.h +++ b/src/hash/rmd128/rmd128.h @@ -26,8 +26,8 @@ class BOTAN_DLL RIPEMD_128 : public MDx_HashFunction void compress_n(const byte[], u32bit blocks); void copy_out(byte[]); - SecureBuffer<u32bit, 16> M; - SecureBuffer<u32bit, 4> digest; + SecureVector<u32bit, 16> M; + SecureVector<u32bit, 4> digest; }; } diff --git a/src/hash/rmd160/rmd160.h b/src/hash/rmd160/rmd160.h index aee007b98..399d5a7c3 100644 --- a/src/hash/rmd160/rmd160.h +++ b/src/hash/rmd160/rmd160.h @@ -26,8 +26,8 @@ class BOTAN_DLL RIPEMD_160 : public MDx_HashFunction void compress_n(const byte[], u32bit blocks); void copy_out(byte[]); - SecureBuffer<u32bit, 16> M; - SecureBuffer<u32bit, 5> digest; + SecureVector<u32bit, 16> M; + SecureVector<u32bit, 5> digest; }; } diff --git a/src/hash/sha1/sha160.h b/src/hash/sha1/sha160.h index 142c6bf17..cb7e63821 100644 --- a/src/hash/sha1/sha160.h +++ b/src/hash/sha1/sha160.h @@ -29,7 +29,7 @@ class BOTAN_DLL SHA_160 : public MDx_HashFunction void compress_n(const byte[], u32bit blocks); void copy_out(byte[]); - SecureBuffer<u32bit, 5> digest; + SecureVector<u32bit, 5> digest; SecureVector<u32bit> W; }; diff --git a/src/hash/sha2/sha2_32.h b/src/hash/sha2/sha2_32.h index 313eec676..e157fd657 100644 --- a/src/hash/sha2/sha2_32.h +++ b/src/hash/sha2/sha2_32.h @@ -23,8 +23,8 @@ class BOTAN_DLL SHA_224_256_BASE : public MDx_HashFunction SHA_224_256_BASE(u32bit out) : MDx_HashFunction(out, 64, true, true) { clear(); } - SecureBuffer<u32bit, 64> W; - SecureBuffer<u32bit, 8> digest; + SecureVector<u32bit, 64> W; + SecureVector<u32bit, 8> digest; private: void compress_n(const byte[], u32bit blocks); void copy_out(byte[]); diff --git a/src/hash/sha2/sha2_64.h b/src/hash/sha2/sha2_64.h index 8e4d171f8..ed261b1c2 100644 --- a/src/hash/sha2/sha2_64.h +++ b/src/hash/sha2/sha2_64.h @@ -23,12 +23,12 @@ class BOTAN_DLL SHA_384_512_BASE : public MDx_HashFunction SHA_384_512_BASE(u32bit out) : MDx_HashFunction(out, 128, true, true, 16) {} - SecureBuffer<u64bit, 8> digest; + SecureVector<u64bit, 8> digest; private: void compress_n(const byte[], u32bit blocks); void copy_out(byte[]); - SecureBuffer<u64bit, 80> W; + SecureVector<u64bit, 80> W; }; /* diff --git a/src/hash/skein/skein_512.cpp b/src/hash/skein/skein_512.cpp index cb4b7a7a2..3b716e8f5 100644 --- a/src/hash/skein/skein_512.cpp +++ b/src/hash/skein/skein_512.cpp @@ -234,7 +234,7 @@ void Skein_512::final_result(byte out[]) u32bit out_bytes = output_bits / 8; - SecureBuffer<u64bit, 9> H_out; + SecureVector<u64bit, 9> H_out; while(out_bytes) { diff --git a/src/hash/skein/skein_512.h b/src/hash/skein/skein_512.h index db8d3c8b7..222db5d68 100644 --- a/src/hash/skein/skein_512.h +++ b/src/hash/skein/skein_512.h @@ -29,10 +29,10 @@ class BOTAN_DLL Skein_512 : public HashFunction std::string personalization; u32bit output_bits; - SecureBuffer<u64bit, 9> H; - SecureBuffer<u64bit, 3> T; + SecureVector<u64bit, 9> H; + SecureVector<u64bit, 3> T; - SecureBuffer<byte, 64> buffer; + SecureVector<byte, 64> buffer; u32bit buf_pos; }; diff --git a/src/hash/tiger/tiger.h b/src/hash/tiger/tiger.h index 20dcf99ff..918e2de3c 100644 --- a/src/hash/tiger/tiger.h +++ b/src/hash/tiger/tiger.h @@ -33,8 +33,8 @@ class BOTAN_DLL Tiger : public MDx_HashFunction static const u64bit SBOX3[256]; static const u64bit SBOX4[256]; - SecureBuffer<u64bit, 8> X; - SecureBuffer<u64bit, 3> digest; + SecureVector<u64bit, 8> X; + SecureVector<u64bit, 3> digest; const u32bit PASS; }; diff --git a/src/hash/whirlpool/whrlpool.h b/src/hash/whirlpool/whrlpool.h index 34b4d2302..4711fafa3 100644 --- a/src/hash/whirlpool/whrlpool.h +++ b/src/hash/whirlpool/whrlpool.h @@ -34,7 +34,7 @@ class BOTAN_DLL Whirlpool : public MDx_HashFunction static const u64bit C5[256]; static const u64bit C6[256]; static const u64bit C7[256]; - SecureBuffer<u64bit, 8> M, digest; + SecureVector<u64bit, 8> M, digest; }; } |