From e81a274f8b330005401c52bc281f5efeee05e116 Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Wed, 16 May 2018 08:13:26 +0200
Subject: Return stored node users decrypted as hash map instead of vector

---
 src/Database.cpp        | 2 +-
 src/DatabaseStorage.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/Database.cpp b/src/Database.cpp
index 5b3f705..8529811 100644
--- a/src/Database.cpp
+++ b/src/Database.cpp
@@ -661,7 +661,7 @@ namespace odhtdb
         return databaseStorage.storeUserPasswordEncrypted(nodeHash, username, password, keyPair);
     }
         
-    vector<NodeUserKeyPair> Database::getStoredUserNodeDataDecrypted(const string &username, const string &password)
+    MapHash<Signature::KeyPair> Database::getStoredUserNodeDataDecrypted(const string &username, const string &password)
     {
         return databaseStorage.getStoredUserNodeDataDecrypted(username, password);
     }
diff --git a/src/DatabaseStorage.cpp b/src/DatabaseStorage.cpp
index ed190e8..7b316f7 100644
--- a/src/DatabaseStorage.cpp
+++ b/src/DatabaseStorage.cpp
@@ -923,13 +923,13 @@ namespace odhtdb
         transaction.commit();
     }
     
-    vector<NodeUserKeyPair> DatabaseStorage::getStoredUserNodeDataDecrypted(const string &username, const string &password)
+    MapHash<Signature::KeyPair> DatabaseStorage::getStoredUserNodeDataDecrypted(const string &username, const string &password)
     {
         OwnedMemory hashedPassword = hashPassword(DataView((void*)password.data(), password.size()), DataView((void*)passwordSalt, PASSWORD_SALT_LEN));
         DataView hashedPasswordView(hashedPassword.data, hashedPassword.size);
         i64 encryptedUserRowId = getStoredUserId(username, hashedPasswordView);
         
-        vector<NodeUserKeyPair> result;
+        MapHash<Signature::KeyPair> result;
         SqlQuery query(sqliteDb, "SELECT node, userPublicKey, nonce, userPrivateKeyEncrypted FROM NodeEncryptedUserData WHERE usernameId = ?", { encryptedUserRowId });
         while(query.next())
         {
@@ -947,7 +947,7 @@ namespace odhtdb
                 Decryption decryptedStoredPrivateKey(storedPrivateKeyEncrypted, storedNonce, hashedPasswordView);
                 Signature::PrivateKey userPrivateKey((const char*)decryptedStoredPrivateKey.getDecryptedText().data, decryptedStoredPrivateKey.getDecryptedText().size);
                 Signature::KeyPair keyPair(userPublicKey, userPrivateKey);
-                result.push_back({ nodeHash, keyPair });
+                result[nodeHash] = keyPair;
             }
             catch(DecryptionException &e)
             {
-- 
cgit v1.2.3