Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2675

Browse Source 
00cc1fdd subaddress: remove unneeded scalarmultBase (kenshi84)
This commit is contained in:
Riccardo Spagni 2017-11-14 15:02:14 +02:00
commit 256a1d9ead
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/cryptonote_core/cryptonote_tx_utils.cpp
View File

@ -174,9 +174,8 @@ namespace cryptonote
tx.unlock_time = unlock_time; tx.unlock_time = unlock_time;
tx.extra = extra; tx.extra = extra;
keypair txkey = keypair::generate(); keypair txkey;
remove_field_from_tx_extra(tx.extra, typeid(tx_extra_pub_key)); txkey.sec = rct::rct2sk(rct::skGen());
add_tx_pub_key_to_extra(tx, txkey.pub);
tx_key = txkey.sec; tx_key = txkey.sec;
// if we have a stealth payment id, find it and encrypt it with the tx key now // if we have a stealth payment id, find it and encrypt it with the tx key now
@ -323,9 +322,13 @@ namespace cryptonote
if (num_stdaddresses == 0 && num_subaddresses == 1) if (num_stdaddresses == 0 && num_subaddresses == 1)
{ {
txkey.pub = rct::rct2pk(rct::scalarmultKey(rct::pk2rct(single_dest_subaddress.m_spend_public_key), rct::sk2rct(txkey.sec))); txkey.pub = rct::rct2pk(rct::scalarmultKey(rct::pk2rct(single_dest_subaddress.m_spend_public_key), rct::sk2rct(txkey.sec)));
}
else
{
txkey.pub = rct::rct2pk(rct::scalarmultBase(rct::sk2rct(txkey.sec)));
}
remove_field_from_tx_extra(tx.extra, typeid(tx_extra_pub_key)); remove_field_from_tx_extra(tx.extra, typeid(tx_extra_pub_key));
add_tx_pub_key_to_extra(tx, txkey.pub); add_tx_pub_key_to_extra(tx, txkey.pub);
}
std::vector<crypto::public_key> additional_tx_public_keys; std::vector<crypto::public_key> additional_tx_public_keys;
additional_tx_keys.clear(); additional_tx_keys.clear();
@ -348,9 +351,11 @@ namespace cryptonote
keypair additional_txkey; keypair additional_txkey;
if (need_additional_txkeys) if (need_additional_txkeys)
{ {
additional_txkey = keypair::generate(); additional_txkey.sec = rct::rct2sk(rct::skGen());
if (dst_entr.is_subaddress) if (dst_entr.is_subaddress)
additional_txkey.pub = rct::rct2pk(rct::scalarmultKey(rct::pk2rct(dst_entr.addr.m_spend_public_key), rct::sk2rct(additional_txkey.sec))); additional_txkey.pub = rct::rct2pk(rct::scalarmultKey(rct::pk2rct(dst_entr.addr.m_spend_public_key), rct::sk2rct(additional_txkey.sec)));
else
additional_txkey.pub = rct::rct2pk(rct::scalarmultBase(rct::sk2rct(additional_txkey.sec)));
} }
bool r; bool r;