aboutsummaryrefslogtreecommitdiff
path: root/src/device/device_default.cpp
diff options
context:
space:
mode:
authorjeffro256 <jeffro256@tutanota.com>2024-08-23 12:15:17 -0500
committerjeffro256 <jeffro256@tutanota.com>2024-09-10 16:07:36 -0500
commit65568d3a884857ce08d1170f5801a6891a5c187c (patch)
treee0685979542aed3ec92b2fe828be15b4ead7564f /src/device/device_default.cpp
parentb089f9ee69924882c5d14dd1a6991deb05d9d1cd (diff)
downloadmonzero-core-65568d3a884857ce08d1170f5801a6891a5c187c.tar.gz
monzero-core-65568d3a884857ce08d1170f5801a6891a5c187c.tar.xz
monzero-core-65568d3a884857ce08d1170f5801a6891a5c187c.zip
build: fix build with Boost 1.85 and remove instances of viewkey logging [RELEASE]
1. Use std::is_standard_layout and std::is_trivially_copyable instead of std::is_pod for KV byte-wise serialization, which fixes compile issue for Boost UUIDs 2. Removed reimplementation of std::hash for boost::uuids::uuid 3. Removed << operator overload for crypto::secret_key 4. Removed instances in code where private view key was dumped to the log in plaintext Release version of #9450, containing C++14 modified assertions
Diffstat (limited to 'src/device/device_default.cpp')
-rw-r--r--src/device/device_default.cpp8
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)