nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keypair::generate: always require hw::device to avoid possible mistake

Browse Source
This commit is contained in:
stoffu 2018-03-05 17:02:17 +09:00
parent 27a196b126
commit 8705beaf51
No known key found for this signature in database
GPG Key ID: 41DAB8343A9EC012
6 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cryptonote_basic/cryptonote_basic.h
View File

@ -429,12 +429,6 @@ namespace cryptonote
crypto::public_key pub; crypto::public_key pub;
crypto::secret_key sec; crypto::secret_key sec;
static inline keypair generate()
{
keypair k;
generate_keys(k.pub, k.sec);
return k;
}
static inline keypair generate(hw::device &hwdev) static inline keypair generate(hw::device &hwdev)
{ {
keypair k; keypair k;

2
src/cryptonote_core/cryptonote_tx_utils.cpp
View File

@ -78,7 +78,7 @@ namespace cryptonote
tx.vout.clear(); tx.vout.clear();
tx.extra.clear(); tx.extra.clear();
keypair txkey = keypair::generate(); keypair txkey = keypair::generate(hw::get_device("default"));
add_tx_pub_key_to_extra(tx, txkey.pub); add_tx_pub_key_to_extra(tx, txkey.pub);
if(!extra_nonce.empty()) if(!extra_nonce.empty())
if(!add_extra_nonce_to_tx_extra(tx.extra, extra_nonce)) if(!add_extra_nonce_to_tx_extra(tx.extra, extra_nonce))

2
src/device/device_default.cpp
View File

@ -251,7 +251,7 @@ namespace hw {
/* ======================================================================= */ /* ======================================================================= */
bool device_default::open_tx(crypto::secret_key &tx_key) { bool device_default::open_tx(crypto::secret_key &tx_key) {
cryptonote::keypair txkey = cryptonote::keypair::generate(); cryptonote::keypair txkey = cryptonote::keypair::generate(*this);
tx_key = txkey.sec; tx_key = txkey.sec;
return true; return true;
} }

2
tests/core_tests/chaingen.cpp
View File

@ -521,7 +521,7 @@ bool construct_miner_tx_manually(size_t height, uint64_t already_generated_coins
keypair* p_txkey/* = 0*/) keypair* p_txkey/* = 0*/)
{ {
keypair txkey; keypair txkey;
txkey = keypair::generate(); txkey = keypair::generate(hw::get_device("default"));
add_tx_pub_key_to_extra(tx, txkey.pub); add_tx_pub_key_to_extra(tx, txkey.pub);
if (0 != p_txkey) if (0 != p_txkey)

4
tests/core_tests/tx_validation.cpp
View File

@ -49,7 +49,7 @@ namespace
m_tx.version = version; m_tx.version = version;
m_tx.unlock_time = unlock_time; m_tx.unlock_time = unlock_time;
m_tx_key = keypair::generate(); m_tx_key = keypair::generate(hw::get_device("default"));
add_tx_pub_key_to_extra(m_tx, m_tx_key.pub); add_tx_pub_key_to_extra(m_tx, m_tx_key.pub);
} }
@ -518,7 +518,7 @@ bool gen_tx_key_image_not_derive_from_tx_key::generate(std::vector<test_event_en
builder.step2_fill_inputs(miner_account.get_keys(), sources); builder.step2_fill_inputs(miner_account.get_keys(), sources);
txin_to_key& in_to_key = boost::get<txin_to_key>(builder.m_tx.vin.front()); txin_to_key& in_to_key = boost::get<txin_to_key>(builder.m_tx.vin.front());
keypair kp = keypair::generate(); keypair kp = keypair::generate(hw::get_device("default"));
key_image another_ki; key_image another_ki;
crypto::generate_key_image(kp.pub, kp.sec, another_ki); crypto::generate_key_image(kp.pub, kp.sec, another_ki);
in_to_key.k_image = another_ki; in_to_key.k_image = another_ki;

2
tests/performance_tests/generate_keypair.h
View File

@ -45,7 +45,7 @@ public:
bool test() bool test()
{ {
cryptonote::keypair::generate(); cryptonote::keypair::generate(hw::get_device("default"));
return true; return true;
} }
}; };