diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2024-10-01 15:30:30 -0400 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2024-10-01 15:30:30 -0400 |
| commit | 83dd5152e6d115426afbb57a94a832ec91b58a46 (patch) | |
| tree | e0685979542aed3ec92b2fe828be15b4ead7564f /src/device/device_default.cpp | |
| parent | b089f9ee69924882c5d14dd1a6991deb05d9d1cd (diff) | |
| parent | 65568d3a884857ce08d1170f5801a6891a5c187c (diff) | |
| download | monzero-core-83dd5152e6d115426afbb57a94a832ec91b58a46.tar.gz monzero-core-83dd5152e6d115426afbb57a94a832ec91b58a46.tar.xz monzero-core-83dd5152e6d115426afbb57a94a832ec91b58a46.zip | |
Merge pull request #9462
65568d3 build: fix build with Boost 1.85 and remove instances of viewkey logging [RELEASE] (jeffro256)
Diffstat (limited to 'src/device/device_default.cpp')
| -rw-r--r-- | src/device/device_default.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/device/device_default.cpp b/src/device/device_default.cpp index d70ece229..c770a6e22 100644 --- a/src/device/device_default.cpp +++ b/src/device/device_default.cpp @@ -317,13 +317,15 @@ namespace hw { { // sending change to yourself; derivation = a*R r = generate_key_derivation(txkey_pub, sender_account_keys.m_view_secret_key, derivation); - CHECK_AND_ASSERT_MES(r, false, "at creation outs: failed to generate_key_derivation(" << txkey_pub << ", " << sender_account_keys.m_view_secret_key << ")"); + CHECK_AND_ASSERT_MES(r, false, "at creation outs: failed to generate_key_derivation(" << txkey_pub << ", <viewkey>)"); } else { // sending to the recipient; derivation = r*A (or s*C in the subaddress scheme) - r = generate_key_derivation(dst_entr.addr.m_view_public_key, dst_entr.is_subaddress && need_additional_txkeys ? additional_txkey.sec : tx_key, derivation); - CHECK_AND_ASSERT_MES(r, false, "at creation outs: failed to generate_key_derivation(" << dst_entr.addr.m_view_public_key << ", " << (dst_entr.is_subaddress && need_additional_txkeys ? additional_txkey.sec : tx_key) << ")"); + const crypto::secret_key &tx_privkey{dst_entr.is_subaddress && need_additional_txkeys ? additional_txkey.sec : tx_key}; + r = generate_key_derivation(dst_entr.addr.m_view_public_key, tx_privkey, derivation); + CHECK_AND_ASSERT_MES(r, false, "at creation outs: failed to generate_key_derivation(" + << dst_entr.addr.m_view_public_key << ", " << crypto::secret_key_explicit_print_ref{tx_privkey} << ")"); } if (need_additional_txkeys) |