RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-01-03 22:53:58 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #303 from ViRb3/fix-pass-write

Browse source 
Fix password write offset by 1
This commit is contained in:
Iceman 2019-08-03 19:34:10 +02:00 committed by GitHub
commit 87e300588b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
armsrc/hitag2.c
View file

@ -377,7 +377,7 @@ static bool hitag2_password(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t
// Reset the transmission frame length
*txlen = 0;
if (bPwd && write) {
if (bPwd && !bAuthenticating && write) {
if (!hitag2_write_page(rx, rxlen, tx, txlen)) {
return false;
}
@ -399,21 +399,26 @@ static bool hitag2_password(uint8_t *rx, const size_t rxlen, uint8_t *tx, size_t
// Received UID, tag password
case 32: {
if (!bPwd) {
*txlen = 32;
memcpy(tx, password, 4);
bPwd = true;
memcpy(tag.sectors[blocknr], rx, 4);
blocknr++;
} else {
if (blocknr == 1) {
//store password in block1, the TAG answers with Block3, but we need the password in memory
memcpy(tag.sectors[blocknr], tx, 4);
} else {
bAuthenticating = true;
memcpy(tx, password, 4);
*txlen = 32;
}
else {
if (bAuthenticating) {
bAuthenticating = false;
if (write) {
if (!hitag2_write_page(rx, rxlen, tx, txlen)) {
return false;
}
break;
}
}
else {
memcpy(tag.sectors[blocknr], rx, 4);
blocknr++;
}
blocknr++;
if (blocknr > 7) {
DbpString("Read succesful!");
bSuccessful = true;
@ -1104,6 +1109,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
memcpy(password, htd->pwd.password, 4);
blocknr = 0;
bPwd = false;
bAuthenticating = false;
break;
}
case RHT2F_AUTHENTICATE: {
@ -1405,6 +1411,7 @@ void WriterHitag(hitag_function htf, hitag_data *htd, int page) {
Dbhexdump(4, password, false);
blocknr = page;
bPwd = false;
bAuthenticating = false;
writestate = WRITE_STATE_START;
}
break;