From c7825a2adf5aa1a4c9021046662e241d8dc1ab4d Mon Sep 17 00:00:00 2001 From: adite Date: Wed, 1 Feb 2023 19:28:31 +0100 Subject: [PATCH 1/2] Fix bug in 'lf em 4x70 brute' command --- armsrc/em4x70.c | 2 +- client/src/cmdlfem4x70.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/armsrc/em4x70.c b/armsrc/em4x70.c index 545491447..066aad58f 100644 --- a/armsrc/em4x70.c +++ b/armsrc/em4x70.c @@ -362,7 +362,7 @@ static int bruteforce(const uint8_t address, const uint8_t *rnd, const uint8_t * uint8_t rev_rnd[7]; uint8_t temp_rnd[7]; - reverse_arraycopy((uint8_t *)rnd, rev_rnd, sizeof(rnd)); + reverse_arraycopy((uint8_t *)rnd, rev_rnd, sizeof(rev_rnd)); memcpy(temp_rnd, rnd, sizeof(temp_rnd)); for (int k = start_key; k <= 0xFFFF; ++k) { diff --git a/client/src/cmdlfem4x70.c b/client/src/cmdlfem4x70.c index f008d9947..e90c688c1 100644 --- a/client/src/cmdlfem4x70.c +++ b/client/src/cmdlfem4x70.c @@ -306,8 +306,8 @@ int CmdEM4x70Brute(const char *Cmd) { break; } - // should be done in about 30 minutes - if (timeout > ((30 * 60000) / TIMEOUT)) { + // should be done in about 60 minutes. + if (timeout > ((60 * 60000) / TIMEOUT)) { PrintAndLogEx(WARNING, "\nNo response from Proxmark3. Aborting..."); break; } From 5bd8bd13dcfd7d2be4ed040fde29bc69570dc199 Mon Sep 17 00:00:00 2001 From: adite Date: Wed, 1 Feb 2023 19:33:52 +0100 Subject: [PATCH 2/2] Add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba2f8f322..1d8a9226b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file. This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log... ## [unreleased][unreleased] + - Fixed broken `lf em 4x70 brute` command (@adite) - Fixed the lf sampling when bits_per_sample is less than 8 (@wh201906) - Added `lf em 4x70 brute` command (@adite)