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

style

Browse source
This commit is contained in:
iceman1001 2022-06-12 11:51:50 +02:00
commit 372ab2af98
9 changed files with 53 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client/src/mifare/mifarehost.c
View file

@ -651,8 +651,7 @@ int mfStaticNested(uint8_t blockNo, uint8_t keyType, uint8_t* key, uint8_t trgBl
dist = 161; dist = 161;
} }
} }
} } else {
else {
level = 0; level = 0;
} }
@ -698,8 +697,7 @@ int mfStaticNested(uint8_t blockNo, uint8_t keyType, uint8_t* key, uint8_t trgBl
p3->even = -1; p3->even = -1;
statelists[0].len = p3 - statelists[0].head.slhead; statelists[0].len = p3 - statelists[0].head.slhead;
statelists[0].tail.sltail = --p3; statelists[0].tail.sltail = --p3;
} } else { // fast decrypt static nested
else { // fast decrypt static nested
PrintAndLogEx(SUCCESS, "Fast staticnested decrypt running..."); PrintAndLogEx(SUCCESS, "Fast staticnested decrypt running...");
@ -755,8 +753,7 @@ int mfStaticNested(uint8_t blockNo, uint8_t keyType, uint8_t* key, uint8_t trgBl
p4++; p4++;
p2++; p2++;
} }
} } else {
else {
while (Compare16Bits(p1, p2) == -1) p1++; while (Compare16Bits(p1, p2) == -1) p1++;
while (Compare16Bits(p1, p2) == 1) p2++; while (Compare16Bits(p1, p2) == 1) p2++;
} }
@ -843,8 +840,7 @@ int mfStaticNested(uint8_t blockNo, uint8_t keyType, uint8_t* key, uint8_t trgBl
return res; return res;
} }
res = mfCheckKeys_file(destfn, &key64); res = mfCheckKeys_file(destfn, &key64);
} } else {
else {
res = mfCheckKeys(statelists[0].blockNo, statelists[0].keyType, false, chunk, p_keyblock, &key64); res = mfCheckKeys(statelists[0].blockNo, statelists[0].keyType, false, chunk, p_keyblock, &key64);
} }
@ -862,8 +858,7 @@ int mfStaticNested(uint8_t blockNo, uint8_t keyType, uint8_t* key, uint8_t trgBl
sprint_hex(resultKey, 6) sprint_hex(resultKey, 6)
); );
return PM3_SUCCESS; return PM3_SUCCESS;
} } else if (res == PM3_ETIMEOUT || res == PM3_EOPABORTED) {
else if (res == PM3_ETIMEOUT || res == PM3_EOPABORTED) {
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
free(mem); free(mem);
return res; return res;