make style
This commit is contained in:
44 files changed
+1127
-1162
No files matched your search
@@ -467,7 +467,7 @@ static int CmdFlashMemSpiFFSWipe(const char *Cmd) {
|
||||
CLIParserInit(&ctx, "mem spiffs wipe",
|
||||
_RED_("* * * Warning * * *") " \n"
|
||||
_CYAN_("This command wipes all files on the device SPIFFS file system"),
|
||||
"mem spiffs wipe");
|
||||
"mem spiffs wipe");
|
||||
|
||||
void *argtable[] = {
|
||||
arg_param_begin,
|
||||
|
||||
@@ -3025,7 +3025,7 @@ int infoHF14A(bool verbose, bool do_nack_test, bool do_aid_search) {
|
||||
int16_t fsci = card.ats[1] & 0x0f;
|
||||
|
||||
PrintAndLogEx(INFO, " ..." _YELLOW_("%02X") "............ T0 TA1 is%s present, TB1 is%s present, "
|
||||
"TC1 is%s present, FSCI is %d (FSC = %d)",
|
||||
"TC1 is%s present, FSCI is %d (FSC = %d)",
|
||||
card.ats[1],
|
||||
(ta1 ? "" : _RED_(" NOT")),
|
||||
(tb1 ? "" : _RED_(" NOT")),
|
||||
@@ -3047,7 +3047,7 @@ int infoHF14A(bool verbose, bool do_nack_test, bool do_aid_search) {
|
||||
if (strlen(ds) != 0) ds[strlen(ds) - 2] = '\0';
|
||||
if (strlen(dr) != 0) dr[strlen(dr) - 2] = '\0';
|
||||
PrintAndLogEx(INFO, " ......" _YELLOW_("%02X") "......... TA1 different divisors are%s supported, "
|
||||
"DR: [%s], DS: [%s]",
|
||||
"DR: [%s], DS: [%s]",
|
||||
card.ats[pos],
|
||||
((card.ats[pos] & 0x80) ? _RED_(" NOT") : ""),
|
||||
dr,
|
||||
|
||||
@@ -613,7 +613,7 @@ static bool calypso_json_parse_hex_uint(json_t *value, uint32_t max, uint32_t *o
|
||||
return false;
|
||||
}
|
||||
|
||||
while (isspace((unsigned char)*text)) {
|
||||
while (isspace((unsigned char) * text)) {
|
||||
text++;
|
||||
}
|
||||
|
||||
@@ -624,7 +624,7 @@ static bool calypso_json_parse_hex_uint(json_t *value, uint32_t max, uint32_t *o
|
||||
return false;
|
||||
}
|
||||
|
||||
while (isspace((unsigned char)*end)) {
|
||||
while (isspace((unsigned char) * end)) {
|
||||
end++;
|
||||
}
|
||||
|
||||
|
||||
+18
-18
@@ -350,10 +350,10 @@ static void print_status_flag1_interpretation(void) {
|
||||
PrintAndLogEx(INFO, "----+--------------------------------------------------------------------------------------------------------------------");
|
||||
PrintAndLogEx(INFO, " 00 | Indicates the successful completion of a command.");
|
||||
PrintAndLogEx(INFO, " FF | If an error occurs during the processing of a command that includes no list in the command packet, \n"
|
||||
" | or if an error occurs independently of any list, the card returns a response by setting FFh to Status Flag1.");
|
||||
" | or if an error occurs independently of any list, the card returns a response by setting FFh to Status Flag1.");
|
||||
PrintAndLogEx(INFO, " XX | If an error occurs while processing a command that includes Service Code List or Block List \n"
|
||||
" | in the command packet, the card returns a response by setting a number in the list to Status Flag1,\n"
|
||||
" | indicating the location of the error.");
|
||||
" | in the command packet, the card returns a response by setting a number in the list to Status Flag1,\n"
|
||||
" | indicating the location of the error.");
|
||||
PrintAndLogEx(INFO, "----+--------------------------------------------------------------------------------------------------------------------");
|
||||
}
|
||||
|
||||
@@ -362,28 +362,28 @@ static void print_status_flag2_interpration(void) {
|
||||
PrintAndLogEx(INFO, "----+--------------------------------------------------------------------------------------------------------------------");
|
||||
PrintAndLogEx(INFO, " 00 | Indicates the successful completion of a command.");
|
||||
PrintAndLogEx(INFO, " 01 | The calculated result is either less than zero when the purse data is decremented, or exceeds 4\n"
|
||||
" | Bytes when the purse data is incremented.");
|
||||
" | Bytes when the purse data is incremented.");
|
||||
PrintAndLogEx(INFO, " 02 | The specified data exceeds the value of cashback data at cashback of purse.");
|
||||
PrintAndLogEx(INFO, " 70 | Memory error (fatal error).");
|
||||
PrintAndLogEx(INFO, " 71 | The number of memory rewrites exceeds the upper limit (this is only a warning; data writing is performed as normal).\n"
|
||||
" | The maximum number of rewrites can differ, depending on the product being used.\n"
|
||||
" | In addition, Status Flag1 is either 00h or FFh depending on the product being used.");
|
||||
" | The maximum number of rewrites can differ, depending on the product being used.\n"
|
||||
" | In addition, Status Flag1 is either 00h or FFh depending on the product being used.");
|
||||
|
||||
PrintAndLogEx(INFO, " A1 | Illegal Number of Service| Number of Service or Number of Node specified by the command \n"
|
||||
" | falls outside the range of the prescribed value.");
|
||||
" | falls outside the range of the prescribed value.");
|
||||
PrintAndLogEx(INFO, " A2 | Illegal command packet (specified Number of Block) : Number of Block specified by the \n"
|
||||
" | command falls outside the range of the prescribed values for the product.");
|
||||
" | command falls outside the range of the prescribed values for the product.");
|
||||
PrintAndLogEx(INFO, " A3 | Illegal Block List (specified order of Service) : Service Code List Order specified by \n"
|
||||
" | Block List Element falls outside the Number of Service specified by the command \n"
|
||||
" | (or the Number of Service specified at the times of mutual authentication).");
|
||||
" | Block List Element falls outside the Number of Service specified by the command \n"
|
||||
" | (or the Number of Service specified at the times of mutual authentication).");
|
||||
PrintAndLogEx(INFO, " A4 | Illegal Service type : Area Attribute specified by the command or Service Attribute of Service Code is incorrect.");
|
||||
PrintAndLogEx(INFO, " A5 | Access is not allowed : Area or Service specified by the command cannot be accessed.\n"
|
||||
" | The parameter specified by the command does not satisfy the conditions for success.");
|
||||
" | The parameter specified by the command does not satisfy the conditions for success.");
|
||||
PrintAndLogEx(INFO, " A6 | Illegal Service Code List : Target to be accessed, identified by Service Code List Order, specified by Block\n"
|
||||
" | List Element does not exist. Or, Node specified by Node Code List does not exist.");
|
||||
" | List Element does not exist. Or, Node specified by Node Code List does not exist.");
|
||||
PrintAndLogEx(INFO, " A7 | Illegal Block List (Access Mode) : Access Mode specified by Block List Element is incorrect.");
|
||||
PrintAndLogEx(INFO, " A8 | Illegal Block Number Block Number (access to the specified data is inhibited) :\n"
|
||||
" | specified by Block List Element exceeds the number of Blocks assigned to Service.");
|
||||
" | specified by Block List Element exceeds the number of Blocks assigned to Service.");
|
||||
PrintAndLogEx(INFO, " A9 | Data write failure : This is the error that occurs in issuance commands.");
|
||||
PrintAndLogEx(INFO, " AA | Key-change failure : Key change failed.");
|
||||
PrintAndLogEx(INFO, " AB | Illegal Package Parity or illegal Package MAC : This is the error that occurs in issuance commands.");
|
||||
@@ -391,7 +391,7 @@ static void print_status_flag2_interpration(void) {
|
||||
PrintAndLogEx(INFO, " AD | Service exists already : This is the error that occurs in issuance commands.");
|
||||
PrintAndLogEx(INFO, " AE | Illegal System Code : This is the error that occurs in issuance commands.");
|
||||
PrintAndLogEx(INFO, " AF | Too many simultaneous cyclic write operations : Number of simultaneous write Blocks\n"
|
||||
" | specified by the command to Cyclic Service exceeds the number of Blocks assigned to Service.");
|
||||
" | specified by the command to Cyclic Service exceeds the number of Blocks assigned to Service.");
|
||||
PrintAndLogEx(INFO, " C0 | Illegal Package Identifier : This is the error that occurs in issuance commands.");
|
||||
PrintAndLogEx(INFO, " C1 | Discrepancy of parameters inside and outside Package : This is the error that occurs in issuance commands.");
|
||||
PrintAndLogEx(INFO, " C2 | Command is disabled already : This is the error that occurs in issuance commands.");
|
||||
@@ -415,16 +415,16 @@ static void print_number_of_service_constraints(void) {
|
||||
|
||||
static void print_number_of_block_constraints(void) {
|
||||
PrintAndLogEx(INFO, " - Number of Block: shall be less than or equal to the maximum number of Blocks that can be read simultaneously.\n"
|
||||
" The maximum number of Blocks that can be read simultaneously can differ, depending on the product being used.\n"
|
||||
" Use as default 01");
|
||||
" The maximum number of Blocks that can be read simultaneously can differ, depending on the product being used.\n"
|
||||
" Use as default 01");
|
||||
}
|
||||
|
||||
static void print_service_code_list_constraints(void) {
|
||||
PrintAndLogEx(INFO, " - Service Code List: For Service Code List, only Service Code existing in the product shall be specified:");
|
||||
PrintAndLogEx(INFO, " - Even when Service Code exists in the product, Service Code not referenced from Block List shall not \n"
|
||||
" be specified to Service Code List.");
|
||||
" be specified to Service Code List.");
|
||||
PrintAndLogEx(INFO, " - For existence or nonexistence of Service in a product, please check using the Request Service \n"
|
||||
" (or Request Service v2) command.");
|
||||
" (or Request Service v2) command.");
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -381,7 +381,7 @@ static int hfgal_create_creds_app(DesfireContext_t *ctx, uint8_t *site_key, uint
|
||||
// UID is required for key diversification
|
||||
if (ctx->uidlen == 0) {
|
||||
PM3_RET_ERR(PM3_EINVARG, "UID is required for key diversification. "
|
||||
"Please fetch it before calling `hfgal_create_creds_app`");
|
||||
"Please fetch it before calling `hfgal_create_creds_app`");
|
||||
}
|
||||
|
||||
// Create application
|
||||
@@ -871,11 +871,11 @@ static int hfgal_read_desfire_card(uint32_t aid, uint8_t *site_key, bool verbose
|
||||
PM3_RET_IF_ERR_MAYBE_MSG(res, !quiet, "Failed reading card application credentials");
|
||||
|
||||
PrintAndLogEx(SUCCESS, "Gallagher (AID %06X) - region: " _GREEN_("%c") " ( " _GREEN_("%u") " )"
|
||||
", facility: " _GREEN_("%u")
|
||||
", card number: " _GREEN_("%u")
|
||||
", issue level: " _GREEN_("%u"),
|
||||
", facility: " _GREEN_("%u")
|
||||
", card number: " _GREEN_("%u")
|
||||
", issue level: " _GREEN_("%u"),
|
||||
current_aid,
|
||||
'A' + creds.region_code,
|
||||
'A' + creds.region_code,
|
||||
creds.region_code,
|
||||
creds.facility_code,
|
||||
creds.card_number,
|
||||
@@ -1696,10 +1696,10 @@ static int CmdGallagherDecode(const char *cmd) {
|
||||
gallagher_decode_creds(data_buf, &creds);
|
||||
|
||||
PrintAndLogEx(SUCCESS, "Gallagher - region: " _GREEN_("%c") " ( " _GREEN_("%u") " )"
|
||||
", facility: " _GREEN_("%u")
|
||||
", card number: " _GREEN_("%u")
|
||||
", issue level: " _GREEN_("%u"),
|
||||
'A' + creds.region_code,
|
||||
", facility: " _GREEN_("%u")
|
||||
", card number: " _GREEN_("%u")
|
||||
", issue level: " _GREEN_("%u"),
|
||||
'A' + creds.region_code,
|
||||
creds.region_code,
|
||||
creds.facility_code,
|
||||
creds.card_number,
|
||||
|
||||
@@ -352,7 +352,7 @@ static int decode_and_print_memory(uint16_t card_size, const uint8_t *input_buff
|
||||
// for printing the complete segment we need at least wrc + wrp_len + remain_seg_payload_len bytes
|
||||
if ((i + wrc + wrp_len + remain_seg_payload_len) > card_size) {
|
||||
PrintAndLogEx(FAILED, "Cannot read segment body, because the input buffer is too small. "
|
||||
"Please check that the data is correct and properly aligned. ");
|
||||
"Please check that the data is correct and properly aligned. ");
|
||||
return_value = PM3_EOUTOFBOUND;
|
||||
goto out;
|
||||
}
|
||||
@@ -436,7 +436,7 @@ static int decode_and_print_memory(uint16_t card_size, const uint8_t *input_buff
|
||||
// for printing the complete segment we need at least wrc + wrp_len + remain_seg_payload_len bytes
|
||||
if ((i + wrc + wrp_len + remain_seg_payload_len) > card_size) {
|
||||
PrintAndLogEx(FAILED, "Cannot read segment body, because the input buffer is too small. "
|
||||
"Please check that the data is correct and properly aligned. ");
|
||||
"Please check that the data is correct and properly aligned. ");
|
||||
return_value = PM3_EOUTOFBOUND;
|
||||
goto out;
|
||||
}
|
||||
@@ -607,7 +607,7 @@ static int CmdLegicSim(const char *Cmd) {
|
||||
"If a file is supplied, it is loaded into emulator memory first.",
|
||||
"hf legic sim --22\n"
|
||||
"hf legic sim -f myfile.bin --1024\n"
|
||||
);
|
||||
);
|
||||
|
||||
void *argtable[] = {
|
||||
arg_param_begin,
|
||||
|
||||
@@ -5050,7 +5050,7 @@ void printKeyTableEx(size_t sectorscnt, sector_t *e_sector, uint8_t start_sector
|
||||
_YELLOW_("H") ":Hardnested / "
|
||||
_YELLOW_("C") ":statiCnested / "
|
||||
_YELLOW_("A") ":keyA "
|
||||
" )"
|
||||
" )"
|
||||
);
|
||||
if (sectorscnt == 18) {
|
||||
PrintAndLogEx(INFO, "( " _MAGENTA_("*") " ) These sectors used for signature. Lays outside of user memory");
|
||||
|
||||
@@ -9234,7 +9234,7 @@ static int CmdHF14ADesVerifyCert(const char *Cmd) {
|
||||
arg_str0(NULL, "fid", "<hex>", "Certificate file ID (1 byte)"), // 15
|
||||
arg_lit0(NULL, "no-auth", "Read certificate file without authentication"), // 16
|
||||
arg_strn(NULL, "ca", "<name|cert|pubkey|path|skip>", 0, MFDES_VERIFYCERT_MAX_CAS,
|
||||
"CA input, or `skip` to skip certificate signature validation. Repeat --ca for multiple entries"), // 17
|
||||
"CA input, or `skip` to skip certificate signature validation. Repeat --ca for multiple entries"), // 17
|
||||
arg_str0(NULL, "keyaid", "<hex>", "Key application ID (default: cert app)"), // 18
|
||||
arg_str0(NULL, "keyisoid", "<hex>", "Key application ISO DF ID (2 bytes)"), // 19
|
||||
arg_str0(NULL, "keydfname", "<hex>", "Key application DF name (default: cert app)"), // 20
|
||||
|
||||
+26
-18
@@ -1236,7 +1236,7 @@ static uint32_t fm11_count_candidate_seed_matches_vec(const fm11_keylist_t *list
|
||||
uint32_t i = 0;
|
||||
for (; i + 4 <= list->count; i += 4) {
|
||||
const union vec probe = VEC_U(list->data[i].seed, list->data[i + 1].seed,
|
||||
list->data[i + 2].seed, list->data[i + 3].seed);
|
||||
list->data[i + 2].seed, list->data[i + 3].seed);
|
||||
const union vec eq = vec_ueq(probe, target);
|
||||
matches += eq.elem.u[0] != 0;
|
||||
matches += eq.elem.u[1] != 0;
|
||||
@@ -1289,7 +1289,7 @@ static int fm11_filter_candidates_by_seed(fm11_keylist_t *list, uint32_t nt, uin
|
||||
uint32_t i = 0;
|
||||
for (; i + 4 <= list->count; i += 4) {
|
||||
const union vec probe = VEC_U(list->data[i].seed, list->data[i + 1].seed,
|
||||
list->data[i + 2].seed, list->data[i + 3].seed);
|
||||
list->data[i + 2].seed, list->data[i + 3].seed);
|
||||
const union vec eq = vec_ueq(probe, target);
|
||||
if (eq.elem.u[0] != 0) {
|
||||
filtered.data[filtered.count++] = list->data[i];
|
||||
@@ -1401,30 +1401,38 @@ static int fm11_intersect_pair(uint32_t nt_a, fm11_keylist_t *a, uint32_t nt_b,
|
||||
fm11_keylist_t fb = {0};
|
||||
for (uint32_t i = 0; i < a->count; i++) {
|
||||
if (((i & 0x3FF) == 0) && kbd_enter_pressed()) {
|
||||
free(bset_a); free(bset_b);
|
||||
fm11_keylist_free(&fa); fm11_keylist_free(&fb);
|
||||
free(bset_a);
|
||||
free(bset_b);
|
||||
fm11_keylist_free(&fa);
|
||||
fm11_keylist_free(&fb);
|
||||
return PM3_EOPABORTED;
|
||||
}
|
||||
if (BSET_TEST(bset_b, a->data[i].seed)) {
|
||||
int res = fm11_keylist_push_seeded(&fa, a->data[i].key, a->data[i].seed);
|
||||
if (res != PM3_SUCCESS) {
|
||||
free(bset_a); free(bset_b);
|
||||
fm11_keylist_free(&fa); fm11_keylist_free(&fb);
|
||||
free(bset_a);
|
||||
free(bset_b);
|
||||
fm11_keylist_free(&fa);
|
||||
fm11_keylist_free(&fb);
|
||||
return res;
|
||||
}
|
||||
}
|
||||
}
|
||||
for (uint32_t i = 0; i < b->count; i++) {
|
||||
if (((i & 0x3FF) == 0) && kbd_enter_pressed()) {
|
||||
free(bset_a); free(bset_b);
|
||||
fm11_keylist_free(&fa); fm11_keylist_free(&fb);
|
||||
free(bset_a);
|
||||
free(bset_b);
|
||||
fm11_keylist_free(&fa);
|
||||
fm11_keylist_free(&fb);
|
||||
return PM3_EOPABORTED;
|
||||
}
|
||||
if (BSET_TEST(bset_a, b->data[i].seed)) {
|
||||
int res = fm11_keylist_push_seeded(&fb, b->data[i].key, b->data[i].seed);
|
||||
if (res != PM3_SUCCESS) {
|
||||
free(bset_a); free(bset_b);
|
||||
fm11_keylist_free(&fa); fm11_keylist_free(&fb);
|
||||
free(bset_a);
|
||||
free(bset_b);
|
||||
fm11_keylist_free(&fa);
|
||||
fm11_keylist_free(&fb);
|
||||
return res;
|
||||
}
|
||||
}
|
||||
@@ -1462,8 +1470,8 @@ typedef struct {
|
||||
} fm11_seed_bucket_t;
|
||||
|
||||
static int fm11_build_seed_buckets(fm11_keylist_t *a, fm11_keylist_t *b,
|
||||
fm11_seed_bucket_t **buckets_out,
|
||||
uint32_t *bucket_count_out) {
|
||||
fm11_seed_bucket_t **buckets_out,
|
||||
uint32_t *bucket_count_out) {
|
||||
uint32_t *count_a = calloc(UINT16_MAX + 1, sizeof(uint32_t));
|
||||
uint32_t *count_b = calloc(UINT16_MAX + 1, sizeof(uint32_t));
|
||||
if (count_a == NULL || count_b == NULL) {
|
||||
@@ -1763,7 +1771,7 @@ static void fm11_probe_queue_push(fm11_probe_queue_t *q, uint8_t sec, uint8_t kt
|
||||
return;
|
||||
}
|
||||
}
|
||||
q->entries[q->count++] = (fm11_probe_entry_t){.sec = sec, .key_type = kt, .key = key};
|
||||
q->entries[q->count++] = (fm11_probe_entry_t) {.sec = sec, .key_type = kt, .key = key};
|
||||
}
|
||||
|
||||
static uint32_t fm11_accept_found_key_global(
|
||||
@@ -1891,9 +1899,9 @@ static uint32_t fm11_promote_singletons(const iso14a_fm11rf08s_nonces_with_data_
|
||||
}
|
||||
|
||||
static uint32_t fm11_propagate_exact_reused_keys(fm11_keylist_t candidates[FM11RF08S_SECTORS][2],
|
||||
uint64_t keys_found[FM11RF08S_SECTORS][2],
|
||||
bool found_key[FM11RF08S_SECTORS][2],
|
||||
bool promote_inferred) {
|
||||
uint64_t keys_found[FM11RF08S_SECTORS][2],
|
||||
bool found_key[FM11RF08S_SECTORS][2],
|
||||
bool promote_inferred) {
|
||||
uint32_t propagated = 0;
|
||||
if (promote_inferred == false) {
|
||||
return 0;
|
||||
@@ -3121,7 +3129,7 @@ int CmdHF14AMfSEN(const char *Cmd) {
|
||||
fm11_keylist_free(&priority);
|
||||
}
|
||||
|
||||
priority = (fm11_keylist_t){0};
|
||||
priority = (fm11_keylist_t) {0};
|
||||
retval = fm11_build_global_priority_keys(candidates, duplicate_prefix, &priority);
|
||||
if (retval != PM3_SUCCESS) {
|
||||
fm11_keylist_free(&priority);
|
||||
@@ -3256,7 +3264,7 @@ int CmdHF14AMfSEN(const char *Cmd) {
|
||||
snprintf(activity, sizeof(activity), "sec %03u key %c - checking %u candidates", real_sec, kt ? 'B' : 'A', candidates[sec][kt].count);
|
||||
|
||||
fm11_sen_progress(nonce_count, activity, candidates[sec][kt].count,
|
||||
(candidates[sec][kt].count / 2 / FM11RF08S_FCHK_KEYS_PER_SECOND) + 1);
|
||||
(candidates[sec][kt].count / 2 / FM11RF08S_FCHK_KEYS_PER_SECOND) + 1);
|
||||
uint64_t key = 0;
|
||||
int res = fm11_verify_candidates(real_sec, kt, &candidates[sec][kt], &key);
|
||||
if (res == PM3_SUCCESS) {
|
||||
|
||||
@@ -723,8 +723,8 @@ static int ntag424_authenticate_ev2_first(uint8_t keyno, uint8_t *key, ntag424_s
|
||||
if (memcmp(response.rnd_a, &rnd_a_clear[1], 15) != 0 ||
|
||||
response.rnd_a[15] != rnd_a_clear[0]) {
|
||||
PrintAndLogEx(ERR, "Incorrect response from card\n"
|
||||
"expected: %s\n"
|
||||
"got: %s"
|
||||
"expected: %s\n"
|
||||
"got: %s"
|
||||
, sprint_hex(rnd_a_clear, 16),
|
||||
sprint_hex(response.rnd_a, 16));
|
||||
return PM3_ESOFT;
|
||||
|
||||
@@ -476,11 +476,11 @@ static int CmdHFHIDConfigSim(const char *Cmd) {
|
||||
strncpy(uid_str, sprint_hex_inrow(uid, uidlen), sizeof(uid_str) - 1);
|
||||
uid_str[sizeof(uid_str) - 1] = '\0';
|
||||
PrintAndLogEx(INFO, "HID Config Card sim:"
|
||||
" UID " _YELLOW_("%s")
|
||||
" AID " _YELLOW_("%s")
|
||||
" ATS len " _YELLOW_("%d")
|
||||
" APDU overrides " _YELLOW_("%u")
|
||||
" default resp " _YELLOW_("%s"),
|
||||
" UID " _YELLOW_("%s")
|
||||
" AID " _YELLOW_("%s")
|
||||
" ATS len " _YELLOW_("%d")
|
||||
" APDU overrides " _YELLOW_("%u")
|
||||
" default resp " _YELLOW_("%s"),
|
||||
uid_str, aid_str, ats_len, apdu_count,
|
||||
has_default_resp ? sprint_hex_inrow(default_resp, default_resp_len_sz) : "9000 (builtin)");
|
||||
PrintAndLogEx(INFO, "Press " _GREEN_("pm3 button") " or " _GREEN_("<Enter>") " to abort simulation");
|
||||
|
||||
+4
-4
@@ -1829,11 +1829,11 @@ int CmdLFRelay(const char *Cmd) {
|
||||
" --rdr : Reading device, act as IP client and reads LF tag and sends data\n"
|
||||
" --tag : Simulation device, act as IP server and simulates relayed data\n",
|
||||
_WHITE_("Device A, reading LF tag, client") "\n"
|
||||
"lf relay --rdr --ip 192.168.1.141 -> Client, connect to IP 192.168.1.141:8000\n"
|
||||
"lf relay --rdr --ip 192.168.1.141 -p 18111 -> Client, connect to IP 192.168.1.141:18111 \n\n"
|
||||
"lf relay --rdr --ip 192.168.1.141 -> Client, connect to IP 192.168.1.141:8000\n"
|
||||
"lf relay --rdr --ip 192.168.1.141 -p 18111 -> Client, connect to IP 192.168.1.141:18111 \n\n"
|
||||
_WHITE_("Device B, simulate LF tag, server") "\n"
|
||||
"lf relay --tag -p 8111 -> Server listening port 8111, recv 40000 samples\n"
|
||||
"lf relay --tag -s 10000 -> Server listening port 8000, recv 10000 samples\n"
|
||||
"lf relay --tag -p 8111 -> Server listening port 8111, recv 40000 samples\n"
|
||||
"lf relay --tag -s 10000 -> Server listening port 8000, recv 10000 samples\n"
|
||||
);
|
||||
|
||||
void *argtable[] = {
|
||||
|
||||
@@ -948,9 +948,9 @@ static int CmdT55xxReadBlock(const char *Cmd) {
|
||||
_CYAN_("Use of read with password on a tag not configured") "\n"
|
||||
_CYAN_("for a password can damage the tag") "\n"
|
||||
_RED_(" * * * * * * * * * *"),
|
||||
"lf t55xx read -b 0 --> read data from block 0\n"
|
||||
"lf t55xx read -b 0 --pwd 01020304 --> read data from block 0, pwd 01020304\n"
|
||||
"lf t55xx read -b 0 --pwd 01020304 -o --> read data from block 0, pwd 01020304, override\n"
|
||||
"lf t55xx read -b 0 --> read data from block 0\n"
|
||||
"lf t55xx read -b 0 --pwd 01020304 --> read data from block 0, pwd 01020304\n"
|
||||
"lf t55xx read -b 0 --pwd 01020304 -o --> read data from block 0, pwd 01020304, override\n"
|
||||
);
|
||||
|
||||
// 1 (help) + 4(four user specified params) + (5 T55XX_DLMODE_SINGLE)
|
||||
|
||||
@@ -1498,7 +1498,7 @@ int CmdTraceList(const char *Cmd) {
|
||||
|
||||
if (protocol == LEGIC)
|
||||
PrintAndLogEx(INFO, _YELLOW_("LEGIC") " - Reader Mode: Timings are in ticks (1us == 1.5ticks)\n"
|
||||
" Tag Mode: Timings are in sub carrier periods (1/212 kHz == 4.7us)");
|
||||
" Tag Mode: Timings are in sub carrier periods (1/212 kHz == 4.7us)");
|
||||
|
||||
if (protocol == ISO_14443B || protocol == PROTO_CRYPTORF) {
|
||||
if (use_us)
|
||||
|
||||
+1
-1
@@ -124,7 +124,7 @@ static int build_segs_from_phdrs(flash_file_t *ctx, uint32_t flash_size) {
|
||||
offset);
|
||||
if (filesz != memsz) {
|
||||
PrintAndLogEx(ERR, "Error: PHDR file size does not equal memory size\n"
|
||||
"(DATA+BSS PHDRs do not make sense on ROM platforms!)");
|
||||
"(DATA+BSS PHDRs do not make sense on ROM platforms!)");
|
||||
return PM3_EFILE;
|
||||
}
|
||||
if (paddr < last_end) {
|
||||
|
||||
@@ -300,10 +300,10 @@ void print_gallagher_creds(GallagherCredentials_t *creds) {
|
||||
return;
|
||||
}
|
||||
PrintAndLogEx(SUCCESS, "Gallagher - region: " _GREEN_("%c") " ( " _GREEN_("%u") " )"
|
||||
", facility: " _GREEN_("%u")
|
||||
", card number: " _GREEN_("%u")
|
||||
", issue level: " _GREEN_("%u"),
|
||||
'A' + creds->region_code,
|
||||
", facility: " _GREEN_("%u")
|
||||
", card number: " _GREEN_("%u")
|
||||
", issue level: " _GREEN_("%u"),
|
||||
'A' + creds->region_code,
|
||||
creds->region_code,
|
||||
creds->facility_code,
|
||||
creds->card_number,
|
||||
|
||||
@@ -319,10 +319,10 @@ int mf_check_keys_fast_ex(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastCh
|
||||
|
||||
PrintAndLogEx(NORMAL, "");
|
||||
PrintAndLogEx(SUCCESS, "\nTarget block " _GREEN_("%4u") " key type " _GREEN_("%c") " -- found valid key [ " _GREEN_("%s") " ]",
|
||||
block_no,
|
||||
key_type ? 'B' : 'A',
|
||||
sprint_hex_inrow(resp.data.asBytes, MIFARE_KEY_SIZE)
|
||||
);
|
||||
block_no,
|
||||
key_type ? 'B' : 'A',
|
||||
sprint_hex_inrow(resp.data.asBytes, MIFARE_KEY_SIZE)
|
||||
);
|
||||
|
||||
return PM3_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -2756,9 +2756,9 @@ static int _wrap_new_pm3(lua_State *L) {
|
||||
}
|
||||
|
||||
SWIG_Lua_pusherrstring(L, "Wrong arguments for overloaded function 'new_pm3'\n"
|
||||
" Possible C/C++ prototypes are:\n"
|
||||
" pm3::pm3()\n"
|
||||
" pm3::pm3(char *)\n");
|
||||
" Possible C/C++ prototypes are:\n"
|
||||
" pm3::pm3()\n"
|
||||
" pm3::pm3(char *)\n");
|
||||
lua_error(L);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -356,6 +356,7 @@ const static vocabulary_t vocabulary[] = {
|
||||
{ 0, "hf legic rdbl" },
|
||||
{ 0, "hf legic reader" },
|
||||
{ 0, "hf legic restore" },
|
||||
{ 0, "hf legic clone" },
|
||||
{ 0, "hf legic wipe" },
|
||||
{ 0, "hf legic wrbl" },
|
||||
{ 0, "hf legic sim" },
|
||||
@@ -379,6 +380,7 @@ const static vocabulary_t vocabulary[] = {
|
||||
{ 0, "hf mf nested" },
|
||||
{ 1, "hf mf hardnested" },
|
||||
{ 0, "hf mf staticnested" },
|
||||
{ 0, "hf mf sen" },
|
||||
{ 0, "hf mf brute" },
|
||||
{ 0, "hf mf autopwn" },
|
||||
{ 0, "hf mf nack" },
|
||||
|
||||
@@ -854,7 +854,7 @@ static int dumpmem_pm3(char *serial_port_name, const char *filename, uint32_t ad
|
||||
PrintAndLogEx(INFO, "Device is running the bootloader.");
|
||||
} else {
|
||||
PrintAndLogEx(ERR, "Device is running the bootloader, but the bootloader"
|
||||
" doesn't understand the READ MEM command.");
|
||||
" doesn't understand the READ MEM command.");
|
||||
goto finish2;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user