Merge 9eaef10801 into merged_master (Bitcoin PR bitcoin/bitcoin#25707)

This commit is contained in:
Byron Hambly 2024-11-04 11:26:40 +02:00
commit 1006327a13
28 changed files with 43 additions and 39 deletions

View file

@ -1793,7 +1793,7 @@ std::map<CKeyID, CKey> DescriptorScriptPubKeyMan::GetKeys() const
AssertLockHeld(cs_desc_man);
if (m_storage.HasEncryptionKeys() && !m_storage.IsLocked()) {
KeyMap keys;
for (auto key_pair : m_map_crypted_keys) {
for (const auto& key_pair : m_map_crypted_keys) {
const CPubKey& pubkey = key_pair.second.first;
const std::vector<unsigned char>& crypted_secret = key_pair.second.second;
CKey key;