From 8024ab5ecb49395952b574f1290c58f05e5e8ed4 Mon Sep 17 00:00:00 2001 From: Gabriele Gristina Date: Fri, 6 Nov 2026 22:55:23 +0100 Subject: [PATCH] nfc: decode NULL, Lock Control and Memory Control TLVs as specified A NULL TLV has no length, so a run of them swallowed the TLVs after it. Lock and Memory Control sizes of 0 mean 256, the nibbles of their third byte are powers of two and the Memory Control size counts bytes. Co-Authored-By: Claude Opus 5.5 --- CHANGELOG.md | 1 + client/src/nfc/ndef.c | 46 +++++++++++++++++++++++++++---------------- tools/pm3_tests.sh | 4 ++++ 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1bedd944..c64c1b1d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file. This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log... ## [unreleased][unreleased] +- Fixed NDEF TLV decoding - a NULL TLV has no length, Lock and Memory Control sizes of 0 mean 256 and their page fields are powers of two (@matrix) - Fixed flashing with redirected output - the progress animation is drawn only when stdout is a terminal (@matrix) - Fixed `proxmark3 --flash`, `--dumpmem` and `--reboot-to-bootloader` exit status - a failure exits 1, a failed flash no longer ends with `All done` (@matrix) - Fixed `data rawdemod` - `--max`, `--samples` and the `--p2` clock no longer wrap above 255, `--fs` refuses values above 255 (@matrix) diff --git a/client/src/nfc/ndef.c b/client/src/nfc/ndef.c index 1713bd199..85de2cda5 100644 --- a/client/src/nfc/ndef.c +++ b/client/src/nfc/ndef.c @@ -1440,12 +1440,17 @@ int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) { switch (ndef[indx]) { case 0x00: { - indx++; - uint16_t len = ndefTLVGetLength(&ndef[indx], &indx); - PrintAndLogEx(SUCCESS, "--- " _CYAN_("NDEF NULL block") " ---"); - if (len) - PrintAndLogEx(WARNING, "NDEF NULL block size must be 0, got %d bytes", len); - indx += len; + // a NULL TLV is the T byte alone, without length + size_t run = 0; + while ((indx < ndefLen) && (ndef[indx] == 0x00)) { + indx++; + run++; + } + if (run == 1) { + PrintAndLogEx(SUCCESS, "--- " _CYAN_("NDEF NULL block") " ---"); + } else { + PrintAndLogEx(SUCCESS, "--- " _CYAN_("NDEF NULL block") " --- x %zu", run); + } break; } case 0x01: { @@ -1458,15 +1463,16 @@ int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) { } else { uint8_t pages_addr = (ndef[indx] >> 4) & 0x0f; uint8_t byte_offset = ndef[indx] & 0x0f; - uint8_t Size = ndef[indx + 1]; - uint8_t BytesLockedPerLockBit = (ndef[indx + 2] >> 4) & 0x0f; - uint8_t bytes_per_page = ndef[indx + 2] & 0x0f; + // Type 2 Tag spec: Size 0 is 256 lock bits, both nibbles are powers of two + uint16_t Size = (ndef[indx + 1]) ? ndef[indx + 1] : 256; + uint16_t BytesLockedPerLockBit = 1 << ((ndef[indx + 2] >> 4) & 0x0f); + uint16_t bytes_per_page = 1 << (ndef[indx + 2] & 0x0f); PrintAndLogEx(SUCCESS, " Pages addr (number of pages).... %d", pages_addr); PrintAndLogEx(SUCCESS, " Byte offset (number of bytes)... %d", byte_offset); - PrintAndLogEx(SUCCESS, " Lock Area size in bits.......... %d ( %d bytes )", Size, Size / 8); - PrintAndLogEx(SUCCESS, " Number of bytes / page... %d", bytes_per_page); + PrintAndLogEx(SUCCESS, " Lock Area size in bits.......... %u ( %u bytes )", Size, (Size + 7) / 8); + PrintAndLogEx(SUCCESS, " Number of bytes / page... %u", bytes_per_page); PrintAndLogEx(SUCCESS, " Bytes Locked Per LockBit"); - PrintAndLogEx(SUCCESS, " number of bytes that each dynamic lock bit locks... %d", BytesLockedPerLockBit); + PrintAndLogEx(SUCCESS, " number of bytes that each dynamic lock bit locks... %u", BytesLockedPerLockBit); } indx += len; break; @@ -1481,11 +1487,12 @@ int NDEFDecodeAndPrint(uint8_t *ndef, size_t ndefLen, bool verbose) { } else { uint8_t pages_addr = (ndef[indx] >> 4) & 0x0f; uint8_t byte_offset = ndef[indx] & 0x0f; - uint8_t Size = ndef[indx + 1]; - uint8_t bytes_per_page = ndef[indx + 2] & 0x0f; + // Type 2 Tag spec: Size is in bytes, 0 is 256, the page size is a power of two + uint16_t Size = (ndef[indx + 1]) ? ndef[indx + 1] : 256; + uint16_t bytes_per_page = 1 << (ndef[indx + 2] & 0x0f); PrintAndLogEx(SUCCESS, "Pages addr (number of pages).... %u", pages_addr); PrintAndLogEx(SUCCESS, "Byte offset (number of bytes)... %u", byte_offset); - PrintAndLogEx(SUCCESS, "Reserved area size in bits...... %u ( %u bytes )", Size, Size / 8); + PrintAndLogEx(SUCCESS, "Reserved area size in bytes..... %u", Size); PrintAndLogEx(SUCCESS, " Number of bytes / page... %u", bytes_per_page); } indx += len; @@ -1541,8 +1548,13 @@ int NDEFGetTotalLength(uint8_t *ndef, size_t ndeflen, size_t *outlen) { size_t idx = 0; while (idx < ndeflen) { - if (ndef[idx] == 0x00 || - ndef[idx] == 0x01 || + // a NULL TLV is the T byte alone, no length + if (ndef[idx] == 0x00) { + idx++; + continue; + } + + if (ndef[idx] == 0x01 || ndef[idx] == 0x02 || ndef[idx] == 0x03 || ndef[idx] == 0xFD) { diff --git a/tools/pm3_tests.sh b/tools/pm3_tests.sh index 675fdd4dd..4b628edc0 100755 --- a/tools/pm3_tests.sh +++ b/tools/pm3_tests.sh @@ -493,6 +493,10 @@ while true; do if ! CheckExecute "nfc decode test apple wallet" "$CLIENTBIN -c 'nfc decode -d 031AD10116550077616C6C65743A2F2F61637469766174652F6E6663FE'" "activate/nfc"; then break; fi if ! CheckExecute "nfc decode test signature" "$CLIENTBIN -c 'nfc decode -d 03FF010194113870696C65742E65653A656B616172743A3266195F26063132303832325904202020205F28033233335F2701316E1B5A13333038363439303039303030323636343030355304EBF2CE704103000000AC536967010200803A2448FCA7D354A654A81BD021150D1A152D1DF4D7A55D2B771F12F094EAB6E5E10F2617A2F8DAD4FD38AFF8EA39B71C19BD42618CDA86EE7E144636C8E0E7CFC4096E19C3680E09C78A0CDBC05DA2D698E551D5D709717655E56FE3676880B897D2C70DF5F06ECE07C71435255144F8EE41AF110E7B180DA0E6C22FB8FDEF61800025687474703A2F2F70696C65742E65652F6372742F33303836343930302D303030312E637274FE'" "30864900-0001.crt"; then break; fi if ! CheckExecute "nfc decode test openprinter tag" "$CLIENTBIN -c 'nfc decode -d 03FF012F91013A55046E756D616B6572732E636F6D2F70726F64756374732F6162732D66696C616D656E743F76617269616E743D3436393434323937333836323932521CD26170706C69636174696F6E2F766E642E6F70656E7072696E74746167A10218AFBF041B000007D0FCAB45F9080009020A70414253204C656D6F6E2059656C6C6F770B684E756D616B6572730E1A69094200101903E81119041A1218F01343F9A800181DF93C29182218F01823190104182418AA1825185A18261864FF00'" "application/vnd.openprinttag"; then break; fi + if ! CheckExecute "nfc decode null tlv run" "$CLIENTBIN -c 'nfc decode -d 0000000300FE'" "NDEF NULL block --- x 3"; then break; fi + if ! CheckExecute "nfc decode lock control" "$CLIENTBIN -c 'nfc decode -d 0103A01044FE'" "number of bytes that each dynamic lock bit locks\.\.\. 16"; then break; fi + if ! CheckExecute "nfc decode lock control size 0" "$CLIENTBIN -c 'nfc decode -d 0103A00044FE'" "Lock Area size in bits\.{10} 256 \( 32 bytes \)"; then break; fi + if ! CheckExecute "nfc decode memory control" "$CLIENTBIN -c 'nfc decode -d 0203A03044FE'" "Reserved area size in bytes\.{5} 48"; then break; fi if ! CheckExecute "wiegand encode new" "$CLIENTBIN -c 'wiegand encode -w H10301 --fc 123 --cn 4567 --new'" "New PACS\\.{9} 0x 06BD88EB80"; then break; fi if ! CheckExecute "wiegand encode bin" "$CLIENTBIN -c 'wiegand encode --bin 1'" "Wiegand raw\\.{4} 03"; then break; fi