mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-20 13:23:51 -07:00
style
This commit is contained in:
parent
9a114815d1
commit
4c97151ecc
9 changed files with 67 additions and 67 deletions
|
@ -1934,7 +1934,7 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
|
||||||
|
|
||||||
// Compute how many keys can fit in bigbuf
|
// Compute how many keys can fit in bigbuf
|
||||||
// a key is 6 bytes
|
// a key is 6 bytes
|
||||||
uint16_t key_mem_available = MIN( (BigBuf_get_size() / MF_KEY_LENGTH), (keyCount + (size / MF_KEY_LENGTH)));
|
uint16_t key_mem_available = MIN((BigBuf_get_size() / MF_KEY_LENGTH), (keyCount + (size / MF_KEY_LENGTH)));
|
||||||
|
|
||||||
uint8_t *dictkeys = BigBuf_calloc(key_mem_available * MF_KEY_LENGTH);
|
uint8_t *dictkeys = BigBuf_calloc(key_mem_available * MF_KEY_LENGTH);
|
||||||
if (dictkeys == NULL) {
|
if (dictkeys == NULL) {
|
||||||
|
|
|
@ -2386,8 +2386,7 @@ int infoHF14A(bool verbose, bool do_nack_test, bool do_aid_search) {
|
||||||
if (
|
if (
|
||||||
(card.ats_len == 7 && memcmp(card.ats, "\x05\x78\x77\x80\x02\x9C\x3A", 7) == 0) ||
|
(card.ats_len == 7 && memcmp(card.ats, "\x05\x78\x77\x80\x02\x9C\x3A", 7) == 0) ||
|
||||||
(card.ats_len == 7 && memcmp(card.ats, "\x05\x78\x77\x94\x02\x6D\xC8", 7) == 0)
|
(card.ats_len == 7 && memcmp(card.ats, "\x05\x78\x77\x94\x02\x6D\xC8", 7) == 0)
|
||||||
)
|
) {
|
||||||
{
|
|
||||||
isSEOS = true;
|
isSEOS = true;
|
||||||
isNTAG424 = false;
|
isNTAG424 = false;
|
||||||
isMifareDESFire = false;
|
isMifareDESFire = false;
|
||||||
|
|
|
@ -2768,7 +2768,7 @@ static int CmdHF14AMfAutoPWN(const char *Cmd) {
|
||||||
PrintAndLogEx(INFO, " keytype ....... " _YELLOW_("%c"), (keytype == MF_KEY_B) ? 'B' : 'A');
|
PrintAndLogEx(INFO, " keytype ....... " _YELLOW_("%c"), (keytype == MF_KEY_B) ? 'B' : 'A');
|
||||||
PrintAndLogEx(INFO, " known key ..... " _YELLOW_("%s"), sprint_hex_inrow(key, sizeof(key)));
|
PrintAndLogEx(INFO, " known key ..... " _YELLOW_("%s"), sprint_hex_inrow(key, sizeof(key)));
|
||||||
|
|
||||||
switch(has_staticnonce) {
|
switch (has_staticnonce) {
|
||||||
case NONCE_STATIC: {
|
case NONCE_STATIC: {
|
||||||
PrintAndLogEx(INFO, " card PRNG ..... " _YELLOW_("STATIC"));
|
PrintAndLogEx(INFO, " card PRNG ..... " _YELLOW_("STATIC"));
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -2433,7 +2433,7 @@ int loadFileDICTIONARY_safe_ex(const char *preferredName, const char *suffix, vo
|
||||||
fclose(f);
|
fclose(f);
|
||||||
|
|
||||||
if (verbose) {
|
if (verbose) {
|
||||||
PrintAndLogEx(SUCCESS, "Loaded " _GREEN_("%2d") " keys from dictionary file `" _YELLOW_("%s") "`", *keycnt, path);
|
PrintAndLogEx(SUCCESS, "Loaded " _GREEN_("%d") " keys from dictionary file `" _YELLOW_("%s") "`", *keycnt, path);
|
||||||
}
|
}
|
||||||
|
|
||||||
out:
|
out:
|
||||||
|
|
|
@ -4400,6 +4400,7 @@
|
||||||
"--slow Slower acquisition (required by some non standard cards)",
|
"--slow Slower acquisition (required by some non standard cards)",
|
||||||
"-l, --legacy legacy mode (use the slow `hf mf chk`)",
|
"-l, --legacy legacy mode (use the slow `hf mf chk`)",
|
||||||
"-v, --verbose verbose output",
|
"-v, --verbose verbose output",
|
||||||
|
"--mem Use dictionary from flashmemory",
|
||||||
"--ns No save to file",
|
"--ns No save to file",
|
||||||
"--mini MIFARE Classic Mini / S20",
|
"--mini MIFARE Classic Mini / S20",
|
||||||
"--1k MIFARE Classic 1k / S50 (default)",
|
"--1k MIFARE Classic 1k / S50 (default)",
|
||||||
|
@ -4412,7 +4413,7 @@
|
||||||
"--i2 AVX2",
|
"--i2 AVX2",
|
||||||
"--i5 AVX512"
|
"--i5 AVX512"
|
||||||
],
|
],
|
||||||
"usage": "hf mf autopwn [-hablv] [-k <hex>]... [-s <dec>] [-f <fn>] [--suffix <txt>] [--slow] [--ns] [--mini] [--1k] [--2k] [--4k] [--in] [--im] [--is] [--ia] [--i2] [--i5]"
|
"usage": "hf mf autopwn [-hablv] [-k <hex>]... [-s <dec>] [-f <fn>] [--suffix <txt>] [--slow] [--mem] [--ns] [--mini] [--1k] [--2k] [--4k] [--in] [--im] [--is] [--ia] [--i2] [--i5]"
|
||||||
},
|
},
|
||||||
"hf mf brute": {
|
"hf mf brute": {
|
||||||
"command": "hf mf brute",
|
"command": "hf mf brute",
|
||||||
|
@ -13356,6 +13357,6 @@
|
||||||
"metadata": {
|
"metadata": {
|
||||||
"commands_extracted": 767,
|
"commands_extracted": 767,
|
||||||
"extracted_by": "PM3Help2JSON v1.00",
|
"extracted_by": "PM3Help2JSON v1.00",
|
||||||
"extracted_on": "2025-03-21T07:07:05"
|
"extracted_on": "2025-03-22T12:16:04"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue