aboutsummaryrefslogtreecommitdiffstats
path: root/src/stream
diff options
context:
space:
mode:
authorlloyd <[email protected]>2009-11-17 05:03:06 +0000
committerlloyd <[email protected]>2009-11-17 05:03:06 +0000
commit0d27bc0f8763cb6dd6307dbab7713058dee18b2c (patch)
tree5cb428e1c4475ca24f1e4a84dfdc07c7a9e91393 /src/stream
parent0753d6e2c478430d8cd1a0df8d21f68a05260300 (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/stream')
-rw-r--r--src/stream/ctr/ctr.cpp4
-rw-r--r--src/stream/ofb/ofb.cpp2
-rw-r--r--src/stream/turing/turing.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/stream/ctr/ctr.cpp b/src/stream/ctr/ctr.cpp
index 5f0880fa5..723b94f28 100644
--- a/src/stream/ctr/ctr.cpp
+++ b/src/stream/ctr/ctr.cpp
@@ -22,8 +22,8 @@ CTR_BE::CTR_BE(BlockCipher* ciph) :
{
position = 0;
- counter.create(permutation->BLOCK_SIZE * BOTAN_PARALLEL_BLOCKS_CTR);
- buffer.create(permutation->BLOCK_SIZE * BOTAN_PARALLEL_BLOCKS_CTR);
+ counter.resize(permutation->BLOCK_SIZE * BOTAN_PARALLEL_BLOCKS_CTR);
+ buffer.resize(permutation->BLOCK_SIZE * BOTAN_PARALLEL_BLOCKS_CTR);
}
/*
diff --git a/src/stream/ofb/ofb.cpp b/src/stream/ofb/ofb.cpp
index 0d12d23bd..b52617789 100644
--- a/src/stream/ofb/ofb.cpp
+++ b/src/stream/ofb/ofb.cpp
@@ -21,7 +21,7 @@ OFB::OFB(BlockCipher* ciph) :
permutation(ciph)
{
position = 0;
- buffer.create(permutation->BLOCK_SIZE);
+ buffer.resize(permutation->BLOCK_SIZE);
}
/*
diff --git a/src/stream/turing/turing.cpp b/src/stream/turing/turing.cpp
index 810f65ca4..f0dd90ab6 100644
--- a/src/stream/turing/turing.cpp
+++ b/src/stream/turing/turing.cpp
@@ -222,7 +222,7 @@ u32bit Turing::fixedS(u32bit W)
*/
void Turing::key_schedule(const byte key[], u32bit length)
{
- K.create(length / 4);
+ K.resize(length / 4);
for(u32bit j = 0; j != length; ++j)
K[j/4] = (K[j/4] << 8) + key[j];