Merge pull request dashpay#5759 from UdjinM6/bp26532

PastaPastaPasta · PastaPastaPasta · commit f0feb36ce380 · 2023-12-24T12:04:40.000-06:00
backport: partial merge bitcoin#26532: wallet: bugfix, invalid crypted key "checksum_valid" set
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
@@ -388,7 +388,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
             if (!ssValue.eof()) {
                 uint256 checksum;
                 ssValue >> checksum;
-                if ((checksum_valid = Hash(vchPrivKey) != checksum)) {
+                if (!(checksum_valid = Hash(vchPrivKey) == checksum)) {
                     strErr = "Error reading wallet database: Crypted key corrupt";
                     return false;
                 }

Original file line number	Diff line number	Diff line change
`@@ -388,7 +388,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,`
`388`	`388`	`if (!ssValue.eof()) {`
`389`	`389`	`uint256 checksum;`
`390`	`390`	`ssValue >> checksum;`
`391`		`- if ((checksum_valid = Hash(vchPrivKey) != checksum)) {`
	`391`	`+ if (!(checksum_valid = Hash(vchPrivKey) == checksum)) {`
`392`	`392`	`strErr = "Error reading wallet database: Crypted key corrupt";`
`393`	`393`	`return false;`
`394`	`394`	`}`