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

decrypt fix

Browse source
This commit is contained in:
Adam Ierymenko 2015-10-14 15:49:41 -07:00
parent 59389b3dce
commit 9ece8c465e
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
node/Cluster.cpp
View file

@ -108,8 +108,8 @@ void Cluster::handleIncomingStateMessage(const void *msg,unsigned int len)
return; return;
// Decrypt! // Decrypt!
dmsg.setSize(len - 16); dmsg.setSize(len - 24);
s20.decrypt12(reinterpret_cast<const char *>(msg) + 16,const_cast<void *>(dmsg.data()),dmsg.size()); s20.decrypt12(reinterpret_cast<const char *>(msg) + 24,const_cast<void *>(dmsg.data()),dmsg.size());
} }
if (dmsg.size() < 2) if (dmsg.size() < 2)
@ -343,6 +343,7 @@ void Cluster::addMember(uint16_t memberId)
Utils::getSecureRandom(iv,16); Utils::getSecureRandom(iv,16);
_members[memberId].q.append(iv,16); _members[memberId].q.append(iv,16);
_members[memberId].q.addSize(8); // room for MAC _members[memberId].q.addSize(8); // room for MAC
_members[memberId].q.append((uint16_t)_id);
} }
void Cluster::_send(uint16_t memberId,const void *msg,unsigned int len) void Cluster::_send(uint16_t memberId,const void *msg,unsigned int len)
@ -363,7 +364,7 @@ void Cluster::_flush(uint16_t memberId)
{ {
_Member &m = _members[memberId]; _Member &m = _members[memberId];
// assumes m.lock is locked! // assumes m.lock is locked!
if (m.q.size() > 24) { if (m.q.size() > 26) { // 16-byte IV + 8-byte MAC + 2-byte cluster member ID (latter two bytes are inside crypto envelope)
// Create key from member's key and IV // Create key from member's key and IV
char keytmp[32]; char keytmp[32];
memcpy(keytmp,m.key,32); memcpy(keytmp,m.key,32);
@ -394,6 +395,7 @@ void Cluster::_flush(uint16_t memberId)
Utils::getSecureRandom(iv,16); Utils::getSecureRandom(iv,16);
m.q.append(iv,16); m.q.append(iv,16);
m.q.addSize(8); // room for MAC m.q.addSize(8); // room for MAC
m.q.append((uint16_t)_id);
} }
} }