Merge pull request #3407 from dangerous-tac0s/more-umc-pack-updates

More umc pack updates
This commit is contained in:
Iceman authored and GitHub committed 2026-07-04 03:31:50 +07:00
commit 871b40ed97
4 files changed
+28 -18

No files matched your search

+7 -6
View File
@@ -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. CF<key>CC 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
+6 -6
View File
@@ -8830,7 +8830,7 @@ static int CmdHF14AGen4Info(const char *cmd) {
uint8_t uid_len = resp[1];
res = mfG4GetFactoryTest(pwd, resp, &resplen, false);
if (res == PM3_SUCCESS && resplen > 2) {
if (res == PM3_SUCCESS && resplen >= 2) {
PrintAndLogEx(INFO, "");
PrintAndLogEx(INFO, _CYAN_("Factory test"));
@@ -8839,19 +8839,19 @@ static int CmdHF14AGen4Info(const char *cmd) {
}
if (memcmp(resp + resplen - 2, "\x66\x66", 2) == 0) {
PrintAndLogEx(INFO, "Card type... Generic");
PrintAndLogEx(INFO, "Card type... Generic (%02X%02X)", resp[resplen - 2], resp[resplen - 1]);
} else if (memcmp(resp + resplen - 2, "\x02\xAA", 2) == 0) {
PrintAndLogEx(INFO, "Card type... " _RED_("Limited functionality"));
PrintAndLogEx(INFO, "Card type... " _RED_("Limited functionality (%02X%02X)"), resp[resplen - 2], resp[resplen - 1]);
} else if (memcmp(resp + resplen - 2, "\x03\xA0", 2) == 0) {
PrintAndLogEx(INFO, "Card type... Old card version");
PrintAndLogEx(INFO, "Card type... Old card version (%02X%02X)", resp[resplen - 2], resp[resplen - 1]);
} else if (memcmp(resp + resplen - 2, "\x06\xA0", 2) == 0) {
PrintAndLogEx(INFO, "Card type... " _GREEN_("New card version"));
PrintAndLogEx(INFO, "Card type... " _GREEN_("New card version (%02X%02X)"), resp[resplen - 2], resp[resplen - 1]);
} else {
PrintAndLogEx(INFO, "Card type... " _RED_("unknown %02X%02X"), resp[resplen - 2], resp[resplen - 1]);
PrintAndLogEx(INFO, "Card type... " _RED_("unknown (%02X%02X)"), resp[resplen - 2], resp[resplen - 1]);
}
}
+6 -2
View File
@@ -3503,7 +3503,9 @@ static int CmdHF14AMfUDump(const char *Cmd) {
"hf mfu dump -k AABBCCDD -> dump whole tag using pwd AABBCCDD\n"
"hf mfu dump -p 10 -> start at page 10 and dump rest of blocks\n"
"hf mfu dump -p 10 -q 2 -> start at page 10 and dump two blocks\n"
"hf mfu dump --key 00112233445566778899AABBCCDDEEFF"
"hf mfu dump --key 00112233445566778899AABBCCDDEEFF\n"
"\n"
"Note: Dumping a NTAG/UL tag to a UMC will likely result in incorrect PWD and PACK\n"
);
void *argtable[] = {
@@ -4007,7 +4009,9 @@ static int CmdHF14AMfURestore(const char *Cmd) {
"Restore MIFARE Ultralight/NTAG dump file (bin/eml/json) to tag.\n",
"hf mfu restore -f myfile -s -> special write\n"
"hf mfu restore -f myfile -k AABBCCDD -s -> special write, use key\n"
"hf mfu restore -f myfile -k AABBCCDD -ser -> special write, use key, write dump pwd, ..."
"hf mfu restore -f myfile -k AABBCCDD -ser -> special write, use key, write dump pwd, ...\n"
"\n"
"Note: Restoring a NTAG/UL dump to a UMC will likely result in incorrect PWD and PACK\n"
);
void *argtable[] = {