Merge pull request #3593

c7f9332 Add check for valid keys in `importprivkey` (Wladimir J. van der Laan)
11 years ago · 6ebcec7d3c
1 changed files with 3 additions and 1 deletions
--- a/src/rpcdump.cpp
+++ b/src/rpcdump.cpp
@ -101,9 +101,11 @@ Value importprivkey(const Array& params, bool fHelp)
				@@ -101,9 +101,11 @@ Value importprivkey(const Array& params, bool fHelp)
    CBitcoinSecret vchSecret;
    bool fGood = vchSecret.SetString(strSecret);

-    if (!fGood) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid private key");
+    if (!fGood) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid private key encoding");

    CKey key = vchSecret.GetKey();
+    if (!key.IsValid()) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Private key outside allowed range");
+
    CPubKey pubkey = key.GetPubKey();
    CKeyID vchAddress = pubkey.GetID();
    {