Merge pull request #390

5dc53c2 wallet: use mutex protected random generation api (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2015-08-26 19:24:08 +02:00
commit a1af0feb06
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 2 additions and 2 deletions

View file

@ -1828,7 +1828,7 @@ bool simple_wallet::print_integrated_address(const std::vector<std::string> &arg
} }
if (args.size() == 0) if (args.size() == 0)
{ {
crypto::generate_random_bytes(8, payment_id.data); payment_id = crypto::rand<crypto::hash8>();
success_msg_writer() << tr("Random payment ID: ") << payment_id; success_msg_writer() << tr("Random payment ID: ") << payment_id;
success_msg_writer() << tr("Matching integrated address: ") << m_wallet->get_account().get_public_integrated_address_str(payment_id, m_wallet->testnet()); success_msg_writer() << tr("Matching integrated address: ") << m_wallet->get_account().get_public_integrated_address_str(payment_id, m_wallet->testnet());
return true; return true;

View file

@ -356,7 +356,7 @@ namespace tools
crypto::hash8 payment_id; crypto::hash8 payment_id;
if (req.payment_id.empty()) if (req.payment_id.empty())
{ {
crypto::generate_random_bytes(8, payment_id.data); payment_id = crypto::rand<crypto::hash8>();
} }
else else
{ {