From cb2200463589f9bc888d57ffd581da605c343d9c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Wed, 10 Jun 2020 08:43:29 +0200
Subject: [PATCH] chg "hf mf cwipe" - textual and also use magic wipe card

---
 client/src/mifare/mifarehost.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/client/src/mifare/mifarehost.c b/client/src/mifare/mifarehost.c
index cf8a414c9..8e15cb509 100644
--- a/client/src/mifare/mifarehost.c
+++ b/client/src/mifare/mifarehost.c
@@ -883,8 +883,11 @@ int mfCWipe(uint8_t *uid, uint8_t *atqa, uint8_t *sak) {
     int res;
     for (int blockNo = 0; blockNo < 4 * 16; blockNo++) {
         for (int retry = 0; retry < 3; retry++) {
+
+            PrintAndLogEx(INPLACE, "wipe block %d", blockNo);
+
             if (blockNo == 0) {
-                res = mfCSetBlock(blockNo, block0, NULL, params);
+                res = mfCSetBlock(blockNo, block0, NULL, (params | MAGIC_WIPE));
             } else {
                 if (mfIsSectorTrailer(blockNo))
                     res = mfCSetBlock(blockNo, blockK, NULL, params);
@@ -894,16 +897,17 @@ int mfCWipe(uint8_t *uid, uint8_t *atqa, uint8_t *sak) {
 
             if (res == PM3_SUCCESS)
                 break;
-            PrintAndLogEx(WARNING, "Retry block[%d]...", blockNo);
+
+            PrintAndLogEx(WARNING, "retry block %d ...", blockNo);
         }
 
         if (res) {
-            PrintAndLogEx(ERR, "Error setting block[%d]: %d", blockNo, res);
+            PrintAndLogEx(ERR, "error setting block %d (%d)", blockNo, res);
             return res;
         }
     }
     DropField();
-
+    PrintAndLogEx(NORMAL, "");
     return PM3_SUCCESS;
 }