update latest code

Author: ps2

analysis/analysis.py

@@ -27,7 +27,7 @@ def packets_to_pandas(packets):
 # This expresses our theory about which bits are message hash, and which bits
 # are included in message hash calculation. Takes a full message and splits it
 # into (message,hash)
-def parts(data):
+def message_hash_split(data):
     # Everything except ID1, byte 4 (sequence & flags), packet crc, and 16bit chksum
     msg = data[5:-3]
     chksum = data[-3:-1]
@@ -36,15 +36,14 @@ def parts(data):
 # Builds a dictionary that maps bitwise observed changes in messages to
 # bitwise changes in message hash
 def build_bitdiff_dictionary(packets):
-    data = [parts(p.tx_data()) for p in packets]
+    unique_packet_data = set([p.tx_data() for p in packets])
+    data = [message_hash_split(d) for d in unique_packet_data]
 
     cracked_bits_dict = {}
     for c in itertools.combinations(data, 2):
         d = DiffMessage(c)
         if d.diff_bits_count == 0:
             continue
-        if d.diff_bits_key in cracked_bits_dict:
-            cracked_bits_dict[d.diff_bits_key].update_observation(d)
-        else:
-            cracked_bits_dict[d.diff_bits_key] = d
+        if d.diff_bits_key not in cracked_bits_dict:
+            cracked_bits_dict[d.diff_bits_key] = d.dc
     return cracked_bits_dict