A more eloquent solution

flipperdevices · Jan 3, 2025 · deef40f · deef40f
1 parent 8a00874
commit deef40f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/lib/nfc/protocols/mf_desfire/mf_desfire.h b/lib/nfc/protocols/mf_desfire/mf_desfire.h
@@ -131,6 +131,7 @@ typedef enum {
     MfDesfireErrorProtocol,
     MfDesfireErrorTimeout,
     MfDesfireErrorAuthentication,
+    MfDesfireErrorCommandNotSupported,
 } MfDesfireError;
 
 typedef struct {

diff --git a/lib/nfc/protocols/mf_desfire/mf_desfire_poller.c b/lib/nfc/protocols/mf_desfire/mf_desfire_poller.c
@@ -77,19 +77,17 @@ static NfcCommand mf_desfire_poller_handler_read_version(MfDesfirePoller* instan
 static NfcCommand mf_desfire_poller_handler_read_free_memory(MfDesfirePoller* instance) {
     NfcCommand command = NfcCommandContinue;
 
-    if(instance->data->version.hw_major == 0x00 && instance->data->version.hw_minor == 0x02) {
-        instance->state = MfDesfirePollerStateReadMasterKeySettings;
-        return command;
-    }
-
     instance->error = mf_desfire_poller_read_free_memory(instance, &instance->data->free_memory);
     if(instance->error == MfDesfireErrorNone) {
         FURI_LOG_D(TAG, "Read free memory success");
         instance->state = MfDesfirePollerStateReadMasterKeySettings;
     } else if(instance->error == MfDesfireErrorNotPresent) {
-        FURI_LOG_D(TAG, "Read free memoty is unsupported");
+        FURI_LOG_D(TAG, "Read free memory is unsupported");
         instance->state = MfDesfirePollerStateReadMasterKeySettings;
         command = NfcCommandReset;
+    } else if(instance->error == MfDesfireErrorCommandNotSupported) {
+        FURI_LOG_D(TAG, "Read free memory is unsupported");
+        instance->state = MfDesfirePollerStateReadMasterKeySettings;
     } else {
         FURI_LOG_E(TAG, "Failed to read free memory");
         iso14443_4a_poller_halt(instance->iso14443_4a_poller);

diff --git a/lib/nfc/protocols/mf_desfire/mf_desfire_poller_i.c b/lib/nfc/protocols/mf_desfire/mf_desfire_poller_i.c
@@ -25,6 +25,8 @@ MfDesfireError mf_desfire_process_status_code(uint8_t status_code) {
         return MfDesfireErrorNone;
     case MF_DESFIRE_STATUS_AUTHENTICATION_ERROR:
         return MfDesfireErrorAuthentication;
+    case MF_DESFIRE_STATUS_ILLEGAL_COMMAND_CODE:
+        return MfDesfireErrorCommandNotSupported;
     default:
         return MfDesfireErrorProtocol;
     }