Browse Source

don't verify signature twice

pull/1082/head
orignal 7 years ago
parent
commit
b1c701085b
  1. 6
      libi2pd/LeaseSet.cpp
  2. 2
      libi2pd/LeaseSet.h

6
libi2pd/LeaseSet.cpp

@ -31,7 +31,7 @@ namespace data
} }
memcpy (m_Buffer, buf, len); memcpy (m_Buffer, buf, len);
m_BufferLen = len; m_BufferLen = len;
ReadFromBuffer (false); ReadFromBuffer (false, false); // we assume signature is verified already
} }
void LeaseSet::PopulateLeases () void LeaseSet::PopulateLeases ()
@ -40,7 +40,7 @@ namespace data
ReadFromBuffer (false); ReadFromBuffer (false);
} }
void LeaseSet::ReadFromBuffer (bool readIdentity) void LeaseSet::ReadFromBuffer (bool readIdentity, bool verifySignature)
{ {
if (readIdentity || !m_Identity) if (readIdentity || !m_Identity)
m_Identity = std::make_shared<IdentityEx>(m_Buffer, m_BufferLen); m_Identity = std::make_shared<IdentityEx>(m_Buffer, m_BufferLen);
@ -128,7 +128,7 @@ namespace data
} }
// verify // verify
if (!m_Identity->Verify (m_Buffer, leases - m_Buffer, leases)) if (verifySignature && !m_Identity->Verify (m_Buffer, leases - m_Buffer, leases))
{ {
LogPrint (eLogWarning, "LeaseSet: verification failed"); LogPrint (eLogWarning, "LeaseSet: verification failed");
m_IsValid = false; m_IsValid = false;

2
libi2pd/LeaseSet.h

@ -81,7 +81,7 @@ namespace data
private: private:
void ReadFromBuffer (bool readIdentity = true); void ReadFromBuffer (bool readIdentity = true, bool verifySignature = true);
uint64_t ExtractTimestamp (const uint8_t * buf, size_t len) const; // min expiration time uint64_t ExtractTimestamp (const uint8_t * buf, size_t len) const; // min expiration time
private: private:

Loading…
Cancel
Save