parent
77a008f714
commit
72cdfa4a20
|
@ -511,7 +511,7 @@ bool ssl_options_t::handshake(
|
|||
// autodetect will reconnect without SSL - warn and keep connection encrypted
|
||||
if (support != ssl_support_t::e_ssl_support_autodetect)
|
||||
{
|
||||
MERROR("SSL certificate is not in the allowed list, connection droppped");
|
||||
MERROR("SSL certificate is not in the allowed list, connection dropped");
|
||||
return false;
|
||||
}
|
||||
MWARNING("SSL peer has not been verified");
|
||||
|
|
|
@ -4048,7 +4048,7 @@ void BlockchainLMDB::get_output_tx_and_index_from_global(const std::vector<uint6
|
|||
void BlockchainLMDB::get_output_key(const epee::span<const uint64_t> &amounts, const std::vector<uint64_t> &offsets, std::vector<output_data_t> &outputs, bool allow_partial) const
|
||||
{
|
||||
if (amounts.size() != 1 && amounts.size() != offsets.size())
|
||||
throw0(DB_ERROR("Invalid sizes of amounts and offets"));
|
||||
throw0(DB_ERROR("Invalid sizes of amounts and offsets"));
|
||||
|
||||
LOG_PRINT_L3("BlockchainLMDB::" << __func__);
|
||||
TIME_MEASURE_START(db3);
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue