propagate from branch 'net.randombit.botan' (head 294e2082ce9231d6165276e2f2a4153a0116aca3)

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

1 files changed, 6 insertions, 2 deletions

diff --git a/src/block/misty1/misty1.h b/src/block/misty1/misty1.h
index 7b4d91def..a9bc12c7b 100644
--- a/src/block/misty1/misty1.h
+++ b/src/block/misty1/misty1.h
@@ -1,4 +1,4 @@
-/**
+/*
 * MISTY1
 * (C) 1999-2008 Jack Lloyd
 *
@@ -25,7 +25,11 @@ class BOTAN_DLL MISTY1 : public BlockCipher
       std::string name() const { return "MISTY1"; }
       BlockCipher* clone() const { return new MISTY1; }
 
-      MISTY1(u32bit = 8);
+      /**
+      * @param rounds the number of rounds. Must be 8 with the current
+      * implementation
+      */
+      MISTY1(u32bit rounds = 8);
    private:
       void key_schedule(const byte[], u32bit);