diff options
| author | Suhas Daftuar <sdaftuar@gmail.com> | 2018-04-06 11:54:52 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-07-12 10:03:03 -0400 |
| commit | cfc6f7413bfa486aed9811fcef177cd80568f2db (patch) | |
| tree | 16277a8a14925570983ed76a10e3f2eda0be4fc0 /src | |
| parent | bf1f1501903a2a0df4ac5fd4b2bfe086ffe88773 (diff) | |
| download | bitcoin-cfc6f7413bfa486aed9811fcef177cd80568f2db.tar.xz | |
[rpcwallet] Clamp walletpassphrase value at 100M seconds
Larger values seem to trigger a bug on macos+libevent (resulting in the
rpc server stopping).
Github-Pull: #12905
Rebased-From: 662d19ff7217d0e6c7975ca311933f640955a53e
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 8d8c582424..a86f38cf7f 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -2322,8 +2322,7 @@ UniValue walletpassphrase(const JSONRPCRequest& request) "This is needed prior to performing transactions related to private keys such as sending bitcoins\n" "\nArguments:\n" "1. \"passphrase\" (string, required) The wallet passphrase\n" - "2. timeout (numeric, required) The time to keep the decryption key in seconds. Limited to at most 1073741824 (2^30) seconds.\n" - " Any value greater than 1073741824 seconds will be set to 1073741824 seconds.\n" + "2. timeout (numeric, required) The time to keep the decryption key in seconds; capped at 100000000 (~3 years).\n" "\nNote:\n" "Issuing the walletpassphrase command while the wallet is already unlocked will set a new unlock\n" "time that overrides the old one.\n" @@ -2358,9 +2357,10 @@ UniValue walletpassphrase(const JSONRPCRequest& request) if (nSleepTime < 0) { throw JSONRPCError(RPC_INVALID_PARAMETER, "Timeout cannot be negative."); } - // Clamp timeout to 2^30 seconds - if (nSleepTime > (int64_t)1 << 30) { - nSleepTime = (int64_t)1 << 30; + // Clamp timeout + constexpr int64_t MAX_SLEEP_TIME = 100000000; // larger values trigger a macos/libevent bug? + if (nSleepTime > MAX_SLEEP_TIME) { + nSleepTime = MAX_SLEEP_TIME; } if (strWalletPass.length() > 0) |