Merge branch 'flipperdevices:dev' into dev

lib/ST25RFAL002/include/rfal_picopass.h

@@ -9,6 +9,7 @@
  */
 #include "platform.h"
 #include "rfal_rf.h"
+#include "rfal_crc.h"
 #include "st_errno.h"
 
 #define RFAL_PICOPASS_UID_LEN 8

lib/ST25RFAL002/source/rfal_picopass.c

@@ -138,22 +138,12 @@ ReturnCode rfalPicoPassPollerCheck(uint8_t* mac, rfalPicoPassCheckRes* chkRes) {
 
 ReturnCode rfalPicoPassPollerReadBlock(uint8_t blockNum, rfalPicoPassReadBlockRes* readRes) {
     ReturnCode ret;
-    /*
- * ./reveng -w 16 -s 0c07cc47 0c064556 0c083bbf 0c09b2ae       
- width=16  poly=0x1021  init=0xd924  refin=true  refout=true  xorout=0x0000  check=0x1329  residue=0x0000  name=(none)
-0c  06  45  56
-0c  07  cc  47
-0c  08  3b  bf
-0c  09  b2  ae
- */
 
-    uint8_t readCmds[4][4] = {
-        {RFAL_PICOPASS_CMD_READ, 6, 0x45, 0x56},
-        {RFAL_PICOPASS_CMD_READ, 7, 0xcc, 0x47},
-        {RFAL_PICOPASS_CMD_READ, 8, 0x3b, 0xbf},
-        {RFAL_PICOPASS_CMD_READ, 9, 0xb2, 0xae}};
+    uint8_t txBuf[4] = {RFAL_PICOPASS_CMD_READ, 0, 0, 0};
+    txBuf[1] = blockNum;
+    uint16_t crc = rfalCrcCalculateCcitt(0xE012, txBuf + 1, 1);
+    memcpy(txBuf + 2, &crc, sizeof(uint16_t));
 
-    uint8_t* txBuf = readCmds[blockNum - 6];
     uint16_t recvLen = 0;
     uint32_t flags = RFAL_PICOPASS_TXRX_FLAGS;
     uint32_t fwt = rfalConvMsTo1fc(20);
@@ -166,7 +156,5 @@ ReturnCode rfalPicoPassPollerReadBlock(uint8_t blockNum, rfalPicoPassReadBlockRe
         &recvLen,
         flags,
         fwt);
-    // printf("check rx: %d %s\n", recvLen, hex2Str(readRes->data, RFAL_PICOPASS_MAX_BLOCK_LEN));
-
     return ret;
 }

lib/nfc_protocols/mifare_classic.c

@@ -622,6 +622,19 @@ bool mf_classic_emulator(MfClassicEmulator* emulator, FuriHalNfcTxRxContext* tx_
                 break;
             }
 
+            uint32_t nr = nfc_util_bytes2num(tx_rx->rx_data, 4);
+            uint32_t ar = nfc_util_bytes2num(&tx_rx->rx_data[4], 4);
+
+            FURI_LOG_D(
+                TAG,
+                "%08x key%c block %d nt/nr/ar: %08x %08x %08x",
+                emulator->cuid,
+                access_key == MfClassicKeyA ? 'A' : 'B',
+                sector_trailer_block,
+                nonce,
+                nr,
+                ar);
+
             // Check if we store valid key
             if(access_key == MfClassicKeyA) {
                 if(FURI_BIT(emulator->data.key_a_mask, mf_classic_get_sector_by_block(block)) ==
@@ -637,8 +650,6 @@ bool mf_classic_emulator(MfClassicEmulator* emulator, FuriHalNfcTxRxContext* tx_
                 }
             }
 
-            uint32_t nr = nfc_util_bytes2num(tx_rx->rx_data, 4);
-            uint32_t ar = nfc_util_bytes2num(&tx_rx->rx_data[4], 4);
             crypto1_word(&emulator->crypto, nr, 1);
             uint32_t cardRr = ar ^ crypto1_word(&emulator->crypto, 0, 0);
             if(cardRr != prng_successor(nonce, 64)) {