1 files changed, 14 insertions, 6 deletions

diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index 17cb74a..a740d6d 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -487,7 +487,7 @@ PwMerror PwMDoc::saveDoc(char compress, const QString *file)
                 ret = e_enc;
                 goto out_moveback;
         }
-        e = encrypt(&serialized, &currentPw, &f, cryptAlgo);
+        e = encrypt(&serialized, &currentPw, &f, cryptAlgo, hashAlgo);
         if (e == e_weakPw) {
                 printDebug("PwMDoc::saveDoc(): encrypt() failed: e_weakPw");
                 f.close();
@@ -607,7 +607,7 @@ PwMerror PwMDoc::openDoc(const QString *file, int openLocked)
                 } else
                         return e_readFile;
         }
-        ret = decrypt(&decrypted, headerLen, &currentPw, cryptAlgo, &f);
+        ret = decrypt(&decrypted, headerLen, &currentPw, cryptAlgo, dataHashType, &f);
         if (ret == e_cryptNotImpl) {
                 printDebug("PwMDoc::openDoc(): decrypt() failed: e_cryptNotImpl");
                 f.close();
@@ -1307,7 +1307,9 @@ bool PwMDoc::decompressDta(string *d, char algo)
         return false;
 }
 
-PwMerror PwMDoc::encrypt(string *d, const QString *pw, QFile *f, char algo)
+PwMerror PwMDoc::encrypt(string *d, const QString *pw, QFile *f, char algo,
+                                 char hashalgo //US BUG: pass _hashalgo because we need it in hashPassphrase
+)
 {
         PWM_ASSERT(d);
         PWM_ASSERT(pw);
@@ -1348,7 +1350,9 @@ PwMerror PwMDoc::encrypt(string *d, const QString *pw, QFile *f, char algo)
                                  d->length(),
                                  reinterpret_cast<const unsigned char *>(pw->latin1()),
                                  pw->length(),
-                                 algo);
+                                 algo,
+                                 hashalgo //US BUG: pass _hashalgo because we need it in hashPassphrase
+                                 );
                 delete [] plain;
                 if (err != e_success)
                         return e_cryptNotImpl;
@@ -1371,7 +1375,9 @@ PwMerror PwMDoc::encrypt(string *d, const QString *pw, QFile *f, char algo)
 }
 
 PwMerror PwMDoc::decrypt(string *d, unsigned int pos, const QString *pw,
-                         char algo, QFile *f)
+                         char algo, 
+                         char hashalgo, //US BUG: pass _hashalgo because we need it in hashPassphrase
+                         QFile *f)
 {
         PWM_ASSERT(d);
         PWM_ASSERT(pw);
@@ -1423,7 +1429,9 @@ PwMerror PwMDoc::decrypt(string *d, unsigned int pos, const QString *pw,
                                  cryptLen,
                                  reinterpret_cast<const unsigned char *>(pw->latin1()),
                                  pw->length(),
-                                 algo);
+                                 algo,
+                                 hashalgo //US BUG: pass _hashalgo because we need it in hashPassphrase
+);
                 if (err != e_success) {
                         delete [] encrypted;
                         delete [] decrypted;