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

But since we are now using middle 3 bits we can assign sane values for the cipher suite enum.

Browse source
This commit is contained in:
Adam Ierymenko 2014-10-02 11:13:53 -07:00
parent 17da733f97
commit dee86e2448
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
node/Packet.hpp
View file

@ -85,7 +85,7 @@
* sent in the clear. Key agreement is performed using Curve25519 elliptic * sent in the clear. Key agreement is performed using Curve25519 elliptic
* curve Diffie-Hellman. * curve Diffie-Hellman.
*/ */
#define ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_NONE 0x0 #define ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_NONE 0
/** /**
* Cipher suite: Curve25519/Poly1305/Salsa20/12 * Cipher suite: Curve25519/Poly1305/Salsa20/12
@ -95,7 +95,7 @@
* the remaining Salsa20/12 key stream. Key agreement is performed using * the remaining Salsa20/12 key stream. Key agreement is performed using
* Curve25519 elliptic curve Diffie-Hellman. * Curve25519 elliptic curve Diffie-Hellman.
*/ */
#define ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_SALSA2012 0x4 #define ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_SALSA2012 1
/** /**
* Cipher suite: Curve25519/AES256-GCM * Cipher suite: Curve25519/AES256-GCM
@ -105,7 +105,7 @@
* *
* (Not implemented yet in client but reserved for future use.) * (Not implemented yet in client but reserved for future use.)
*/ */
#define ZT_PROTO_CIPHER_SUITE__C25519_AES256_GCM 0x1 #define ZT_PROTO_CIPHER_SUITE__C25519_AES256_GCM 2
/** /**
* Header flag indicating that a packet is fragmented * Header flag indicating that a packet is fragmented
@ -1017,10 +1017,9 @@ public:
*/ */
inline unsigned int cipher() const inline unsigned int cipher() const
{ {
unsigned char b = (*this)[ZT_PACKET_IDX_FLAGS];
//return (((unsigned int)(*this)[ZT_PACKET_IDX_FLAGS] & 0x38) >> 3); //return (((unsigned int)(*this)[ZT_PACKET_IDX_FLAGS] & 0x38) >> 3);
// Use DEPRECATED 0x80 "encrypted" flag -- this will go away once there are no more <1.0.0 peers on the net // Use DEPRECATED 0x80 "encrypted" flag -- this will go away once there are no more <1.0.0 peers on the net
return ((b & 0x80) == 0) ? ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_NONE : ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_SALSA2012; return (((*this)[ZT_PACKET_IDX_FLAGS] & 0x80) == 0) ? ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_NONE : ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_SALSA2012;
} }
/** /**