aboutsummaryrefslogtreecommitdiffstats
path: root/src/block
diff options
context:
space:
mode:
Diffstat (limited to 'src/block')
-rw-r--r--src/block/lion/lion.cpp6
-rw-r--r--src/block/lubyrack/lubyrack.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/block/lion/lion.cpp b/src/block/lion/lion.cpp
index daf00da81..0b3e7762a 100644
--- a/src/block/lion/lion.cpp
+++ b/src/block/lion/lion.cpp
@@ -109,9 +109,9 @@ void Lion::clear()
* Lion Constructor
*/
Lion::Lion(HashFunction* hash_in, StreamCipher* sc_in, size_t block_len) :
- BlockCipher(std::max<size_t>(2*hash_in->OUTPUT_LENGTH + 1, block_len),
- 2, 2*hash_in->OUTPUT_LENGTH, 2),
- LEFT_SIZE(hash_in->OUTPUT_LENGTH),
+ BlockCipher(std::max<size_t>(2*hash_in->output_length() + 1, block_len),
+ 2, 2*hash_in->output_length(), 2),
+ LEFT_SIZE(hash_in->output_length()),
RIGHT_SIZE(BLOCK_SIZE - LEFT_SIZE),
hash(hash_in),
cipher(sc_in)
diff --git a/src/block/lubyrack/lubyrack.cpp b/src/block/lubyrack/lubyrack.cpp
index 383e9131b..ecc0fadfd 100644
--- a/src/block/lubyrack/lubyrack.cpp
+++ b/src/block/lubyrack/lubyrack.cpp
@@ -15,7 +15,7 @@ namespace Botan {
*/
void LubyRackoff::encrypt_n(const byte in[], byte out[], size_t blocks) const
{
- const size_t len = hash->OUTPUT_LENGTH;
+ const size_t len = hash->output_length();
SecureVector<byte> buffer_vec(len);
byte* buffer = &buffer_vec[0];
@@ -52,7 +52,7 @@ void LubyRackoff::encrypt_n(const byte in[], byte out[], size_t blocks) const
*/
void LubyRackoff::decrypt_n(const byte in[], byte out[], size_t blocks) const
{
- const size_t len = hash->OUTPUT_LENGTH;
+ const size_t len = hash->output_length();
SecureVector<byte> buffer_vec(len);
byte* buffer = &buffer_vec[0];
@@ -123,7 +123,7 @@ std::string LubyRackoff::name() const
* Luby-Rackoff Constructor
*/
LubyRackoff::LubyRackoff(HashFunction* h) :
- BlockCipher(2 * (h ? h->OUTPUT_LENGTH: 0),
+ BlockCipher(2 * (h ? h->output_length(): 0),
2, 32, 2),
hash(h)
{