monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 00:37:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: sort ins and outs key key image and public key, respectively

Browse source 
This avoids leaking some small amount of information
This commit is contained in:
moneromooo-monero 2017-09-12 21:40:53 +01:00
parent 0c36b9f931
commit 16afab900d
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
2 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/cryptonote_core/cryptonote_tx_utils.cpp
View file

@ -31,6 +31,7 @@
#include "include_base_utils.h" #include "include_base_utils.h"
using namespace epee; using namespace epee;
#include "common/apply_permutation.h"
#include "cryptonote_tx_utils.h" #include "cryptonote_tx_utils.h"
#include "cryptonote_config.h" #include "cryptonote_config.h"
#include "cryptonote_basic/miner.h" #include "cryptonote_basic/miner.h"
@ -156,7 +157,7 @@ namespace cryptonote
return destinations[0].addr.m_view_public_key; return destinations[0].addr.m_view_public_key;
} }
//--------------------------------------------------------------- //---------------------------------------------------------------
bool construct_tx_and_get_tx_key(const account_keys& sender_account_keys, const std::vector<tx_source_entry>& sources, const std::vector<tx_destination_entry>& destinations, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time, crypto::secret_key &tx_key, bool rct) bool construct_tx_and_get_tx_key(const account_keys& sender_account_keys, std::vector<tx_source_entry> sources, const std::vector<tx_destination_entry>& destinations, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time, crypto::secret_key &tx_key, bool rct)
{ {
std::vector<rct::key> amount_keys; std::vector<rct::key> amount_keys;
tx.set_null(); tx.set_null();
@ -263,14 +264,25 @@ namespace cryptonote
tx.vin.push_back(input_to_key); tx.vin.push_back(input_to_key);
} }
// "Shuffle" outs // sort ins by their key image
std::vector<tx_destination_entry> shuffled_dsts(destinations); std::vector<size_t> ins_order(sources.size());
std::random_shuffle(shuffled_dsts.begin(), shuffled_dsts.end(), [](unsigned int i) { return crypto::rand<unsigned int>() % i; }); for (size_t n = 0; n < sources.size(); ++n)
ins_order[n] = n;
std::sort(ins_order.begin(), ins_order.end(), [&](const size_t i0, const size_t i1) {
const txin_to_key &tk0 = boost::get<txin_to_key>(tx.vin[i0]);
const txin_to_key &tk1 = boost::get<txin_to_key>(tx.vin[i1]);
return memcmp(&tk0.k_image, &tk1.k_image, sizeof(tk0.k_image)) < 0;
});
tools::apply_permutation(ins_order, [&] (size_t i0, size_t i1) {
std::swap(tx.vin[i0], tx.vin[i1]);
std::swap(in_contexts[i0], in_contexts[i1]);
std::swap(sources[i0], sources[i1]);
});
uint64_t summary_outs_money = 0; uint64_t summary_outs_money = 0;
//fill outputs //fill outputs
size_t output_index = 0; size_t output_index = 0;
for(const tx_destination_entry& dst_entr: shuffled_dsts) for(const tx_destination_entry& dst_entr: destinations)
{ {
CHECK_AND_ASSERT_MES(dst_entr.amount > 0 || tx.version > 1, false, "Destination with wrong amount: " << dst_entr.amount); CHECK_AND_ASSERT_MES(dst_entr.amount > 0 || tx.version > 1, false, "Destination with wrong amount: " << dst_entr.amount);
crypto::key_derivation derivation; crypto::key_derivation derivation;
@ -297,6 +309,20 @@ namespace cryptonote
summary_outs_money += dst_entr.amount; summary_outs_money += dst_entr.amount;
} }
// sort outs by their public key
std::vector<size_t> outs_order(tx.vout.size());
for (size_t n = 0; n < tx.vout.size(); ++n)
outs_order[n] = n;
std::sort(outs_order.begin(), outs_order.end(), [&](size_t i0, size_t i1) {
const txout_to_key &tk0 = boost::get<txout_to_key>(tx.vout[i0].target);
const txout_to_key &tk1 = boost::get<txout_to_key>(tx.vout[i1].target);
return memcmp(&tk0.key, &tk1.key, sizeof(tk0.key)) < 0;
});
tools::apply_permutation(outs_order, [&] (size_t i0, size_t i1) {
std::swap(tx.vout[i0], tx.vout[i1]);
std::swap(amount_keys[i0], amount_keys[i1]);
});
//check money //check money
if(summary_outs_money > summary_inputs_money ) if(summary_outs_money > summary_inputs_money )
{ {

2
src/cryptonote_core/cryptonote_tx_utils.h
View file

@ -71,7 +71,7 @@ namespace cryptonote
//--------------------------------------------------------------- //---------------------------------------------------------------
crypto::public_key get_destination_view_key_pub(const std::vector<tx_destination_entry> &destinations, const account_keys &sender_keys); crypto::public_key get_destination_view_key_pub(const std::vector<tx_destination_entry> &destinations, const account_keys &sender_keys);
bool construct_tx(const account_keys& sender_account_keys, const std::vector<tx_source_entry>& sources, const std::vector<tx_destination_entry>& destinations, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time); bool construct_tx(const account_keys& sender_account_keys, const std::vector<tx_source_entry>& sources, const std::vector<tx_destination_entry>& destinations, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time);
bool construct_tx_and_get_tx_key(const account_keys& sender_account_keys, const std::vector<tx_source_entry>& sources, const std::vector<tx_destination_entry>& destinations, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time, crypto::secret_key &tx_key, bool rct = false); bool construct_tx_and_get_tx_key(const account_keys& sender_account_keys, std::vector<tx_source_entry> sources, const std::vector<tx_destination_entry>& destinations, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time, crypto::secret_key &tx_key, bool rct = false);
bool generate_genesis_block( bool generate_genesis_block(
block& bl block& bl