aboutsummaryrefslogtreecommitdiffstats
path: root/src/stream/ctr
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-05-25 14:44:27 +0000
committerlloyd <[email protected]>2010-05-25 14:44:27 +0000
commit432bcf59badb8f6271146772ccbc1649822c25cb (patch)
tree1353fa7ea1807be29e9e70237ad90014a36119d2 /src/stream/ctr
parent211d835a356f55e037ff8035017d79c458f13615 (diff)
Change BlockCipher::parallelism() to return the native parallelism of
the implementation rather than the preferred one. Update all implementations. Add a new function parallel_bytes() which returns parallelism() * BLOCK_SIZE * BUILD_TIME_CONSTANT This is because i noticed all current calls of parallelism() just multiplied the result by the block size already, so this simplified that code. The build time constant is set to 4, which was the previous default return value of parallelism(). However the SIMD versions returned 2*native paralellism rather than 4*, so this increases the buffer sizes used for those algorithms. The constant multiple lives in buildh.in and build.h, and is named BOTAN_BLOCK_CIPHER_PAR_MULT.
Diffstat (limited to 'src/stream/ctr')
-rw-r--r--src/stream/ctr/ctr.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/stream/ctr/ctr.cpp b/src/stream/ctr/ctr.cpp
index 421c9f0c0..8a24cd4d0 100644
--- a/src/stream/ctr/ctr.cpp
+++ b/src/stream/ctr/ctr.cpp
@@ -22,7 +22,7 @@ CTR_BE::CTR_BE(BlockCipher* ciph) :
{
position = 0;
- counter.resize(permutation->BLOCK_SIZE * permutation->parallelism());
+ counter.resize(permutation->parallel_bytes());
buffer.resize(counter.size());
}