Merge remote-tracking branch 'purple/openssl'

This commit is contained in:
Jeff Becker 2016-06-03 13:01:49 -04:00
commit f3856819fe
No known key found for this signature in database
GPG Key ID: AB950234D6EA286B
2 changed files with 3 additions and 2 deletions

View File

@ -354,6 +354,7 @@ namespace client
size_t offset = 2;
if (m_Destination)
{
offset += m_Destination->GetIdentity ()->GetSigningPrivateKeyLen (); // skip signing private key
m_Destination->SetEncryptionPrivateKey (buf + offset);
offset += 256;
m_Destination->LeaseSetCreated (buf + offset, len - offset);

4
I2CP.h
View File

@ -66,12 +66,12 @@ namespace client
void LeaseSetCreated (const uint8_t * buf, size_t len); // called from I2CPSession
void SendMsgTo (const uint8_t * payload, size_t len, const i2p::data::IdentHash& ident, uint32_t nonce); // called from I2CPSession
protected:
// implements LocalDestination
const uint8_t * GetEncryptionPrivateKey () const { return m_EncryptionPrivateKey; };
std::shared_ptr<const i2p::data::IdentityEx> GetIdentity () const { return m_Identity; };
protected:
// I2CP
void HandleDataMessage (const uint8_t * buf, size_t len);
void CreateNewLeaseSet (std::vector<std::shared_ptr<i2p::tunnel::InboundTunnel> > tunnels);