Skip to content
Permalink
Browse files

Cryptographically secure random engine in std::shuffle

All occurrences were replaced, not only the important ones, to prevent
people from copying an insecure std::shuffle call over to a place where
a secure one would be warranted. A form of defense-in-depth.
  • Loading branch information...
tomsmeding committed Aug 13, 2019
1 parent a8fa90a commit 0ceb991e15a5c7485a76ffa03b25cc1cba5cd999
@@ -354,7 +354,7 @@ namespace cryptonote

if (shuffle_outs)
{
std::shuffle(destinations.begin(), destinations.end(), std::default_random_engine(crypto::rand<unsigned int>()));
std::shuffle(destinations.begin(), destinations.end(), crypto::random_device{});
}

// sort ins by their key image
@@ -290,7 +290,7 @@ namespace nodetool

if (anonymize)
{
std::shuffle(bs_head.begin(), bs_head.end(), std::default_random_engine(crypto::rand<unsigned>()));
std::shuffle(bs_head.begin(), bs_head.end(), crypto::random_device{});
if (bs_head.size() > depth)
bs_head.resize(depth);
for (auto &e: bs_head)
@@ -7448,7 +7448,7 @@ void wallet2::light_wallet_get_outs(std::vector<std::vector<tools::wallet2::get_
order.resize(light_wallet_requested_outputs_count);
for (size_t n = 0; n < order.size(); ++n)
order[n] = n;
std::shuffle(order.begin(), order.end(), std::default_random_engine(crypto::rand<unsigned>()));
std::shuffle(order.begin(), order.end(), crypto::random_device{});


LOG_PRINT_L2("Looking for " << (fake_outputs_count+1) << " outputs with amounts " << print_money(td.is_rct() ? 0 : td.amount()));
@@ -8023,7 +8023,7 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
order.resize(requested_outputs_count);
for (size_t n = 0; n < order.size(); ++n)
order[n] = n;
std::shuffle(order.begin(), order.end(), std::default_random_engine(crypto::rand<unsigned>()));
std::shuffle(order.begin(), order.end(), crypto::random_device{});

LOG_PRINT_L2("Looking for " << (fake_outputs_count+1) << " outputs of size " << print_money(td.is_rct() ? 0 : td.amount()));
for (size_t o = 0; o < requested_outputs_count && outs.back().size() < fake_outputs_count + 1; ++o)
@@ -779,8 +779,8 @@ TEST(ringct, range_proofs_accept_very_long_simple)
inputs[n] = n;
outputs[n] = n;
}
std::shuffle(inputs, inputs + N, std::default_random_engine(crypto::rand<unsigned>()));
std::shuffle(outputs, outputs + N, std::default_random_engine(crypto::rand<unsigned>()));
std::shuffle(inputs, inputs + N, crypto::random_device{});
std::shuffle(outputs, outputs + N, crypto::random_device{});
EXPECT_TRUE(range_proof_test(true, NELTS(inputs), inputs, NELTS(outputs), outputs, false, true));
}

@@ -143,7 +143,7 @@ TEST(rolling_median, order)
m.insert(random[i]);
ASSERT_EQ(med, m.median());

std::shuffle(random.begin(), random.end(), std::default_random_engine(crypto::rand<unsigned>()));
std::shuffle(random.begin(), random.end(), crypto::random_device{});
m.clear();
for (int i = 0; i < 1000; ++i)
m.insert(random[i]);

0 comments on commit 0ceb991

Please sign in to comment.
You can’t perform that action at this time.