propagate from branch 'net.randombit.botan' (head cba32f885eb7889a9711cbee120df42839deb9d0)

            to branch 'net.randombit.botan.c++0x' (head 7cb9cdfda0f3dedab24f1d3bc7e7ea9b22164234)

2 files changed, 23 insertions, 11 deletions

diff --git a/src/block/rc5/rc5.cpp b/src/block/rc5/rc5.cpp
index ebcbaf69f..d08b44425 100644
--- a/src/block/rc5/rc5.cpp
+++ b/src/block/rc5/rc5.cpp
@@ -18,20 +18,25 @@ namespace Botan {
 */
 void RC5::encrypt_n(const byte in[], byte out[], size_t blocks) const
    {
+   const size_t rounds = (S.size() - 2) / 2;
+
    for(size_t i = 0; i != blocks; ++i)
       {
       u32bit A = load_le<u32bit>(in, 0);
       u32bit B = load_le<u32bit>(in, 1);
 
       A += S[0]; B += S[1];
-      for(size_t j = 0; j != ROUNDS; j += 4)
+      for(size_t j = 0; j != rounds; j += 4)
          {
          A = rotate_left(A ^ B, B % 32) + S[2*j+2];
          B = rotate_left(B ^ A, A % 32) + S[2*j+3];
+
          A = rotate_left(A ^ B, B % 32) + S[2*j+4];
          B = rotate_left(B ^ A, A % 32) + S[2*j+5];
+
          A = rotate_left(A ^ B, B % 32) + S[2*j+6];
          B = rotate_left(B ^ A, A % 32) + S[2*j+7];
+
          A = rotate_left(A ^ B, B % 32) + S[2*j+8];
          B = rotate_left(B ^ A, A % 32) + S[2*j+9];
          }
@@ -48,19 +53,24 @@ void RC5::encrypt_n(const byte in[], byte out[], size_t blocks) const
 */
 void RC5::decrypt_n(const byte in[], byte out[], size_t blocks) const
    {
+   const size_t rounds = (S.size() - 2) / 2;
+
    for(size_t i = 0; i != blocks; ++i)
       {
       u32bit A = load_le<u32bit>(in, 0);
       u32bit B = load_le<u32bit>(in, 1);
 
-      for(size_t j = ROUNDS; j != 0; j -= 4)
+      for(size_t j = rounds; j != 0; j -= 4)
          {
          B = rotate_right(B - S[2*j+1], A % 32) ^ A;
          A = rotate_right(A - S[2*j  ], B % 32) ^ B;
+
          B = rotate_right(B - S[2*j-1], A % 32) ^ A;
          A = rotate_right(A - S[2*j-2], B % 32) ^ B;
+
          B = rotate_right(B - S[2*j-3], A % 32) ^ A;
          A = rotate_right(A - S[2*j-4], B % 32) ^ B;
+
          B = rotate_right(B - S[2*j-5], A % 32) ^ A;
          A = rotate_right(A - S[2*j-6], B % 32) ^ B;
          }
@@ -106,19 +116,19 @@ void RC5::key_schedule(const byte key[], size_t length)
 */
 std::string RC5::name() const
    {
-   return "RC5(" + std::to_string(ROUNDS) + ")";
+   return "RC5(" + std::to_string(get_rounds()) + ")";
    }
 
 /*
 * RC5 Constructor
 */
-RC5::RC5(size_t r) :
-   BlockCipher_Fixed_Block_Size(1, 32),
-   ROUNDS(r)
+RC5::RC5(size_t rounds) : BlockCipher_Fixed_Block_Size(1, 32)
    {
-   if(ROUNDS < 8 || ROUNDS > 32 || (ROUNDS % 4 != 0))
-      throw Invalid_Argument(name() + ": Invalid number of rounds");
-   S.resize(2*ROUNDS + 2);
+   if(rounds < 8 || rounds > 32 || (rounds % 4 != 0))
+      throw Invalid_Argument("RC5: Invalid number of rounds " +
+                             std::to_string(rounds));
+
+   S.resize(2*rounds + 2);
    }
 
 }
diff --git a/src/block/rc5/rc5.h b/src/block/rc5/rc5.h
index a9f3b5b0e..cb282af4e 100644
--- a/src/block/rc5/rc5.h
+++ b/src/block/rc5/rc5.h
@@ -23,7 +23,7 @@ class BOTAN_DLL RC5 : public BlockCipher_Fixed_Block_Size<8>
 
       void clear() { zeroise(S); }
       std::string name() const;
-      BlockCipher* clone() const { return new RC5(ROUNDS); }
+      BlockCipher* clone() const { return new RC5(get_rounds()); }
 
       /**
       * @param rounds the number of RC5 rounds to run. Must be between
@@ -31,9 +31,11 @@ class BOTAN_DLL RC5 : public BlockCipher_Fixed_Block_Size<8>
       */
       RC5(size_t rounds);
    private:
+      size_t get_rounds() const { return (S.size() - 2) / 2; }
+
       void key_schedule(const byte[], size_t);
+
       SecureVector<u32bit> S;
-      const size_t ROUNDS;
    };
 
 }