Skip to content

Commit 365758f

Browse files
committed
Adding FM1208-10 detection with slightly different block0, thanks @mmm!
1 parent fcca67b commit 365758f

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

client/src/cmdhfmf.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9715,10 +9715,17 @@ static int CmdHF14AMfInfo(const char *Cmd) {
97159715
&& card.sak == 0x20 && memcmp(blockdata + 8, "\x62\x63\x64\x65\x66\x67\x68\x69", 8) == 0) {
97169716
PrintAndLogEx(SUCCESS, "Fudan FM11RF32 (SAK=20)");
97179717
} else if (fKeyType == MF_KEY_BD && memcmp(fkey, k08, sizeof(fkey)) == 0
9718-
&& card.sak == 0x28 && memcmp(blockdata + 5, "\x28\x04\x00\x90\x10\x15\x01\x00\x00\x00\x00", 11) == 0) {
9718+
&& card.sak == 0x28 && (
9719+
(memcmp(blockdata + 5, "\x28\x04\x00\x90\x10\x15\x01\x00\x00\x00\x00", 11) == 0) ||
9720+
(memcmp(blockdata + 5, "\x28\x04\x00\x90\x11\x15\x01\x00\x00\x00\x00", 11) == 0))) {
97199721
// Note: it also has ATS =
97209722
// 10 78 80 90 02 20 90 00 00 00 00 00 + UID + CRC
97219723
PrintAndLogEx(SUCCESS, "Fudan FM1208-10");
9724+
} else if (fKeyType == MF_KEY_BD && memcmp(fkey, k08, sizeof(fkey)) == 0
9725+
&& card.sak == 0x28 && memcmp(blockdata + 5, "\x28\x04\x00\x90\x11\x15\x01\x00\x00\x00\x00", 11) == 0) {
9726+
// Note: it also has ATS =
9727+
// 10 78 80 90 02 20 90 00 00 00 00 00 + UID + CRC
9728+
PrintAndLogEx(SUCCESS, "Fudan FM1208-10 ?");
97229729
} else if (fKeyType == MF_KEY_BD && memcmp(fkey, k08, sizeof(fkey)) == 0
97239730
&& card.sak == 0x28 && memcmp(blockdata + 5, "\x28\x04\x00\x90\x53\xB7\x0C\x00\x00\x00\x00", 11) == 0) {
97249731
// Note: it also has ATS =

0 commit comments

Comments
 (0)