void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 12:33:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cryptField() used to obscure extended fields in HELLO cannot use mangleKey()

Browse source
This commit is contained in:
Adam Ierymenko 2017-03-10 17:34:41 -08:00
parent 7320e26730
commit 0c00b83702
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
node/IncomingPacket.cpp
View file

@ -320,7 +320,7 @@ bool IncomingPacket::_doHELLO(const RuntimeEnvironment *RR,const bool alreadyAut
// Get moon IDs and timestamps if present // Get moon IDs and timestamps if present
if ((ptr + 2) <= size()) { if ((ptr + 2) <= size()) {
unsigned int numMoons = at<uint16_t>(ptr); ptr += 2; const unsigned int numMoons = at<uint16_t>(ptr); ptr += 2;
for(unsigned int i=0;i<numMoons;++i) { for(unsigned int i=0;i<numMoons;++i) {
if ((World::Type)(*this)[ptr++] == World::TYPE_MOON) if ((World::Type)(*this)[ptr++] == World::TYPE_MOON)
moonIdsAndTimestamps.push_back(std::pair<uint64_t,uint64_t>(at<uint64_t>(ptr),at<uint64_t>(ptr + 8))); moonIdsAndTimestamps.push_back(std::pair<uint64_t,uint64_t>(at<uint64_t>(ptr),at<uint64_t>(ptr + 8)));

11
node/Packet.cpp
View file

@ -2025,14 +2025,9 @@ bool Packet::dearmor(const void *key)
void Packet::cryptField(const void *key,unsigned int start,unsigned int len) void Packet::cryptField(const void *key,unsigned int start,unsigned int len)
{ {
unsigned char mangledKey[32]; unsigned char discard[32];
unsigned char macKey[32]; Salsa20 s20(key,256,field(ZT_PACKET_IDX_IV,8));
_salsa20MangleKey((const unsigned char *)key,mangledKey); s20.crypt12(ZERO_KEY,discard,sizeof(discard)); // discard the first 32 bytes of key stream (the ones use for MAC in armor()) as a precaution
mangledKey[0] ^= 0x7f;
mangledKey[1] ^= ((start >> 8) & 0xff);
mangledKey[2] ^= (start & 0xff); // slightly alter key for this use case as an added guard against key stream reuse
Salsa20 s20(mangledKey,256,field(ZT_PACKET_IDX_IV,8));
s20.crypt12(ZERO_KEY,macKey,sizeof(macKey)); // discard the first 32 bytes of key stream (the ones use for MAC in armor()) as a precaution
unsigned char *const ptr = field(start,len); unsigned char *const ptr = field(start,len);
s20.crypt12(ptr,ptr,len); s20.crypt12(ptr,ptr,len);
} }