Merge branch 'master' into wsl2_docs

Signed-off-by: Iceman <iceman@iuse.se>

CHANGELOG.md

@@ -3,10 +3,12 @@ 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 `lf em 4x70 brute` - now works as expected (@adite)
  - Fixed the lf sampling when bits_per_sample is less than 8 (@wh201906)
  - Added `lf em 4x70 brute` command (@adite)
  - Added documentation for usage of Proxmark3 under WSL2 (@henrygab)
  - Fixed device permissions via updated `udev` rules (@henrygab)
+ - Added `--back` option to `clear` command to clear the scrollback buffer (@wh201906)
 
 ## [Nitride.4.16191][2023-01-29]
  - Changed `build_all_firmwares.sh` to fit GENERIC 256kb firmware images (@doegox)

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

client/src/cmdmain.c

@@ -300,15 +300,23 @@ static int CmdClear(const char *Cmd) {
     CLIParserContext *ctx;
     CLIParserInit(&ctx, "clear",
                   "Clear the Proxmark3 client terminal screen",
-                  "clear"
+                  "clear      -> clear the terminal screen\n"
+                  "clear -b   -> clear the terminal screen and the scrollback buffer"
                  );
     void *argtable[] = {
         arg_param_begin,
+        arg_lit0("b", "back", "also clear the scrollback buffer"),
         arg_param_end
     };
     CLIExecWithReturn(ctx, Cmd, argtable, true);
+    bool scrollback = arg_get_lit(ctx, 1);
     CLIParserFree(ctx);
-    PrintAndLogEx(NORMAL, _CLEAR_ _TOP_ "");
+
+    if (!scrollback)
+        PrintAndLogEx(NORMAL, _CLEAR_ _TOP_ "");
+    else
+        PrintAndLogEx(NORMAL, _CLEAR_ _TOP_ _CLEAR_SCROLLBACK_ "");
+
     return PM3_SUCCESS;
 }
 

include/ansi.h

@@ -58,6 +58,7 @@
 #define _BACK_BRIGHT_WHITE_(s)   "\x1b[47;1m" s AEND
 
 #define _CLEAR_ "\x1b[2J"
+#define _CLEAR_SCROLLBACK_ "\x1b[3J"
 #define _TOP_   "\x1b[1;1f"
 
 #if defined(HAVE_READLINE)

pm3

@@ -441,6 +441,7 @@ done
 
 # if a port is already provided, let's just run the command as such
 for ARG; do
+    shift
     if [ "$ARG" == "-p" ]; then
         CMD "$@"
         exit $?