4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-15 04:46:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cold signing: make sure short payment id isnt encrypted twice

Browse Source
This commit is contained in:
Jaquee 2017-01-08 20:17:36 +01:00
parent dd580d7bc7
commit 79b4e1f997
No known key found for this signature in database
GPG Key ID: 384E52B09F45DC39
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/wallet/wallet2.cpp
View File

@ -2946,6 +2946,24 @@ crypto::hash wallet2::get_payment_id(const pending_tx &ptx) const
} }
return payment_id; return payment_id;
} }
crypto::hash8 wallet2::get_short_payment_id(const pending_tx &ptx) const
{
crypto::hash8 payment_id8 = null_hash8;
std::vector<tx_extra_field> tx_extra_fields;
if(!parse_tx_extra(ptx.tx.extra, tx_extra_fields))
return payment_id8;
cryptonote::tx_extra_nonce extra_nonce;
if (find_tx_extra_field_by_type(tx_extra_fields, extra_nonce))
{
if(get_encrypted_payment_id_from_tx_extra_nonce(extra_nonce.nonce, payment_id8))
{
decrypt_payment_id(payment_id8, ptx.dests[0].addr.m_view_public_key, ptx.tx_key);
}
}
return payment_id8;
}
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
// take a pending tx and actually send it to the daemon // take a pending tx and actually send it to the daemon
void wallet2::commit_tx(pending_tx& ptx) void wallet2::commit_tx(pending_tx& ptx)
@ -3016,7 +3034,30 @@ bool wallet2::save_tx(const std::vector<pending_tx>& ptx_vector, const std::stri
LOG_PRINT_L0("saving " << ptx_vector.size() << " transactions"); LOG_PRINT_L0("saving " << ptx_vector.size() << " transactions");
unsigned_tx_set txs; unsigned_tx_set txs;
for (auto &tx: ptx_vector) for (auto &tx: ptx_vector)
txs.txes.push_back(tx.construction_data); {
tx_construction_data construction_data = tx.construction_data;
// Short payment id is encrypted with tx_key.
// Since sign_tx() generates new tx_keys and encrypts the payment id, we need to save the decrypted payment ID
// Get decrypted payment id from pending_tx
crypto::hash8 payment_id = get_short_payment_id(tx);
if (payment_id != null_hash8)
{
// Remove encrypted
remove_field_from_tx_extra(construction_data.extra, typeid(cryptonote::tx_extra_nonce));
// Add decrypted
std::string extra_nonce;
set_encrypted_payment_id_to_tx_extra_nonce(extra_nonce, payment_id);
if (!add_extra_nonce_to_tx_extra(construction_data.extra, extra_nonce))
{
LOG_ERROR("Failed to add decrypted payment id to tx extra");
return false;
}
LOG_PRINT_L1("Decrypted payment ID: " << payment_id);
}
// Save tx construction_data to unsigned_tx_set
txs.txes.push_back(construction_data);
}
txs.transfers = m_transfers; txs.transfers = m_transfers;
std::string s = obj_to_json_str(txs); std::string s = obj_to_json_str(txs);
if (s.empty()) if (s.empty())

1
src/wallet/wallet2.h
View File

@ -609,6 +609,7 @@ namespace tools
void check_genesis(const crypto::hash& genesis_hash) const; //throws void check_genesis(const crypto::hash& genesis_hash) const; //throws
bool generate_chacha8_key_from_secret_keys(crypto::chacha8_key &key) const; bool generate_chacha8_key_from_secret_keys(crypto::chacha8_key &key) const;
crypto::hash get_payment_id(const pending_tx &ptx) const; crypto::hash get_payment_id(const pending_tx &ptx) const;
crypto::hash8 get_short_payment_id(const pending_tx &ptx) const;
void check_acc_out_precomp(const crypto::public_key &spend_public_key, const cryptonote::tx_out &o, const crypto::key_derivation &derivation, size_t i, bool &received, uint64_t &money_transfered, bool &error) const; void check_acc_out_precomp(const crypto::public_key &spend_public_key, const cryptonote::tx_out &o, const crypto::key_derivation &derivation, size_t i, bool &received, uint64_t &money_transfered, bool &error) const;
void parse_block_round(const cryptonote::blobdata &blob, cryptonote::block &bl, crypto::hash &bl_id, bool &error) const; void parse_block_round(const cryptonote::blobdata &blob, cryptonote::block &bl, crypto::hash &bl_id, bool &error) const;
uint64_t get_upper_tranaction_size_limit(); uint64_t get_upper_tranaction_size_limit();