diff options
author | lloyd <[email protected]> | 2010-10-29 13:51:27 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2010-10-29 13:51:27 +0000 |
commit | 633175a57a03ed9bf5a5e3577bfc26068c62b688 (patch) | |
tree | 086eb3a931d39fb35f8a3896a25a5cb38736a696 /src/hash/comb4p | |
parent | df0dfeb904485bacb8034d0468b4498130939acc (diff) |
Remove BufferedComputation::OUTPUT_LENGTH
Diffstat (limited to 'src/hash/comb4p')
-rw-r--r-- | src/hash/comb4p/comb4p.cpp | 1 | ||||
-rw-r--r-- | src/hash/comb4p/comb4p.h | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/hash/comb4p/comb4p.cpp b/src/hash/comb4p/comb4p.cpp index 19e23879f..1ea64a5cb 100644 --- a/src/hash/comb4p/comb4p.cpp +++ b/src/hash/comb4p/comb4p.cpp @@ -35,7 +35,6 @@ void comb4p_round(MemoryRegion<byte>& out, } Comb4P::Comb4P(HashFunction* h1, HashFunction* h2) : - HashFunction(h1->output_length() + h2->output_length()), hash1(h1), hash2(h2) { if(hash1->name() == hash2->name()) diff --git a/src/hash/comb4p/comb4p.h b/src/hash/comb4p/comb4p.h index 67547f979..73e06c379 100644 --- a/src/hash/comb4p/comb4p.h +++ b/src/hash/comb4p/comb4p.h @@ -29,6 +29,11 @@ class BOTAN_DLL Comb4P : public HashFunction size_t hash_block_size() const; + size_t output_length() const + { + return hash1->output_length() + hash2->output_length(); + } + HashFunction* clone() const { return new Comb4P(hash1->clone(), hash2->clone()); |