merge of 'bf0e5684d8ba5fb0a21cdcd11d26995cbb250c4a'

     and 'e30a741f6014987e9683842ede22c44b2db03c56'

1 files changed, 2 insertions, 2 deletions

diff --git a/src/s2k/pbkdf1/pbkdf1.cpp b/src/s2k/pbkdf1/pbkdf1.cpp
index 04e3aa453..fcc5b9a97 100644
--- a/src/s2k/pbkdf1/pbkdf1.cpp
+++ b/src/s2k/pbkdf1/pbkdf1.cpp
@@ -18,10 +18,10 @@ OctetString PKCS5_PBKDF1::derive(u32bit key_len,
                                  u32bit iterations) const
    {
    if(iterations == 0)
-      throw Invalid_Argument("PKCS#5 PBKDF1: Invalid iteration count");
+      throw Invalid_Argument("PKCS5_PBKDF1: Invalid iteration count");
 
    if(key_len > hash->OUTPUT_LENGTH)
-      throw Exception("PKCS#5 PBKDF1: Requested output length too long");
+      throw Invalid_Argument("PKCS5_PBKDF1: Requested output length too long");
 
    hash->update(passphrase);
    hash->update(salt, salt_size);