mirror of
https://github.com/PurpleI2P/i2pd.git
synced 2025-01-22 04:04:16 +00:00
use Tag<32> for SSU key
This commit is contained in:
parent
ef417eb8d9
commit
1742a72fe0
@ -61,7 +61,7 @@ namespace data
|
|||||||
{
|
{
|
||||||
boost::asio::ip::address iHost;
|
boost::asio::ip::address iHost;
|
||||||
int iPort;
|
int iPort;
|
||||||
uint8_t iKey[32];
|
Tag<32> iKey;
|
||||||
uint32_t iTag;
|
uint32_t iTag;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -73,7 +73,7 @@ namespace data
|
|||||||
uint64_t date;
|
uint64_t date;
|
||||||
uint8_t cost;
|
uint8_t cost;
|
||||||
// SSU only
|
// SSU only
|
||||||
uint8_t key[32]; // intro key for SSU
|
Tag<32> key; // intro key for SSU
|
||||||
std::vector<Introducer> introducers;
|
std::vector<Introducer> introducers;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
6
SSU.cpp
6
SSU.cpp
@ -271,7 +271,7 @@ namespace ssu
|
|||||||
payload += 2;
|
payload += 2;
|
||||||
*payload = 0; // challenge
|
*payload = 0; // challenge
|
||||||
payload++;
|
payload++;
|
||||||
memcpy (payload, address->key, 32);
|
memcpy (payload, (const uint8_t *)address->key, 32);
|
||||||
payload += 32;
|
payload += 32;
|
||||||
CryptoPP::RandomNumberGenerator& rnd = i2p::context.GetRandomNumberGenerator ();
|
CryptoPP::RandomNumberGenerator& rnd = i2p::context.GetRandomNumberGenerator ();
|
||||||
*(uint32_t *)payload = htobe32 (rnd.GenerateWord32 ()); // nonce
|
*(uint32_t *)payload = htobe32 (rnd.GenerateWord32 ()); // nonce
|
||||||
@ -694,13 +694,13 @@ namespace ssu
|
|||||||
{
|
{
|
||||||
// we are client
|
// we are client
|
||||||
auto address = m_RemoteRouter->GetSSUAddress ();
|
auto address = m_RemoteRouter->GetSSUAddress ();
|
||||||
return address ? address->key : nullptr;
|
return address ? (const uint8_t *)address->key : nullptr;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// we are server
|
// we are server
|
||||||
auto address = i2p::context.GetRouterInfo ().GetSSUAddress ();
|
auto address = i2p::context.GetRouterInfo ().GetSSUAddress ();
|
||||||
return address ? address->key : nullptr;
|
return address ? (const uint8_t *)address->key : nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user