Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-28 00:19:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2279

Browse Source 
359517c7 wallet_rpc_server: fix possible privacy leak in on_import_key_images() (Jaquee)
20495b27 simplewallet: fix possible privacy leak in import_key_images() (Jaquee)
This commit is contained in:
Riccardo Spagni 2017-08-15 20:53:58 +02:00
commit a861cbb465
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/simplewallet/simplewallet.cpp
View File

@ -4542,6 +4542,12 @@ bool simple_wallet::export_key_images(const std::vector<std::string> &args)
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
bool simple_wallet::import_key_images(const std::vector<std::string> &args) bool simple_wallet::import_key_images(const std::vector<std::string> &args)
{ {
if (!m_trusted_daemon)
{
fail_msg_writer() << tr("this command requires a trusted daemon. Enable with --trusted-daemon");
return true;
}
if (args.size() != 1) if (args.size() != 1)
{ {
fail_msg_writer() << tr("usage: import_key_images <filename>"); fail_msg_writer() << tr("usage: import_key_images <filename>");

7
src/wallet/wallet_rpc_server.cpp
View File

@ -1364,7 +1364,12 @@ namespace tools
er.message = "Command unavailable in restricted mode."; er.message = "Command unavailable in restricted mode.";
return false; return false;
} }
if (!m_trusted_daemon)
{
er.code = WALLET_RPC_ERROR_CODE_UNKNOWN_ERROR;
er.message = "This command requires a trusted daemon.";
return false;
}
try try
{ {
std::vector<std::pair<crypto::key_image, crypto::signature>> ski; std::vector<std::pair<crypto::key_image, crypto::signature>> ski;