aboutsummaryrefslogtreecommitdiffstats
path: root/src/block/misty1/misty1.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/block/misty1/misty1.cpp')
-rw-r--r--src/block/misty1/misty1.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/block/misty1/misty1.cpp b/src/block/misty1/misty1.cpp
index c904c5d78..56a995b76 100644
--- a/src/block/misty1/misty1.cpp
+++ b/src/block/misty1/misty1.cpp
@@ -144,8 +144,8 @@ void MISTY1::encrypt_n(const byte in[], byte out[], size_t blocks) const
store_be(out, B2, B3, B0, B1);
- in += block_size();
- out += block_size();
+ in += BLOCK_SIZE;
+ out += BLOCK_SIZE;
}
}
@@ -194,8 +194,8 @@ void MISTY1::decrypt_n(const byte in[], byte out[], size_t blocks) const
store_be(out, B0, B1, B2, B3);
- in += block_size();
- out += block_size();
+ in += BLOCK_SIZE;
+ out += BLOCK_SIZE;
}
}
@@ -251,7 +251,9 @@ void MISTY1::key_schedule(const byte key[], size_t length)
/*
* MISTY1 Constructor
*/
-MISTY1::MISTY1(size_t rounds) : BlockCipher(8, 16), EK(100), DK(100)
+MISTY1::MISTY1(size_t rounds) :
+ BlockCipher_Fixed_Block_Size(16),
+ EK(100), DK(100)
{
if(rounds != 8)
throw Invalid_Argument("MISTY1: Invalid number of rounds: "