mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-20 05:13:46 -07:00
style
This commit is contained in:
parent
827cd721fe
commit
ba45da1c28
3 changed files with 28 additions and 28 deletions
|
@ -81,10 +81,10 @@ int CmdHFEPAPACEReplay(const char *Cmd) {
|
||||||
while (Cmd[skip] != ' ' && Cmd[skip] != '\0') {
|
while (Cmd[skip] != ' ' && Cmd[skip] != '\0') {
|
||||||
// convert
|
// convert
|
||||||
scan_return = sscanf(Cmd + skip,
|
scan_return = sscanf(Cmd + skip,
|
||||||
"%2X%n",
|
"%2X%n",
|
||||||
(unsigned int *)(apdus[i] + apdu_lengths[i]),
|
(unsigned int *)(apdus[i] + apdu_lengths[i]),
|
||||||
&skip_add
|
&skip_add
|
||||||
);
|
);
|
||||||
|
|
||||||
if (scan_return < 1) {
|
if (scan_return < 1) {
|
||||||
PrintAndLogEx(NORMAL, (char *)usage_msg);
|
PrintAndLogEx(NORMAL, (char *)usage_msg);
|
||||||
|
|
|
@ -2250,17 +2250,17 @@ int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBloc
|
||||||
}
|
}
|
||||||
#ifdef DEBUG_KEY_ELIMINATION
|
#ifdef DEBUG_KEY_ELIMINATION
|
||||||
fprintf(fstats, "%1.1f;%1.0f;%c;%s\n",
|
fprintf(fstats, "%1.1f;%1.0f;%c;%s\n",
|
||||||
log(num_keys_tested) / log(2.0),
|
log(num_keys_tested) / log(2.0),
|
||||||
(float)num_keys_tested / brute_force_per_second,
|
(float)num_keys_tested / brute_force_per_second,
|
||||||
key_found ? 'Y' : 'N',
|
key_found ? 'Y' : 'N',
|
||||||
failstr
|
failstr
|
||||||
);
|
);
|
||||||
#else
|
#else
|
||||||
fprintf(fstats, "%1.0f;%d\n",
|
fprintf(fstats, "%1.0f;%d\n",
|
||||||
log(num_keys_tested) / log(2.0),
|
log(num_keys_tested) / log(2.0),
|
||||||
(float)num_keys_tested / brute_force_per_second,
|
(float)num_keys_tested / brute_force_per_second,
|
||||||
key_found
|
key_found
|
||||||
);
|
);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
free_nonces_memory();
|
free_nonces_memory();
|
||||||
|
|
|
@ -222,13 +222,13 @@ int CmdPyramidDemod(const char *Cmd) {
|
||||||
fc = bytebits_to_byte(bits + 53, 10);
|
fc = bytebits_to_byte(bits + 53, 10);
|
||||||
cardnum = bytebits_to_byte(bits + 63, 32);
|
cardnum = bytebits_to_byte(bits + 63, 32);
|
||||||
PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, rawHi3, rawHi2, rawHi, rawLo);
|
PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, rawHi3, rawHi2, rawHi, rawLo);
|
||||||
/*
|
/*
|
||||||
} else if (fmtLen > 32) {
|
} else if (fmtLen > 32) {
|
||||||
cardnum = bytebits_to_byte(bits + 81, 16);
|
cardnum = bytebits_to_byte(bits + 81, 16);
|
||||||
//code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen-32);
|
//code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen-32);
|
||||||
//code2 = bytebits_to_byte(bits+(size-32),32);
|
//code2 = bytebits_to_byte(bits+(size-32),32);
|
||||||
PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
|
PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
|
||||||
*/
|
*/
|
||||||
} else {
|
} else {
|
||||||
cardnum = bytebits_to_byte(bits + 81, 16);
|
cardnum = bytebits_to_byte(bits + 81, 16);
|
||||||
//code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen);
|
//code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue