From a5be07f360deb2e31a83231129925df4c197bc57 Mon Sep 17 00:00:00 2001 From: Adam <37312852+Aptimex@users.noreply.github.com> Date: Sat, 28 Sep 2024 18:12:26 -0600 Subject: [PATCH 1/5] Better key selection string --- traceKeyExtractor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/traceKeyExtractor.py b/traceKeyExtractor.py index 381deff..2d075c9 100644 --- a/traceKeyExtractor.py +++ b/traceKeyExtractor.py @@ -234,7 +234,7 @@ def bruteForce(args): line = line.decode("utf-8") #Convert from byte array to string #Search for the line that says valid key. Example: "Valid Key found [ 63654db94d97 ] - if "Valid Key" not in line: + if "matches candidate" not in line: continue print(f" {line}") @@ -288,4 +288,4 @@ def testCommands(commandList, arguments = ""): -main(); #Run main program \ No newline at end of file +main(); #Run main program From 6309606c77b4593b7605d91785866b3a564e08e8 Mon Sep 17 00:00:00 2001 From: Adam <37312852+Aptimex@users.noreply.github.com> Date: Sat, 28 Sep 2024 18:35:43 -0600 Subject: [PATCH 2/5] Both checks to mimimize false positives --- traceKeyExtractor.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/traceKeyExtractor.py b/traceKeyExtractor.py index 2d075c9..3e23c24 100644 --- a/traceKeyExtractor.py +++ b/traceKeyExtractor.py @@ -233,8 +233,9 @@ def bruteForce(args): for line in output.splitlines(): line = line.decode("utf-8") #Convert from byte array to string - #Search for the line that says valid key. Example: "Valid Key found [ 63654db94d97 ] - if "matches candidate" not in line: + #Search for the line that says valid key. Example: "Valid Key found [ 63654db94d97 ] - matches candidate" + #In rare cases, multiple possible keys will be found. The "matches candidate" tag should indicate the right one + if "Valid Key" not in line or "matches candidate" not in line: continue print(f" {line}") From 56558ec829d374a303e863d2f00dcc4e20ff3e05 Mon Sep 17 00:00:00 2001 From: "Queen Vinyl Da.i'gyu-Kazotetsu" Date: Wed, 4 Dec 2024 10:57:27 -0800 Subject: [PATCH 3/5] Update logic --- traceKeyExtractor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/traceKeyExtractor.py b/traceKeyExtractor.py index beaacd5..fc40d56 100644 --- a/traceKeyExtractor.py +++ b/traceKeyExtractor.py @@ -202,7 +202,7 @@ def bruteForce(args): #Search for the line that says valid key. Example: "Valid Key found [ 63654db94d97 ] - matches candidate" #In rare cases, multiple possible keys will be found. The "matches candidate" tag should indicate the right one - if "Valid Key" not in line or "matches candidate" not in line: + if not ("Valid Key" in line and "matches candidate" in line): continue print(f" {line}") From 94209e9f1d89c0ba63e6abc047c163041633aabc Mon Sep 17 00:00:00 2001 From: "Queen Vinyl Da.i'gyu-Kazotetsu" Date: Wed, 4 Dec 2024 10:57:32 -0800 Subject: [PATCH 4/5] Bump version number --- traceKeyExtractor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/traceKeyExtractor.py b/traceKeyExtractor.py index fc40d56..7684658 100644 --- a/traceKeyExtractor.py +++ b/traceKeyExtractor.py @@ -28,7 +28,7 @@ def main(): global pm3Location,dictionaryFilepath,trace print("--------------------------------------------------------") - print("RFID Key Extractor v0.1 - Bambu Research Group 2024") + print("RFID Key Extractor v0.2 - Bambu Research Group 2024") print("--------------------------------------------------------") print("This will extract the keys from a trace file") print("that was saved from sniffing communication between") From dbb7374993692fe4fb172c42e5663532efcc4aea Mon Sep 17 00:00:00 2001 From: Ikko Eltociear Ashimine Date: Fri, 24 Jan 2025 00:21:11 +0900 Subject: [PATCH 5/5] docs: update README.md unknwn -> unknown --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c2726bc..c544110 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ This is a research group dedicated to documenting the data structures used by Ba * No, tags are digitally signed. Even if you modify the contents, the printer will reject any tags without a valid RSA signature * An [Open Source RFID Tag](OpenSourceRfid.md) has been proposed to allow anyone to create / modify their own tags. This must be adopted by printer manufacturers, or you can mod your own printer for support * **What are the next steps for this project?** - * Decyphering the rest of the unknwn tag content + * Decyphering the rest of the unknown tag content * Custom AMS firmware that allows custom tags to be read while ignoring the signature * See [Todos/Timeline/Next steps](#todostimelinenext-steps) for more info