mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-06-06 20:43:44 +02:00
Merge f574475317
into cadfa0bc4d
This commit is contained in:
commit
33c35f1331
1 changed files with 1 additions and 1 deletions
|
@ -1268,7 +1268,7 @@ public:
|
||||||
unsigned char &b = (*this)[ZT_PACKET_IDX_FLAGS];
|
unsigned char &b = (*this)[ZT_PACKET_IDX_FLAGS];
|
||||||
b = (b & 0xc7) | (unsigned char)((c << 3) & 0x38); // bits: FFCCCHHH
|
b = (b & 0xc7) | (unsigned char)((c << 3) & 0x38); // bits: FFCCCHHH
|
||||||
// Set DEPRECATED "encrypted" flag -- used by pre-1.0.3 peers
|
// Set DEPRECATED "encrypted" flag -- used by pre-1.0.3 peers
|
||||||
if (c == ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_SALSA2012) {
|
if (c == ZT_PROTO_CIPHER_SUITE__C25519_POLY1305_SALSA2012 || c == ZT_PROTO_CIPHER_SUITE__AES_GMAC_SIV) {
|
||||||
b |= ZT_PROTO_FLAG_ENCRYPTED;
|
b |= ZT_PROTO_FLAG_ENCRYPTED;
|
||||||
} else {
|
} else {
|
||||||
b &= (~ZT_PROTO_FLAG_ENCRYPTED);
|
b &= (~ZT_PROTO_FLAG_ENCRYPTED);
|
||||||
|
|
Loading…
Add table
Reference in a new issue