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

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

1 files changed, 5 insertions, 1 deletions

diff --git a/src/s2k/pbkdf1/pbkdf1.h b/src/s2k/pbkdf1/pbkdf1.h
index 053a2dbe1..c0508d127 100644
--- a/src/s2k/pbkdf1/pbkdf1.h
+++ b/src/s2k/pbkdf1/pbkdf1.h
@@ -29,10 +29,14 @@ class BOTAN_DLL PKCS5_PBKDF1 : public S2K
 
       /**
       * Create a PKCS #5 instance using the specified hash function.
-      * @param hash a pointer to a hash function object to use
+      * @param hash_in pointer to a hash function object to use
       */
       PKCS5_PBKDF1(HashFunction* hash_in) : hash(hash_in) {}
 
+      /**
+      * Copy constructor
+      * @param other the object to copy
+      */
       PKCS5_PBKDF1(const PKCS5_PBKDF1& other) :
          S2K(), hash(other.hash->clone()) {}