diff --git a/client/luascripts/hf_mf_ultimatecard.lua b/client/luascripts/hf_mf_ultimatecard.lua index e9e2fbed6..ca8d2609a 100644 --- a/client/luascripts/hf_mf_ultimatecard.lua +++ b/client/luascripts/hf_mf_ultimatecard.lua @@ -15,7 +15,7 @@ local _ug4_version = '' local _packpage = 'E6' copyright = '' author = 'Nathan Glaser' -version = 'v1.0.6' +version = 'v1.0.7' date = 'Created - Jan 2022' desc = 'This script enables easy programming of an Ultimate Mifare Magic card' example = [[ @@ -184,23 +184,24 @@ end --- -- Probe UMC revision robustly. CFCC occasionally returns a truncated -- frame (e.g. 3F/7F), so retry until we get a well-formed 5-byte version. --- New "UG4" replies 00 00 00 06 A0 -> PACK page 0x13; clean non-06A0 reads +-- Some (06A0, 6666) UMC versions -> PACK page 0x13; others are assumed fine -- and an unprobeable card fall back to page 0xE6. local function detect_packpage() if _ug4_version ~= '' then return end -- already classified this run for i = 1, 5 do - local v = (send("CF".._key.."CC") or ''):sub(1,10) - if #v == 10 and v:find('^%x+$') then -- exactly 5 hex bytes + local v = (send("CF".._key.."CC") or ''):sub(1,-5):sub(-4) + if v:find('^%x+$') then -- exactly 5 hex bytes _ug4_version = v:upper() + print("Detected UMC version: ".._ug4_version) break end end - if _ug4_version == '00000006A0' then + if _ug4_version == '06A0' or _ug4_version == '6666' then _packpage = '13' else _packpage = 'E6' if _ug4_version == '' then - print('[!] Warning: could not confirm UMC revision (CC probe corrupted); using PACK page 0xE6') + print("[!] Warning: unable to confirm config (".._ug4_version .."); using PACK page 0xE6") end end end diff --git a/doc/magic_cards_notes.md b/doc/magic_cards_notes.md index c6a6592fc..cbc4818b9 100644 --- a/doc/magic_cards_notes.md +++ b/doc/magic_cards_notes.md @@ -3083,10 +3083,9 @@ hf 14a raw -s -c -t 1000 CF000000006B3F ^[Top](#top) ^^[Gen4](#g4top) -**For UMC 06A0** +**For UMC 06A0 and 6666** -Despite varying memory structures on their specs, the UMC derives things like the -PWD and PACK from fixed pages. The PWD is stored at E5 which matches the NTAG216/I2C transponders while the PACK is stored at 13 like an NTAG210. +Despite varying memory structures on their specs, the UMC derives things like the PWD and PACK from fixed pages. The PWD is stored at E5 which matches the NTAG216/I2C transponders while the PACK is stored at 13 like an NTAG210 or an Ultralight EV1. #### Set NTAG PWD @@ -3103,12 +3102,16 @@ script run hf_mf_ultimatecard -p ``` #### Set NTAG PACK ``` -hf mfu wrbl -b 13 -d <2-byte PACK>00 +hf mfu wrbl -b 13 -d <2-byte PACK>0000 ``` or ``` hf 14a -s -c -t 1000 a213<2-byte PACK>0000 ``` +or +``` +script run hf_mf_ultimatecard -a <2-byte PACK> +``` ### Set shadow mode (GTU)