diff options
author | lloyd <[email protected]> | 2009-11-17 05:03:06 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2009-11-17 05:03:06 +0000 |
commit | 0d27bc0f8763cb6dd6307dbab7713058dee18b2c (patch) | |
tree | 5cb428e1c4475ca24f1e4a84dfdc07c7a9e91393 /src/block | |
parent | 0753d6e2c478430d8cd1a0df8d21f68a05260300 (diff) |
Rename/remove some secmem member variables for better matching with STL
containers (specifically vector).
Rename is_empty to empty
Remove has_items
Rename create to resize
Diffstat (limited to 'src/block')
-rw-r--r-- | src/block/lion/lion.cpp | 4 | ||||
-rw-r--r-- | src/block/rc5/rc5.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/block/lion/lion.cpp b/src/block/lion/lion.cpp index e71091258..d8822b9f2 100644 --- a/src/block/lion/lion.cpp +++ b/src/block/lion/lion.cpp @@ -119,8 +119,8 @@ Lion::Lion(HashFunction* hash_in, StreamCipher* sc_in, u32bit block_len) : if(!cipher->valid_keylength(LEFT_SIZE)) throw Exception(name() + ": This stream/hash combination is invalid"); - key1.create(LEFT_SIZE); - key2.create(LEFT_SIZE); + key1.resize(LEFT_SIZE); + key2.resize(LEFT_SIZE); } } diff --git a/src/block/rc5/rc5.cpp b/src/block/rc5/rc5.cpp index 4bfa27ea0..0bd596b10 100644 --- a/src/block/rc5/rc5.cpp +++ b/src/block/rc5/rc5.cpp @@ -109,7 +109,7 @@ RC5::RC5(u32bit r) : BlockCipher(8, 1, 32), ROUNDS(r) { if(ROUNDS < 8 || ROUNDS > 32 || (ROUNDS % 4 != 0)) throw Invalid_Argument(name() + ": Invalid number of rounds"); - S.create(2*ROUNDS + 2); + S.resize(2*ROUNDS + 2); } } |