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

Merge branch 'master' into hitag

Browse source 
* master:
  style
This commit is contained in:
Philippe Teuwen 2020-01-15 19:25:39 +01:00
commit 78a6aa389b
6 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/cmdhfmf.c
View file

@ -1578,7 +1578,7 @@ static int CmdHF14AMfNestedStatic(const char *Cmd) {
for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) { for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) {
for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; ++sectorNo) { for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; ++sectorNo) {
for (int i = 0; i < 1; i++) { for (int i = 0; i < 1; i++) {
if (e_sector[sectorNo].foundKey[trgKeyType]) continue; if (e_sector[sectorNo].foundKey[trgKeyType]) continue;

16
client/mifare/mifarehost.c
View file

@ -563,14 +563,14 @@ int mfStaticNested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBl
// create key candidates. // create key candidates.
while (p1 <= statelists[0].tail.sltail) { while (p1 <= statelists[0].tail.sltail) {
struct Crypto1State savestate; struct Crypto1State savestate;
savestate = *p1; savestate = *p1;
while (Compare16Bits(p1, &savestate) == 0 && p1 <= statelists[0].tail.sltail) { while (Compare16Bits(p1, &savestate) == 0 && p1 <= statelists[0].tail.sltail) {
*p3 = *p1; *p3 = *p1;
lfsr_rollback_word(p3, statelists[0].nt_enc ^ statelists[0].uid, 0); lfsr_rollback_word(p3, statelists[0].nt_enc ^ statelists[0].uid, 0);
p3++; p3++;
p1++; p1++;
} }
} }
*(uint64_t *)p3 = -1; *(uint64_t *)p3 = -1;