github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-07 21:51:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed hitag2 dump if one or more blocks are locked

Browse source
This commit is contained in:
roel@libnfc.org 2012-12-10 15:12:32 +00:00
parent ab4da50d99
commit fc8c5cdd12
1 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
armsrc/hitag2.c
View file

@ -524,11 +524,27 @@ bool hitag2_crypto(byte_t* rx, const size_t rxlen, byte_t* tx, size_t* txlen) {
case 0: {
// Stop if there is no answer while we are in crypto mode (after sending NrAr)
if (bCrypto) {
// Failed during authentication
if (bAuthenticating) {
DbpString("Authentication failed!");
return false;
} else {
// Failed reading a block, could be (read/write) locked, skip block and re-authenticate
if (blocknr == 1) {
memcpy(tag.sectors[1],key+2,4);
} else if (blocknr == 2) {
tag.sectors[2][0] = 0x00;
tag.sectors[2][1] = 0x00;
tag.sectors[2][2] = key[0];
tag.sectors[2][3] = key[1];
}
blocknr++;
bCrypto = false;
}
} else {
*txlen = 5;
memcpy(tx,"\xc0",nbytes(*txlen));
}
} break;
// Received UID, crypto tag answer