jacob.eva/Reticulum
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mask entire header

Browse Source
This commit is contained in:
Mark Qvist 2023-02-03 00:11:11 +01:00
parent 53ceafcebd
commit 6fac96ec18
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
RNS/Transport.py
View File

@ -603,9 +603,15 @@ class Transport:
# Mask payload # Mask payload
i = 0; masked_raw = b"" i = 0; masked_raw = b""
for byte in new_raw: for byte in new_raw:
if i == 1 or i > interface.ifac_size+1: if i == 0:
# Mask first header byte, but make sure the
# IFAC flag is still set
masked_raw += bytes([byte ^ mask[i] | 0x80])
elif i == 1 or i > interface.ifac_size+1:
# Mask second header byte and payload
masked_raw += bytes([byte ^ mask[i]]) masked_raw += bytes([byte ^ mask[i]])
else: else:
# Don't mask the IFAC itself
masked_raw += bytes([byte]) masked_raw += bytes([byte])
i += 1 i += 1
@ -940,9 +946,11 @@ class Transport:
# Unmask payload # Unmask payload
i = 0; unmasked_raw = b"" i = 0; unmasked_raw = b""
for byte in raw: for byte in raw:
if i == 1 or i > interface.ifac_size+1: if i <= 1 or i > interface.ifac_size+1:
# Unmask header bytes and payload
unmasked_raw += bytes([byte ^ mask[i]]) unmasked_raw += bytes([byte ^ mask[i]])
else: else:
# Don't unmask IFAC itself
unmasked_raw += bytes([byte]) unmasked_raw += bytes([byte])
i += 1 i += 1
raw = unmasked_raw raw = unmasked_raw