Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-03 16:14:20 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6565

Browse source 
72cdfa4a2 fix a few typos in error messages (moneromooo-monero)
This commit is contained in:
Alexander Blair 2020-07-19 03:40:19 -07:00
commit 9871fefbf9
No known key found for this signature in database
GPG key ID: C64552D877C32479
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/device/device_ledger.cpp
View file

@ -1108,7 +1108,7 @@ namespace hw {
for(size_t n=0; n < additional_derivations.size();++n) {
if(derivation == additional_derivations[n]) {
pkey = &additional_tx_pub_keys[n];
MDEBUG("conceal derivation with additionnal tx pub key");
MDEBUG("conceal derivation with additional tx pub key");
break;
}
}
@ -1640,20 +1640,20 @@ namespace hw {
//if (tx_version > 1)
{
ASSERT_X(recv_len>=32, "Not enought data from device");
ASSERT_X(recv_len>=32, "Not enough data from device");
crypto::secret_key scalar1;
this->receive_secret((unsigned char*)scalar1.data, offset);
amount_keys.push_back(rct::sk2rct(scalar1));
recv_len -= 32;
}
ASSERT_X(recv_len>=32, "Not enought data from device");
ASSERT_X(recv_len>=32, "Not enough data from device");
memmove(out_eph_public_key.data, &this->buffer_recv[offset], 32);
recv_len -= 32;
offset += 32;
if (need_additional_txkeys)
{
ASSERT_X(recv_len>=32, "Not enought data from device");
ASSERT_X(recv_len>=32, "Not enough data from device");
memmove(additional_txkey.pub.data, &this->buffer_recv[offset], 32);
additional_tx_public_keys.push_back(additional_txkey.pub);
offset += 32;