From 5cb3da04b8882ca975b4e3d6c089c64bbaf67d0d Mon Sep 17 00:00:00 2001
From: Marko Bencun <marko.bencun@monetas.net>
Date: Sun, 23 Jul 2017 23:32:57 +0200
Subject: keystore GetKeys(): return result instead of writing to reference

Issue: #10905

By returning the result, a few useless lines can be removed.

Return-value-optimization means there should be no copy.
---
 src/wallet/crypter.h | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

(limited to 'src/wallet/crypter.h')

diff --git a/src/wallet/crypter.h b/src/wallet/crypter.h
index 1dc44e424f..d6f3e27721 100644
--- a/src/wallet/crypter.h
+++ b/src/wallet/crypter.h
@@ -16,13 +16,13 @@ const unsigned int WALLET_CRYPTO_IV_SIZE = 16;
 /**
  * Private key encryption is done based on a CMasterKey,
  * which holds a salt and random encryption key.
- * 
+ *
  * CMasterKeys are encrypted using AES-256-CBC using a key
  * derived using derivation method nDerivationMethod
  * (0 == EVP_sha512()) and derivation iterations nDeriveIterations.
  * vchOtherDerivationParameters is provided for alternative algorithms
  * which may require more parameters (such as scrypt).
- * 
+ *
  * Wallet Private Keys are then encrypted using AES-256-CBC
  * with the double-sha256 of the public key as the IV, and the
  * master key's key as the encryption key (see keystore.[ch]).
@@ -162,28 +162,25 @@ public:
     {
         {
             LOCK(cs_KeyStore);
-            if (!IsCrypted())
+            if (!IsCrypted()) {
                 return CBasicKeyStore::HaveKey(address);
+            }
             return mapCryptedKeys.count(address) > 0;
         }
         return false;
     }
     bool GetKey(const CKeyID &address, CKey& keyOut) const override;
     bool GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const override;
-    void GetKeys(std::set<CKeyID> &setAddress) const override
+    std::set<CKeyID> GetKeys() const override
     {
-        if (!IsCrypted())
-        {
-            CBasicKeyStore::GetKeys(setAddress);
-            return;
+        if (!IsCrypted()) {
+            return CBasicKeyStore::GetKeys();
         }
-        setAddress.clear();
-        CryptedKeyMap::const_iterator mi = mapCryptedKeys.begin();
-        while (mi != mapCryptedKeys.end())
-        {
-            setAddress.insert((*mi).first);
-            mi++;
+        std::set<CKeyID> set_address;
+        for (const auto& mi : mapCryptedKeys) {
+            set_address.insert(mi.first);
         }
+        return set_address;
     }
 
     /**
-- 
cgit v1.2.3


From fe09b0197c20dc3c0a614c1a94dac708ef206743 Mon Sep 17 00:00:00 2001
From: Marko Bencun <marko.bencun@monetas.net>
Date: Sun, 23 Jul 2017 23:37:56 +0200
Subject: add missing lock to crypter GetKeys()

Issue: #10905
---
 src/wallet/crypter.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/wallet/crypter.h')

diff --git a/src/wallet/crypter.h b/src/wallet/crypter.h
index d6f3e27721..0295004cb3 100644
--- a/src/wallet/crypter.h
+++ b/src/wallet/crypter.h
@@ -173,6 +173,7 @@ public:
     bool GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const override;
     std::set<CKeyID> GetKeys() const override
     {
+        LOCK(cs_KeyStore);
         if (!IsCrypted()) {
             return CBasicKeyStore::GetKeys();
         }
-- 
cgit v1.2.3