RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-20 15:26:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

when dumping memory also try the MFC_B key

Browse source
This commit is contained in:
iceman1001 2024-09-13 13:40:24 +02:00
parent 7a5d1b1ddf
commit cd0ce47d89
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -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... 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] ## [unreleased][unreleased]
- Changed to also try the MFC_B key when extracting memory (@iceman1001)
- Fix parallel `make -j check` Thanks @elboulangero (@iceman1001) - Fix parallel `make -j check` Thanks @elboulangero (@iceman1001)
- Added support for 8268/8310 (@douniwan5788) - Added support for 8268/8310 (@douniwan5788)
- Changed scripting string params to accept 1024 chars, Thanks @evildaemond! (@iceman1001) - Changed scripting string params to accept 1024 chars, Thanks @evildaemond! (@iceman1001)

7
armsrc/mifarecmd.c
View file

@ -1605,7 +1605,7 @@ static uint8_t chkKey(struct chk_t *c) {
// mifare_classic_halt(c->pcs); // mifare_classic_halt(c->pcs);
break; break;
} }
if (!selected) { if (selected == false) {
Dbprintf("chkKey: Failed at fast selecting the card!"); Dbprintf("chkKey: Failed at fast selecting the card!");
} }
return res; return res;
@ -2396,12 +2396,17 @@ int MifareECardLoad(uint8_t sectorcnt, uint8_t keytype) {
// Auth // Auth
if (mifare_classic_auth(pcs, cuid, FirstBlockOfSector(s), keytype, ui64Key, AUTH_FIRST)) { if (mifare_classic_auth(pcs, cuid, FirstBlockOfSector(s), keytype, ui64Key, AUTH_FIRST)) {
ui64Key = emlGetKey(s, MF_KEY_B);
if (mifare_classic_auth(pcs, cuid, FirstBlockOfSector(s), MF_KEY_B, ui64Key, AUTH_FIRST)) {
retval = PM3_EPARTIAL; retval = PM3_EPARTIAL;
if (g_dbglevel >= DBG_ERROR) { if (g_dbglevel >= DBG_ERROR) {
Dbprintf("Sector %2d - Auth error", s); Dbprintf("Sector %2d - Auth error", s);
} }
continue; continue;
} }
}
#define MAX_RETRIES 2 #define MAX_RETRIES 2