dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Roots now understand encrypted HELLO.

Browse source
This commit is contained in:
Adam Ierymenko 2024-09-26 19:47:57 -04:00
parent 2316a45a45
commit 0ab4e2f750
4 changed files with 57 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

34
node/Packet.hpp
View file

@ -111,6 +111,17 @@
*/
#define ZT_PROTO_FLAG_FRAGMENTED 0x40
/**
* Header flag indicating ephemeral keying and second encryption pass.
*
* If this is set, the packet will have an ephemeral key appended to it its payload
* will be encrypted with AES-CTR using this ephemeral key and the packet's header
* as an IV.
*
* Note that this is a reuse of a flag that has long been deprecated and ignored.
*/
#define ZT_PROTO_FLAG_EXTENDED_ARMOR 0x80
/**
* Verb flag indicating payload is compressed with LZ4
*/
@ -1153,6 +1164,29 @@ public:
b = (b & 0xc7) | (unsigned char)((c << 3) & 0x38); // bits: FFCCCHHH
}
/**
* @return True if packet is encrypted with an extra ephemeral key
*/
inline bool extendedArmor() const
{
return (((unsigned char)(*this)[ZT_PACKET_IDX_FLAGS] & ZT_PROTO_FLAG_EXTENDED_ARMOR) != 0);
}
/**
* Set this packet's extended armor flag
*
* @param f Extended armor flag value
*/
inline void setExtendedArmor(bool f)
{
if (f) {
(*this)[ZT_PACKET_IDX_FLAGS] |= (char)ZT_PROTO_FLAG_EXTENDED_ARMOR;
}
else {
(*this)[ZT_PACKET_IDX_FLAGS] &= (char)(~ZT_PROTO_FLAG_EXTENDED_ARMOR);
}
}
/**
* Get the trusted path ID for this packet (only meaningful if cipher is trusted path)
*