Skip to content

Wallet Private Key Encryption (on CWallet) #352

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

Merged
jgarzik merged 12 commits into from
Jul 13, 2011
Merged

Wallet Private Key Encryption (on CWallet) #352

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
acd6501
Prepare codebase for Encrypted Keys.
sipa Jun 25, 2011
c1aacf0
mlock() all private keys in memory
nobled Jun 24, 2011
a48c671
Make mlock() and munlock() portable to systems that require the addre…
jrmithdobbs Jun 30, 2011
4e87d34
Add wallet privkey encryption.
Jul 8, 2011
ddebdd9
Set the number of SHA512 rounds based on the speed of the computer.
Jun 28, 2011
98545d2
Push unlocked_until in getinfo.
Jun 28, 2011
8159808
Dynamically remove/insert the Options for encryption in the menus.
Jun 28, 2011
fbeb5fb
Add the walletlock RPC method to lock the wallet manually.
Jun 30, 2011
b6b039d
Add Wallet Encryption section to README
Jul 2, 2011
0efda1a
Do not use obsolete CPrivKey for passing keys around
sipa Jul 3, 2011
96f34cd
Use DB Transactions when encrypting wallet.
Jul 8, 2011
7414733
Make an invalid addrIncoming so that old clients crash.
Jul 10, 2011
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
Prev Previous commit
Next Next commit
Add the walletlock RPC method to lock the wallet manually.
  • Loading branch information
Matt Corallo committed Jul 13, 2011
commit fbeb5fb4835b9c58baec3e6331b0dd5bbdca67f1
25 changes: 25 additions & 0 deletions src/rpc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1488,6 +1488,29 @@ Value walletpassphrasechange(const Array& params, bool fHelp)
}


Value walletlock(const Array& params, bool fHelp)
{
if (pwalletMain->IsCrypted() && (fHelp || params.size() != 0))
throw runtime_error(
"walletlock\n"
"Removes the wallet encryption key from memory, locking the wallet.\n"
"After calling this method, you will need to call walletpassphrase again\n"
"before being able to call any methods which require the wallet to be unlocked.");
if (fHelp)
return true;
if (!pwalletMain->IsCrypted())
throw JSONRPCError(-15, "Error: running with an unencrypted wallet, but walletlock was called.");

pwalletMain->Lock();
CRITICAL_BLOCK(cs_nWalletUnlockTime)
{
nWalletUnlockTime = 0;
}

return Value::null;
}


Value encryptwallet(const Array& params, bool fHelp)
{
if (!pwalletMain->IsCrypted() && (fHelp || params.size() != 1))
Expand Down Expand Up @@ -1704,6 +1727,7 @@ pair<string, rpcfn_type> pCallTable[] =
make_pair("keypoolrefill", &keypoolrefill),
make_pair("walletpassphrase", &walletpassphrase),
make_pair("walletpassphrasechange", &walletpassphrasechange),
make_pair("walletlock", &walletlock),
make_pair("encryptwallet", &encryptwallet),
make_pair("validateaddress", &validateaddress),
make_pair("getbalance", &getbalance),
Expand Down Expand Up @@ -1740,6 +1764,7 @@ string pAllowInSafeMode[] =
"backupwallet",
"keypoolrefill",
"walletpassphrase",
"walletlock",
"validateaddress",
"getwork",
};
Expand Down