gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-12-27 05:03:14 -08:00
Code Issues Packages Projects Releases Wiki Activity

device: made function prototypes consistent with pre-#3303 codebase

Browse Source
This commit is contained in:
stoffu
2018-03-05 14:24:48 +09:00
parent a03d34f4e1
commit c9b38b4765
8 changed files with 72 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cryptonote_basic/cryptonote_format_utils.cpp
View File

@@ -185,9 +185,7 @@ namespace cryptonote
}
crypto::secret_key get_subaddress_secret_key(const crypto::secret_key& a, const subaddress_index& index, hw::device &hwdev)
{
crypto::secret_key m;
hwdev.get_subaddress_secret_key(a, index, m);
return m;
return hwdev.get_subaddress_secret_key(a, index);
}
//---------------------------------------------------------------
@@ -232,9 +230,7 @@ namespace cryptonote
std::vector<crypto::public_key> get_subaddress_spend_public_keys(const cryptonote::account_keys &keys, uint32_t account, uint32_t begin, uint32_t end, hw::device &hwdev)
{
std::vector<crypto::public_key> pkeys;
hwdev.get_subaddress_spend_public_keys(keys, account, begin, end, pkeys);
return pkeys;
return hwdev.get_subaddress_spend_public_keys(keys, account, begin, end);
}
//---------------------------------------------------------------
@@ -282,7 +278,7 @@ namespace cryptonote
}
else
{
hwdev.get_subaddress_secret_key(ack.m_view_secret_key, received_index, subaddr_sk);
subaddr_sk = hwdev.get_subaddress_secret_key(ack.m_view_secret_key, received_index);
hwdev.sc_secret_add(scalar_step2, scalar_step1,subaddr_sk);
}