From 87c6053d6feb5ea4c90b25585e410a0724dfbbe6 Mon Sep 17 00:00:00 2001
From: quantum-x <simon.yorkston@gmail.com>
Date: Tue, 3 Nov 2015 18:11:51 +0100
Subject: [PATCH] Updating nfc-mfclassic.c

Modifying behavior relating to magic cards.
If a user has a 'magic2' card (IE, direct-write, not a 'fully magic' card) - we'll warn them that they don't need to use the W / R modes, and then proceed with the unlock operation, instead of exiting.
---
 utils/nfc-mfclassic.c | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/utils/nfc-mfclassic.c b/utils/nfc-mfclassic.c
index 55809fc..4ddc4a3 100644
--- a/utils/nfc-mfclassic.c
+++ b/utils/nfc-mfclassic.c
@@ -233,11 +233,6 @@ authenticate(uint32_t uiBlock)
 static bool
 unlock_card(void)
 {
-  if (magic2) {
-    printf("Don't use R/W with this card, this is not required!\n");
-    return false;
-  }
-
   // Configure the CRC
   if (nfc_device_set_property_bool(pnd, NP_HANDLE_CRC, false) < 0) {
     nfc_perror(pnd, "nfc_configure");
@@ -314,9 +309,17 @@ read_card(int read_unlocked)
   bool    bFailure = false;
   uint32_t uiReadBlocks = 0;
 
-  if (read_unlocked)
-    if (!unlock_card())
-      return false;
+  if (read_unlocke) {
+    //If the user is attempting an unlocked read, but has a direct-write type magic card, they don't 
+    //need to use the R mode. We'll trigger a warning and let them proceed.
+    if (magic2) {
+      printf("Note: This card does not require an unlocked write (R) \n");
+    } else {
+      //If User has requested an unlocked read, but we're unable to unlock the card, we'll error out.
+      if (!unlock_card()) {
+        return false; 
+    }
+  }
 
   printf("Reading out %d blocks |", uiBlocks + 1);
   // Read the card from end to begin
@@ -384,9 +387,17 @@ write_card(int write_block_zero)
   bool    bFailure = false;
   uint32_t uiWriteBlocks = 0;
 
-  if (write_block_zero)
-    if (!unlock_card())
-      return false;
+  if (write_block_zero) {
+    //If the user is attempting an unlocked write, but has a direct-write type magic card, they don't 
+    //need to use the W mode. We'll trigger a warning and let them proceed.
+    if (magic2) {
+      printf("Note: This card does not require an unlocked write (W) \n");
+    } else {
+      //If User has requested an unlocked write, but we're unable to unlock the card, we'll error out.
+      if (!unlock_card()) {
+        return false; 
+    }
+  }
 
   printf("Writing %d blocks |", uiBlocks + 1);
   // Write the card from begin to end;