Skip to content

fix(rpc): upgradetohd rpc should allow null characters in wallet passphrase #6798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
UdjinM6 wants to merge 1 commit into from
Closed

fix(rpc): upgradetohd rpc should allow null characters in wallet passphrase #6798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/wallet/rpc/wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,9 +379,7 @@ static RPCHelpMan upgradetohd()
throw JSONRPCError(RPC_WALLET_UNLOCK_NEEDED, "Error: Wallet encrypted but passphrase not supplied to RPC.");
}
} else {
// TODO: get rid of this .c_str() by implementing SecureString::operator=(std::string)
// Alternately, find a way to make request.params[0] mlock()'d to begin with.
secureWalletPassphrase = request.params[2].get_str().c_str();
secureWalletPassphrase = std::string_view{request.params[2].get_str()};
}

SecureString secureMnemonic;
Expand Down
3 changes: 2 additions & 1 deletion test/functional/wallet_upgradetohd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,8 @@ def run_test(self):
self.recover_non_hd()

self.log.info("Same mnemonic, same mnemonic passphrase, encrypt wallet on upgrade, should recover all coins after rescan")
walletpass = "111pass222"
# Null characters are allowed in wallet passphrases now
walletpass = "111\0pass222"
assert node.upgradetohd(mnemonic, "", walletpass)
node.stop()
node.wait_until_stopped()
Expand Down
Loading