Revert "Revert "Merge branch 'pr/450' into 420""

This reverts commit 076b11e872.

lib/nfc/protocols/nfcv.c

@@ -276,9 +276,22 @@ void nfcv_emu_alloc(NfcVData* data) {
         data->emulation.nfcv_signal, NFCV_SIG_EOF, data->emulation.nfcv_resp_eof);
 }
 
-static void nfcv_emu_send_raw(NfcVData* nfcv, uint8_t* data, uint8_t length) {
+static void nfcv_emu_send(FuriHalNfcTxRxContext* tx_rx, NfcVData* nfcv, uint8_t* data, uint8_t length, NfcVSendFlags flags) {
+    /* picked default value (0) to match the most common format */
+    if(!flags) {
+        flags = NfcVSendFlagsSof | NfcVSendFlagsCrc | NfcVSendFlagsEof | NfcVSendFlagsOneSubcarrier | NfcVSendFlagsHighRate;
+    }
+
+    if(flags & NfcVSendFlagsCrc) {
+        nfcv_crc(data, length);
+        length += 2;
+    }
+
     digital_sequence_clear(nfcv->emulation.nfcv_signal);
-    digital_sequence_add(nfcv->emulation.nfcv_signal, NFCV_SIG_SOF);
+
+    if(flags & NfcVSendFlagsSof) {
+        digital_sequence_add(nfcv->emulation.nfcv_signal, NFCV_SIG_SOF);
+    }
 
     for(int bit_total = 0; bit_total < length * 8; bit_total++) {
         uint32_t byte_pos = bit_total / 8;
@@ -290,20 +303,17 @@ static void nfcv_emu_send_raw(NfcVData* nfcv, uint8_t* data, uint8_t length) {
             (data[byte_pos] & bit_val) ? NFCV_SIG_BIT1 : NFCV_SIG_BIT0);
     }
 
-    digital_sequence_add(nfcv->emulation.nfcv_signal, NFCV_SIG_EOF);
+    if(flags & NfcVSendFlagsEof) {
+        digital_sequence_add(nfcv->emulation.nfcv_signal, NFCV_SIG_EOF);
+    }
 
     FURI_CRITICAL_ENTER();
     digital_sequence_send(nfcv->emulation.nfcv_signal);
     FURI_CRITICAL_EXIT();
     furi_hal_gpio_write(&gpio_spi_r_mosi, false);
-}
 
-static void
-    nfcv_emu_send(FuriHalNfcTxRxContext* tx_rx, NfcVData* nfcv, uint8_t* data, uint8_t length) {
-    nfcv_crc(data, length);
-    nfcv_emu_send_raw(nfcv, data, length + 2);
     if(tx_rx->sniff_tx) {
-        tx_rx->sniff_tx(data, (length + 2) * 8, false, tx_rx->sniff_context);
+        tx_rx->sniff_tx(data, length * 8, false, tx_rx->sniff_context);
     }
 }
 
@@ -352,6 +362,7 @@ void nfcv_emu_handle_packet(
     uint8_t payload_offset = address_offset + (addressed ? 8 : 0);
     uint8_t* address = &payload[address_offset];
     uint8_t response_buffer[32];
+    NfcVSendFlags response_flags = NfcVSendFlagsNormal;
 
     if(addressed && nfcv_uidcmp(address, nfc_data->uid)) {
         FURI_LOG_D(TAG, "addressed command 0x%02X, but not for us:", command);
@@ -407,10 +418,10 @@ void nfcv_emu_handle_packet(
         response_buffer[1] = nfcv_data->dsfid;
         nfcv_uidcpy(&response_buffer[2], nfc_data->uid);
 
-        nfcv_emu_send(tx_rx, nfcv_data, response_buffer, 10);
-        snprintf(nfcv_data->last_command, sizeof(nfcv_data->last_command), "INVENTORY");
-        break;
-    }
+            nfcv_emu_send(tx_rx, nfcv_data, response_buffer, 10, response_flags);
+            snprintf(nfcv_data->last_command, sizeof(nfcv_data->last_command), "INVENTORY");
+            break;
+        }
 
     case ISO15693_STAYQUIET: {
         snprintf(nfcv_data->last_command, sizeof(nfcv_data->last_command), "STAYQUIET");
@@ -432,26 +443,78 @@ void nfcv_emu_handle_packet(
         break;
     }
 
-    case ISO15693_SELECT: {
-        response_buffer[0] = ISO15693_NOERROR;
-        nfcv_emu_send(tx_rx, nfcv_data, response_buffer, 1);
-        snprintf(nfcv_data->last_command, sizeof(nfcv_data->last_command), "SELECT");
-        break;
-    }
-
-    case ISO15693_READBLOCK: {
-        uint8_t block = payload[payload_offset];
-
-        if(block >= nfcv_data->block_num) {
-            response_buffer[0] = ISO15693_ERROR_BLOCK_WRITE;
-            nfcv_emu_send(tx_rx, nfcv_data, response_buffer, 1);
-        } else {
+        case ISO15693_SELECT:
+        {
             response_buffer[0] = ISO15693_NOERROR;
-            memcpy(
-                &response_buffer[1],
-                &nfcv_data->data[nfcv_data->block_size * block],
-                nfcv_data->block_size);
-            nfcv_emu_send(tx_rx, nfcv_data, response_buffer, 1 + nfcv_data->block_size);
+            nfcv_emu_send(tx_rx, nfcv_data, response_buffer, 1, response_flags);
+            snprintf(nfcv_data->last_command, sizeof(nfcv_data->last_command), "SELECT");
+            break;
+        }
+
+        case ISO15693_READBLOCK:
+        {
+            uint8_t block = payload[payload_offset];
+
+            if(block >= nfcv_data->block_num) {
+                response_buffer[0] = ISO15693_ERROR_BLOCK_WRITE;
+                nfcv_emu_send(tx_rx, nfcv_data, response_buffer, 1, response_flags);
+            } else {
+                response_buffer[0] = ISO15693_NOERROR;
+                memcpy(&response_buffer[1], &nfcv_data->data[nfcv_data->block_size * block], nfcv_data->block_size);
+                nfcv_emu_send(tx_rx, nfcv_data, response_buffer, 1 + nfcv_data->block_size, response_flags);
+            }
+            snprintf(nfcv_data->last_command, sizeof(nfcv_data->last_command), "READ BLOCK %d", block);
+            break;
+        }
+
+        case ISO15693_WRITEBLOCK:
+        {
+            uint8_t block = payload[payload_offset];
+            uint8_t *data = &payload[payload_offset + 1];
+
+            if(block >= nfcv_data->block_num) {
+                response_buffer[0] = ISO15693_ERROR_BLOCK_WRITE;
+            } else {
+                response_buffer[0] = ISO15693_NOERROR;
+                memcpy(&nfcv_data->data[nfcv_data->block_size * block], &response_buffer[1], nfcv_data->block_size);
+            }
+            nfcv_emu_send(tx_rx, nfcv_data, response_buffer, 1, response_flags);
+            snprintf(nfcv_data->last_command, sizeof(nfcv_data->last_command), "WRITE BLOCK %d <- %02X %02X %02X %02X", block, data[0], data[1], data[2], data[3]);
+            break;
+        }
+
+        case ISO15693_GET_SYSTEM_INFO:
+        {
+            response_buffer[0] = ISO15693_NOERROR; 
+            response_buffer[1] = 0x0F;
+            nfcv_uidcpy(&response_buffer[2], nfc_data->uid);
+            response_buffer[10] = nfcv_data->dsfid; /* DSFID */
+            response_buffer[11] = nfcv_data->afi; /* AFI */
+            response_buffer[12] = nfcv_data->block_num - 1; /* number of blocks */
+            response_buffer[13] = nfcv_data->block_size - 1; /* block size */
+            response_buffer[14] = nfcv_data->ic_ref; /* IC reference */
+
+            nfcv_emu_send(tx_rx, nfcv_data, response_buffer, 15, response_flags);
+            snprintf(nfcv_data->last_command, sizeof(nfcv_data->last_command), "SYSTEMINFO");
+
+            break;
+        }
+
+        case ISO15693_CMD_NXP_GET_RANDOM_NUMBER:
+        {
+            nfcv_data->sub_data.slix_l.rand[0] = furi_hal_random_get();
+            nfcv_data->sub_data.slix_l.rand[1] = furi_hal_random_get();
+
+            response_buffer[0] = ISO15693_NOERROR;
+            response_buffer[1] = nfcv_data->sub_data.slix_l.rand[1];
+            response_buffer[2] = nfcv_data->sub_data.slix_l.rand[0];
+
+            nfcv_emu_send(tx_rx, nfcv_data, response_buffer, 3, response_flags);
+            snprintf(nfcv_data->last_command, sizeof(nfcv_data->last_command), 
+                "GET_RANDOM_NUMBER -> 0x%02X%02X", 
+                nfcv_data->sub_data.slix_l.rand[0], 
+                nfcv_data->sub_data.slix_l.rand[1]);
+            break;
         }
         snprintf(nfcv_data->last_command, sizeof(nfcv_data->last_command), "READ BLOCK %d", block);
         break;
@@ -461,14 +524,47 @@ void nfcv_emu_handle_packet(
         uint8_t block = payload[payload_offset];
         uint8_t* data = &payload[payload_offset + 1];
 
-        if(block >= nfcv_data->block_num) {
-            response_buffer[0] = ISO15693_ERROR_BLOCK_WRITE;
-        } else {
+            switch(password_id) {
+                case 4:
+                    password = nfcv_data->sub_data.slix_l.key_privacy;
+                    break;
+                case 8:
+                    password = nfcv_data->sub_data.slix_l.key_destroy;
+                    break;
+                case 10:
+                    password = nfcv_data->sub_data.slix_l.key_eas;
+                    break;
+                default:
+                    break;
+            }
+
+            for(int pos = 0; pos < 4; pos++) {
+                password_rcv[pos] = password_xored[3 - pos] ^ rand[pos % 2];
+            }
+            uint32_t pass_expect = nfcv_read_be(password, 4);
+            uint32_t pass_received = nfcv_read_be(password_rcv, 4);
+
+            /* if the password is all-zeroes, just accept any password*/
+            if(!pass_expect || pass_expect == pass_received) {
+                nfcv_data->sub_data.slix_l.privacy = false;
+                response_buffer[0] = ISO15693_NOERROR;
+                nfcv_emu_send(tx_rx, nfcv_data, response_buffer, 1, response_flags);
+                snprintf(nfcv_data->last_command, sizeof(nfcv_data->last_command), "SET_PASSWORD #%02X 0x%08lX OK", password_id, pass_received);
+            } else {
+                snprintf(nfcv_data->last_command, sizeof(nfcv_data->last_command), "SET_PASSWORD #%02X 0x%08lX/%08lX FAIL", password_id, pass_received, pass_expect);
+            }
+            break;
+        }
+
+        case ISO15693_CMD_NXP_ENABLE_PRIVACY:
+        {
             response_buffer[0] = ISO15693_NOERROR;
-            memcpy(
-                &nfcv_data->data[nfcv_data->block_size * block],
-                &response_buffer[1],
-                nfcv_data->block_size);
+
+            nfcv_emu_send(tx_rx, nfcv_data, response_buffer, 1, response_flags);
+            snprintf(nfcv_data->last_command, sizeof(nfcv_data->last_command), "ISO15693_CMD_NXP_ENABLE_PRIVACY");
+
+            nfcv_data->sub_data.slix_l.privacy = true;
+            break;
         }
         nfcv_emu_send(tx_rx, nfcv_data, response_buffer, 1);
         snprintf(

lib/nfc/protocols/nfcv.h

@@ -98,6 +98,17 @@ typedef struct {
     uint8_t rand[2];
 } NfcVSlixData;
 
+typedef enum {
+    NfcVSendFlagsNormal         = 0,
+    NfcVSendFlagsSof            = 1<<0,
+    NfcVSendFlagsCrc            = 1<<1,
+    NfcVSendFlagsEof            = 1<<2,
+    NfcVSendFlagsOneSubcarrier  = 0,
+    NfcVSendFlagsTwoSubcarrier  = 1<<3,
+    NfcVSendFlagsLowRate        = 0,
+    NfcVSendFlagsHighRate       = 1<<4
+} NfcVSendFlags;
+
 typedef struct {
     uint8_t key_read[4];
     uint8_t key_write[4];

lib/nfc/protocols/slix.c

@@ -6,17 +6,26 @@
 #include <furi.h>
 #include "furi_hal_nfc.h"
 
+uint8_t slix_get_ti(FuriHalNfcDevData* nfc_data) {
+    return (nfc_data->uid[3] >> 3) & 3;
+}
+
+
 bool slix_check_card_type(FuriHalNfcDevData* nfc_data) {
-    if((nfc_data->uid[0] == 0xE0) && (nfc_data->uid[1] == 0x04) && (nfc_data->uid[2] == 0x01) &&
-       (((nfc_data->uid[3] >> 4) & 3) == 2)) {
+    if((nfc_data->uid[0] == 0xE0) 
+        && (nfc_data->uid[1] == 0x04) 
+        && (nfc_data->uid[2] == 0x01)
+        && slix_get_ti(nfc_data) == 2) {
         return true;
     }
     return false;
 }
 
 bool slix2_check_card_type(FuriHalNfcDevData* nfc_data) {
-    if((nfc_data->uid[0] == 0xE0) && (nfc_data->uid[1] == 0x04) && (nfc_data->uid[2] == 0x01) &&
-       (((nfc_data->uid[3] >> 4) & 3) == 1)) {
+    if((nfc_data->uid[0] == 0xE0) 
+        && (nfc_data->uid[1] == 0x04) 
+        && (nfc_data->uid[2] == 0x01)
+        && slix_get_ti(nfc_data) == 1) {
         return true;
     }
     return false;