Merge pull request #1895 from adite/master

Fix broken 'lf em 4x70 brute' command

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)
 

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) {

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;
         }