Fixed nasty PwM/Pi file reading bug, when

the used hash algo of file is different then the global
hash algo.
CVS ----------------------------------------------------------------------

4 files changed, 46 insertions, 19 deletions

diff --git a/pwmanager/pwmanager/libgcryptif.cpp b/pwmanager/pwmanager/libgcryptif.cpp
index ff94bf6..15f6cef 100644
--- a/pwmanager/pwmanager/libgcryptif.cpp
+++ b/pwmanager/pwmanager/libgcryptif.cpp
@@ -40,9 +40,11 @@ PwMerror LibGCryptIf::encrypt(unsigned char **outBuf,
                               unsigned char *inBuf,
                               size_t inBufLen,
                               const unsigned char *key,
                               size_t keylen,
-                              char _algo)
+                              char _algo,
+                              char _hashalgo //US BUG: pass _hashalgo because we need it in hashPassphrase
+                              )
 {
         PwMerror ret = e_success;
         gcry_error_t err;
         gcry_cipher_hd_t handle;
@@ -104,9 +106,9 @@ PwMerror LibGCryptIf::encrypt(unsigned char **outBuf,
                 goto out;
         }
         // hash the "key" to a fixed size hash matching "cipherKeylen"
         hashedKey = new unsigned char[cipherKeylen];
-        hashPassphrase(key, keylen, salt, hashedKey, cipherKeylen, true);
+        hashPassphrase(key, keylen, salt, hashedKey, cipherKeylen, true, _hashalgo);
         // so now set the hashed key
         err = gcry_cipher_setkey(handle, hashedKey, cipherKeylen);
         if (err != GPG_ERR_NO_ERROR) {
                 printDebug(string("LibGCryptIf::doEncrypt(): gcry_cipher_setkey() failed: ")
@@ -151,9 +153,11 @@ PwMerror LibGCryptIf::decrypt(unsigned char **outBuf,
                               const unsigned char *inBuf,
                               size_t inBufLen,
                               const unsigned char *key,
                               size_t keylen,
-                              char _algo)
+                              char _algo,
+                              char _hashalgo //US BUG: pass _hashalgo because we need it in hashPassphrase
+)
 {
         PwMerror ret = e_success;
         gcry_error_t err;
         gcry_cipher_hd_t handle;
@@ -200,9 +204,9 @@ PwMerror LibGCryptIf::decrypt(unsigned char **outBuf,
                 goto out;
         }
         // hash the "key" to a fixed size hash matching "cipherKeylen"
         hashedKey = new unsigned char[cipherKeylen];
-        hashPassphrase(key, keylen, salt, hashedKey, cipherKeylen, false);
+        hashPassphrase(key, keylen, salt, hashedKey, cipherKeylen, false, _hashalgo);
         // so now set the hashed key
         err = gcry_cipher_setkey(handle, hashedKey, cipherKeylen);
         if (err != GPG_ERR_NO_ERROR) {
                 printDebug(string("LibGCryptIf::doDecrypt(): gcry_cipher_setkey() failed: ")
@@ -313,17 +317,22 @@ bool LibGCryptIf::hashPassphrase(const unsigned char *pw,
                                  size_t pwlen,
                                  unsigned char *salt,
                                  unsigned char *key,
                                  size_t keylen,
-                                 bool create)
+                                 bool create,
+                                 char _hashalgo //US BUG: pass _hashalgo because we need it in hashPassphrase
+)
 {
         DEK dek;
         STRING2KEY s2k;
         bool ret;
 
         dek.keylen = keylen;
         s2k.mode = 1;
-        s2k.hash_algo = mapHashId(conf()->confGlobHashAlgo());
+        //US bug: do not use the global hash algo here. Use the passed ago instead. The hashalgo stored in the file can
+        // be different from the one in the configuration.
+        s2k.hash_algo = mapHashId(_hashalgo //conf()->confGlobHashAlgo()
+                                  );
         s2k.count = 0;
         if (!create)
                 memcpy(s2k.salt, salt, STRING2KEY_SALTLEN);
         ret = doHashPassphrase(&dek,
@@ -438,17 +447,17 @@ void LibGCryptIf::unpadData(const unsigned char *buf,
         size_t pos;
         BUG_ON(*bufLen % 8);
         pos = *bufLen - 1;
         while (buf[pos] != static_cast<char>(0x01)) {
-        qDebug("pos %d %d %d", pos, buf[pos],   static_cast<char>(0x01)     );
+          //qDebug("pos %d %d %d", pos, buf[pos],   static_cast<char>(0x01)     );
                 BUG_ON(!pos);
         //LR BUG we should terminte the loop if p == 0
         if ( pos == 0 )
             break;
                 --pos;
         }
         *bufLen = pos;
-    qDebug("ente ");
+        //qDebug("ente ");
 }
 
 #endif // CONFIG_PWMANAGER_GCRY
 
diff --git a/pwmanager/pwmanager/libgcryptif.h b/pwmanager/pwmanager/libgcryptif.h
index 1a7b658..9a987a2 100644
--- a/pwmanager/pwmanager/libgcryptif.h
+++ b/pwmanager/pwmanager/libgcryptif.h
@@ -72,9 +72,11 @@ public:
                          unsigned char *inBuf,
                          size_t inBufLen,
                          const unsigned char *key,
                          size_t keylen,
-                         char _algo);
+                         char _algo,
+                         char _hashalgo //US BUG: pass _hashalgo because we need it in hashPassphrase
+);
         /** decrypt data. _algo is the PWM_CRYPT_* ID
           * of the algorithm.
           */
         PwMerror decrypt(unsigned char **outBuf,
@@ -82,9 +84,11 @@ public:
                          const unsigned char *inBuf,
                          size_t inBufLen,
                          const unsigned char *key,
                          size_t keylen,
-                         char _algo);
+                         char _algo,
+                         char _hashalgo //US BUG: pass _hashalgo because we need it in hashPassphrase
+);
         /** hash data. _algo is the PWM_HASH_* ID of the hash */
         PwMerror hash(unsigned char **outBuf,
                       size_t *outBufLen,
                       const unsigned char *inBuf,
@@ -123,9 +127,11 @@ protected:
                             size_t pwlen,
                             unsigned char *salt,
                             unsigned char *key,
                             size_t keylen,
-                            bool create);
+                            bool create, 
+                         char _hashalgo //US BUG: pass _hashalgo because we need it in hashPassphrase
+);
         /** hash a passphrase to a cipher key */
         bool doHashPassphrase(DEK *dek,
                               const unsigned char *pw,
                               size_t pwlen,
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
@@ -486,9 +486,9 @@ PwMerror PwMDoc::saveDoc(char compress, const QString *file)
                 f.close();
                 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();
                 ret = e_weakPw;
@@ -606,9 +606,9 @@ PwMerror PwMDoc::openDoc(const QString *file, int openLocked)
                         return ret;
                 } 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();
                 return e_cryptNotImpl;
@@ -1306,9 +1306,11 @@ 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);
         PWM_ASSERT(f);
@@ -1347,9 +1349,11 @@ PwMerror PwMDoc::encrypt(string *d, const QString *pw, QFile *f, char algo)
                                  plain,
                                  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;
                 break;
@@ -1370,9 +1374,11 @@ PwMerror PwMDoc::encrypt(string *d, const QString *pw, QFile *f, char algo)
         return e_success;
 }
 
 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);
         PWM_ASSERT(f);
@@ -1422,9 +1428,11 @@ PwMerror PwMDoc::decrypt(string *d, unsigned int pos, const QString *pw,
                                  encrypted,
                                  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;
                         return e_cryptNotImpl;
diff --git a/pwmanager/pwmanager/pwmdoc.h b/pwmanager/pwmanager/pwmdoc.h
index 138dd3d..9fcdda7 100644
--- a/pwmanager/pwmanager/pwmdoc.h
+++ b/pwmanager/pwmanager/pwmdoc.h
@@ -735,11 +735,15 @@ protected:
                              string *dataHash, QFile *f);
         /** check the data-hash */
         PwMerror checkDataHash(char dataHashType, const string *dataHash, const string *dataStream);
         /** encrypt data "d" and write to "filename" */
-        PwMerror encrypt(string *d, const QString *pw, QFile *f, char algo);
+        PwMerror encrypt(string *d, const QString *pw, QFile *f, char algo,
+                                 char _hashalgo //US BUG: pass _hashalgo because we need it in hashPassphrase
+);
         /** read data from file beginning at "pos", decrypt and return it */
-        PwMerror decrypt(string *d, unsigned int pos, const QString *pw, char algo, QFile *f);
+        PwMerror decrypt(string *d, unsigned int pos, const QString *pw, char algo, 
+                 char _hashalgo, //US BUG: pass _hashalgo because we need it in hashPassphrase
+QFile *f);
         /** compress the data */
         bool compressDta(string *d, char algo);
         /** uncompress the data */
         bool decompressDta(string *d, char algo);