Browse Source

use Tag<32> for SSU key

pull/99/head
orignal 10 years ago
parent
commit
1742a72fe0
  1. 4
      RouterInfo.h
  2. 6
      SSU.cpp

4
RouterInfo.h

@ -61,7 +61,7 @@ namespace data @@ -61,7 +61,7 @@ namespace data
{
boost::asio::ip::address iHost;
int iPort;
uint8_t iKey[32];
Tag<32> iKey;
uint32_t iTag;
};
@ -73,7 +73,7 @@ namespace data @@ -73,7 +73,7 @@ namespace data
uint64_t date;
uint8_t cost;
// SSU only
uint8_t key[32]; // intro key for SSU
Tag<32> key; // intro key for SSU
std::vector<Introducer> introducers;
};

6
SSU.cpp

@ -271,7 +271,7 @@ namespace ssu @@ -271,7 +271,7 @@ namespace ssu
payload += 2;
*payload = 0; // challenge
payload++;
memcpy (payload, address->key, 32);
memcpy (payload, (const uint8_t *)address->key, 32);
payload += 32;
CryptoPP::RandomNumberGenerator& rnd = i2p::context.GetRandomNumberGenerator ();
*(uint32_t *)payload = htobe32 (rnd.GenerateWord32 ()); // nonce
@ -694,13 +694,13 @@ namespace ssu @@ -694,13 +694,13 @@ namespace ssu
{
// we are client
auto address = m_RemoteRouter->GetSSUAddress ();
return address ? address->key : nullptr;
return address ? (const uint8_t *)address->key : nullptr;
}
else
{
// we are server
auto address = i2p::context.GetRouterInfo ().GetSSUAddress ();
return address ? address->key : nullptr;
return address ? (const uint8_t *)address->key : nullptr;
}
}

Loading…
Cancel
Save