diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-09-16 13:02:10 -0400 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-09-16 13:02:10 -0400 |
| commit | ceb024ab03a114c8dadbbd393032231069981c45 (patch) | |
| tree | 7ff0045410d1c8faf2e98b20632fad173ef603a9 /node/Switch.cpp | |
| parent | 3b2d98e7dcf4102f855006cc9f5d5000d8df0223 (diff) | |
| download | infinitytier-ceb024ab03a114c8dadbbd393032231069981c45.tar.gz infinitytier-ceb024ab03a114c8dadbbd393032231069981c45.zip | |
Integrating new crypto, work still in progress...
Diffstat (limited to 'node/Switch.cpp')
| -rw-r--r-- | node/Switch.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/node/Switch.cpp b/node/Switch.cpp index e0ffba0b..e17f2196 100644 --- a/node/Switch.cpp +++ b/node/Switch.cpp @@ -218,7 +218,7 @@ bool Switch::sendHELLO(const SharedPtr<Peer> &dest,Demarc::Port localPort,const outp.append((uint16_t)ZEROTIER_ONE_VERSION_REVISION); outp.append(now); _r->identity.serialize(outp,false); - outp.hmacSet(dest->macKey()); + outp.macSet(dest->macKey()); if (_r->demarc->send(localPort,remoteAddr,outp.data(),outp.size(),-1)) { dest->onSent(_r,false,Packet::VERB_HELLO,now); @@ -277,7 +277,7 @@ bool Switch::unite(const Address &p1,const Address &p2,bool force) outp.append(cg.first.rawIpData(),4); } outp.encrypt(p1p->cryptKey()); - outp.hmacSet(p1p->macKey()); + outp.macSet(p1p->macKey()); if (p1p->send(_r,outp.data(),outp.size(),now)) p1p->onSent(_r,false,Packet::VERB_RENDEZVOUS,now); } @@ -293,7 +293,7 @@ bool Switch::unite(const Address &p1,const Address &p2,bool force) outp.append(cg.second.rawIpData(),4); } outp.encrypt(p2p->cryptKey()); - outp.hmacSet(p2p->macKey()); + outp.macSet(p2p->macKey()); if (p2p->send(_r,outp.data(),outp.size(),now)) p2p->onSent(_r,false,Packet::VERB_RENDEZVOUS,now); } @@ -617,7 +617,7 @@ Address Switch::_sendWhoisRequest(const Address &addr,const Address *peersAlread Packet outp(supernode->address(),_r->identity.address(),Packet::VERB_WHOIS); addr.appendTo(outp); outp.encrypt(supernode->cryptKey()); - outp.hmacSet(supernode->macKey()); + outp.macSet(supernode->macKey()); uint64_t now = Utils::now(); if (supernode->send(_r,outp.data(),outp.size(),now)) { @@ -654,7 +654,7 @@ bool Switch::_trySend(const Packet &packet,bool encrypt) if (encrypt) tmp.encrypt(peer->cryptKey()); - tmp.hmacSet(peer->macKey()); + tmp.macSet(peer->macKey()); if (via->send(_r,tmp.data(),chunkSize,now)) { if (chunkSize < tmp.size()) { |