aboutsummaryrefslogtreecommitdiffstats
path: root/src/block/blowfish/blowfish.h
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-05-18 20:32:36 +0000
committerlloyd <[email protected]>2012-05-18 20:32:36 +0000
commitc691561f3198f481c13457433efbccc1c9fcd898 (patch)
treea45ea2c5a30e0cb009fbcb68a61ef39332ff790c /src/block/blowfish/blowfish.h
parentd76700f01c7ecac5633edf75f8d7408b46c5dbac (diff)
Fairly huge update that replaces the old secmem types with std::vector
using a custom allocator. Currently our allocator just does new/delete with a memset before deletion, and the mmap and mlock allocators have been removed.
Diffstat (limited to 'src/block/blowfish/blowfish.h')
-rw-r--r--src/block/blowfish/blowfish.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/block/blowfish/blowfish.h b/src/block/blowfish/blowfish.h
index 13706d21e..5bec4b231 100644
--- a/src/block/blowfish/blowfish.h
+++ b/src/block/blowfish/blowfish.h
@@ -39,7 +39,7 @@ class BOTAN_DLL Blowfish : public Block_Cipher_Fixed_Params<8, 1, 56>
size_t key_length,
const byte salt[16]);
- void generate_sbox(MemoryRegion<u32bit>& box,
+ void generate_sbox(secure_vector<u32bit>& box,
u32bit& L, u32bit& R,
const byte salt[16],
size_t salt_off) const;
@@ -47,8 +47,8 @@ class BOTAN_DLL Blowfish : public Block_Cipher_Fixed_Params<8, 1, 56>
static const u32bit P_INIT[18];
static const u32bit S_INIT[1024];
- SecureVector<u32bit> S;
- SecureVector<u32bit> P;
+ secure_vector<u32bit> S;
+ secure_vector<u32bit> P;
};
}