read error for MFC

lib/asn1/NFCSend.c

@@ -35,21 +35,33 @@ asn_TYPE_member_t asn_MBR_NFCSend_1[] = {
 		0, 0, /* No default value */
 		"timeOut"
 		},
+	{ ATF_POINTER, 1, offsetof(struct NFCSend, format),
+		(ASN_TAG_CLASS_CONTEXT | (5 << 2)),
+		-1,	/* IMPLICIT tag at current level */
+		&asn_DEF_OCTET_STRING,
+		0,
+		{ 0, 0, 0 },
+		0, 0, /* No default value */
+		"format"
+		},
 };
+static const int asn_MAP_NFCSend_oms_1[] = { 3 };
 static const ber_tlv_tag_t asn_DEF_NFCSend_tags_1[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static const asn_TYPE_tag2member_t asn_MAP_NFCSend_tag2el_1[] = {
     { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* data */
     { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* protocol */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* timeOut */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* timeOut */
+    { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 3, 0, 0 } /* format */
 };
 asn_SEQUENCE_specifics_t asn_SPC_NFCSend_specs_1 = {
 	sizeof(struct NFCSend),
 	offsetof(struct NFCSend, _asn_ctx),
 	asn_MAP_NFCSend_tag2el_1,
-	3,	/* Count of tags in the map */
-	0, 0, 0,	/* Optional elements (not needed) */
+	4,	/* Count of tags in the map */
+	asn_MAP_NFCSend_oms_1,	/* Optional members */
+	1, 0,	/* Root/Additions */
 	-1,	/* First extension addition */
 };
 asn_TYPE_descriptor_t asn_DEF_NFCSend = {
@@ -64,7 +76,7 @@ asn_TYPE_descriptor_t asn_DEF_NFCSend = {
 		/sizeof(asn_DEF_NFCSend_tags_1[0]), /* 1 */
 	{ 0, 0, SEQUENCE_constraint },
 	asn_MBR_NFCSend_1,
-	3,	/* Elements count */
+	4,	/* Elements count */
 	&asn_SPC_NFCSend_specs_1	/* Additional specs */
 };
 

lib/asn1/NFCSend.h

@@ -26,6 +26,7 @@ typedef struct NFCSend {
 	OCTET_STRING_t	 data;
 	Protocol_t	 protocol;
 	long	 timeOut;
+	OCTET_STRING_t	*format	/* OPTIONAL */;
 	
 	/* Context for parsing across buffer boundaries */
 	asn_struct_ctx_t _asn_ctx;
@@ -34,7 +35,7 @@ typedef struct NFCSend {
 /* Implementation */
 extern asn_TYPE_descriptor_t asn_DEF_NFCSend;
 extern asn_SEQUENCE_specifics_t asn_SPC_NFCSend_specs_1;
-extern asn_TYPE_member_t asn_MBR_NFCSend_1[3];
+extern asn_TYPE_member_t asn_MBR_NFCSend_1[4];
 
 #ifdef __cplusplus
 }

seader.asn1

@@ -59,7 +59,8 @@ NFCCommand ::= CHOICE {
 NFCSend ::= SEQUENCE {
   data [0] IMPLICIT OCTET STRING,
   protocol [1] IMPLICIT Protocol,
-  timeOut [2] IMPLICIT INTEGER
+  timeOut [2] IMPLICIT INTEGER,
+  format [5] IMPLICIT OCTET STRING OPTIONAL
 }
 
 -- omnikey_5326_dfr_softwaredeveloperguide 4.2

seader_worker.c

@@ -6,6 +6,7 @@
 
 #define APDU_HEADER_LEN 5
 #define ASN1_PREFIX 6
+#define ASN1_DEBUG true
 
 #define RFAL_PICOPASS_TXRX_FLAGS                                                    \
     (FURI_HAL_NFC_LL_TXRX_FLAGS_CRC_TX_MANUAL | FURI_HAL_NFC_LL_TXRX_FLAGS_AGC_ON | \
@@ -159,12 +160,27 @@ bool mf_df_check_card_type(uint8_t ATQA0, uint8_t ATQA1, uint8_t SAK) {
     return ATQA0 == 0x44 && ATQA1 == 0x03 && SAK == 0x20;
 }
 
+bool mf_classic_check_card_type(uint8_t ATQA0, uint8_t ATQA1, uint8_t SAK) {
+    UNUSED(ATQA1);
+    if((ATQA0 == 0x44 || ATQA0 == 0x04) && (SAK == 0x08 || SAK == 0x88 || SAK == 0x09)) {
+        return true;
+    } else if((ATQA0 == 0x01) && (ATQA1 == 0x0F) && (SAK == 0x01)) {
+        //skylanders support
+        return true;
+    } else if((ATQA0 == 0x42 || ATQA0 == 0x02) && (SAK == 0x18)) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
 bool read_nfc(SeaderUartBridge* seader_uart) {
     FuriHalNfcDevData nfc_data = {};
     bool rtn = false;
     if(furi_hal_nfc_detect(&nfc_data, 300)) {
         // Process first found device
         if(nfc_data.type == FuriHalNfcTypeA) {
+            FURI_LOG_D(TAG, "NFC-A detected");
             CardDetails_t* cardDetails = 0;
             cardDetails = calloc(1, sizeof *cardDetails);
             assert(cardDetails);
@@ -185,6 +201,12 @@ bool read_nfc(SeaderUartBridge* seader_uart) {
                 cardDetails->atqa = &atqa;
                 sendCardDetected(seader_uart, cardDetails);
                 rtn = true;
+            } else if(mf_classic_check_card_type(nfc_data.atqa[0], nfc_data.atqa[1], nfc_data.sak)) {
+                FURI_LOG_D(TAG, "MFC");
+                OCTET_STRING_t atqa = {.buf = nfc_data.atqa, .size = sizeof(nfc_data.atqa)};
+                cardDetails->atqa = &atqa;
+                sendCardDetected(seader_uart, cardDetails);
+                rtn = true;
             } else if(nfc_data.interface == FuriHalNfcInterfaceIsoDep) {
                 FURI_LOG_D(TAG, "ISO-DEP");
                 OCTET_STRING_t atqa = {.buf = fake_seos_ats, .size = sizeof(fake_seos_ats)};
@@ -419,7 +441,8 @@ void sendNFCRx(SeaderUartBridge* seader_uart, uint8_t* buffer, size_t len) {
     ASN_STRUCT_FREE(asn_DEF_Response, response);
 }
 
-bool iso14443aTransmit(SeaderUartBridge* seader_uart, uint8_t* buffer, size_t len) {
+bool iso14443aTransmit(SeaderWorker* seader_worker, uint8_t* buffer, size_t len) {
+    SeaderUartBridge* seader_uart = seader_worker->uart;
     FuriHalNfcTxRxContext tx_rx = {.tx_rx_type = FuriHalNfcTxRxTypeDefault};
     memcpy(&tx_rx.tx_data, buffer, len);
     tx_rx.tx_bits = len * 8;
@@ -435,6 +458,9 @@ bool iso14443aTransmit(SeaderUartBridge* seader_uart, uint8_t* buffer, size_t le
         sendNFCRx(seader_uart, tx_rx.rx_data, length);
     } else {
         FURI_LOG_W(TAG, "Bad exchange");
+        if(seader_worker->callback) {
+            seader_worker->callback(SeaderWorkerEventFail, seader_worker->context);
+        }
     }
 
     return false;
@@ -481,7 +507,6 @@ bool iso15693Transmit(SeaderWorker* seader_worker, uint8_t* buffer, size_t len)
 }
 
 bool parseNfcCommandTransmit(SeaderWorker* seader_worker, NFCSend_t* nfcSend) {
-    SeaderUartBridge* seader_uart = seader_worker->uart;
     long timeOut = nfcSend->timeOut;
     Protocol_t protocol = nfcSend->protocol;
     FrameProtocol_t frameProtocol = protocol.buf[1];
@@ -510,7 +535,7 @@ bool parseNfcCommandTransmit(SeaderWorker* seader_worker, NFCSend_t* nfcSend) {
     if(frameProtocol == FrameProtocol_iclass) {
         return iso15693Transmit(seader_worker, nfcSend->data.buf, nfcSend->data.size);
     } else if(frameProtocol == FrameProtocol_nfc) {
-        return iso14443aTransmit(seader_uart, nfcSend->data.buf, nfcSend->data.size);
+        return iso14443aTransmit(seader_worker, nfcSend->data.buf, nfcSend->data.size);
     }
     return false;
 }