William/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2024-11-26 23:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Work on tunnels

Browse Source
This commit is contained in:
Mark Qvist 2021-09-18 18:32:12 +02:00
parent 1da8a0c8f1
commit 58e4bf3c80
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RNS/Transport.py
View File

@ -929,7 +929,7 @@ class Transport:
RNS.log("Tunnel synth for "+str(interface)) RNS.log("Tunnel synth for "+str(interface))
RNS.log("Transport ID : "+str(Transport.identity)) RNS.log("Transport ID : "+str(Transport.identity))
RNS.log("Tunnel ID : "+RNS.hexrep(tunnel_id)) RNS.log("Tunnel ID : "+RNS.hexrep(tunnel_id))
RNS.log("IF hash : "+RNS.hexrep(tunnel_id)) RNS.log("IF hash : "+RNS.hexrep(interface_hash))
RNS.log("Public key : "+RNS.hexrep(public_key)) RNS.log("Public key : "+RNS.hexrep(public_key))
RNS.log("Signature : "+RNS.hexrep(signature)) RNS.log("Signature : "+RNS.hexrep(signature))
@ -948,7 +948,7 @@ class Transport:
if len(data) == expected_length: if len(data) == expected_length:
public_key = data[:RNS.Identity.KEYSIZE//8] public_key = data[:RNS.Identity.KEYSIZE//8]
interface_hash = data[RNS.Identity.KEYSIZE//8:RNS.Identity.KEYSIZE//8+RNS.Identity.HASHLENGTH//8] interface_hash = data[RNS.Identity.KEYSIZE//8:RNS.Identity.KEYSIZE//8+RNS.Identity.HASHLENGTH//8]
tunnel_id_data = data[:RNS.Identity.KEYSIZE//8+RNS.Identity.HASHLENGTH] tunnel_id_data = public_key+interface_hash
tunnel_id = RNS.Identity.full_hash(tunnel_id_data) tunnel_id = RNS.Identity.full_hash(tunnel_id_data)
random_hash = data[RNS.Identity.KEYSIZE//8+RNS.Identity.HASHLENGTH:RNS.Identity.KEYSIZE//8+RNS.Identity.HASHLENGTH//8+RNS.Reticulum.TRUNCATED_HASHLENGTH//8] random_hash = data[RNS.Identity.KEYSIZE//8+RNS.Identity.HASHLENGTH:RNS.Identity.KEYSIZE//8+RNS.Identity.HASHLENGTH//8+RNS.Reticulum.TRUNCATED_HASHLENGTH//8]
signature = data[RNS.Identity.KEYSIZE//8+RNS.Identity.HASHLENGTH//8+RNS.Reticulum.TRUNCATED_HASHLENGTH//8:expected_length] signature = data[RNS.Identity.KEYSIZE//8+RNS.Identity.HASHLENGTH//8+RNS.Reticulum.TRUNCATED_HASHLENGTH//8:expected_length]