From 078cf4a84ab0d6bc061a0186c90cd472eb9982dd Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 9 Jan 2022 01:42:14 +0000 Subject: [PATCH] SHA1 HMAC is a keyed 160bit CRC anyway. Use that --- bridge_master.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bridge_master.py b/bridge_master.py index ca2038e..bb48fb6 100644 --- a/bridge_master.py +++ b/bridge_master.py @@ -39,7 +39,7 @@ import importlib.util import re import copy from setproctitle import setproctitle -from crccheck.crc import Crc32 +#from crccheck.crc import Crc32 # Twisted is pretty important, so I keep it separate from twisted.internet.protocol import Factory, Protocol @@ -1464,8 +1464,9 @@ class routerOBP(OPENBRIDGE): pkt_time = time() dmrpkt = _data[20:53] _bits = _data[15] - _pkt_crc = Crc32.calc(_data[4:53]) + #_pkt_crc = Crc32.calc(_data[4:53]) #_pkt_crc = Crc32.calc(dmrpkt) + _pkt_crc = _data[53:] # Match UNIT data, SMS/GPS, and send it to the dst_id if it is in SUB_MAP @@ -2062,7 +2063,8 @@ class routerHBP(HBSYSTEM): dmrpkt = _data[20:53] _bits = _data[15] - _pkt_crc = Crc32.calc(_data[4:53]) + #_pkt_crc = Crc32.calc(_data[4:53]) + _pkt_crc = _data[53:] _nine = bytes_3(9)