github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-24 07:05:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

adapt hf 14a info to detect different types of FUDAN. see http://www.proxmark.org/forum/viewtopic.php?pid=41195#p41195

Browse source
This commit is contained in:
iceman1001 2021-09-21 19:59:09 +02:00
commit b00506ed4f
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -3,8 +3,9 @@ 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]
- Changed `hf 14a info` - different FUDAN clone detection (@iceman1001)
- Added `CROSS_CC` and similar args for maintainers, see Maintainers.md (@doegox)
- crack5opencl: fix deadlock in wu_queue_destroy() + minor changes on threads.c (@matrix)
- Fix crack5opencl: fix deadlock in wu_queue_destroy() + minor changes on threads.c (@matrix)
## [crimson.4.14434][2021-09-18]
- Fix `hf mf staticnested` - flashmem / non loop now works (@horrordash)

7
client/src/cmdhf14a.c
View file

@ -1746,7 +1746,12 @@ int infoHF14A(bool verbose, bool do_nack_test, bool do_aid_search) {
break;
}
case 0x0A: {
printTag("FM11RF005SH (Shanghai Metro)");
if (card.atqa[0] == 0x03)
// Uses MIFARE Crypto-1 algo
printTag("FM11RF005M (FUDAN MIFARE Classic clone)");
else if (card.atqa[0] == 0x05)
// Uses Shanghai algo
printTag("FM11RF005SH (FUDAN Shanghai Metro)");
break;
}
case 0x20: {