style: whitespace fixes
This commit is contained in:
1 parent
286df8f4eb
commit
52676ebbd4
8 files changed
+213
-68
No files matched your search
+15
-15
@@ -1577,11 +1577,11 @@ static int aliro_read_do_auth0(aliro_read_state_t *state,
|
||||
uint8_t auth0_data[ALIRO_MAX_BUFFER] = {0};
|
||||
size_t auth0_data_len = 0;
|
||||
if (aliro_append_tlv(0x41, &state->auth0_command_parameters, 1, auth0_data, sizeof(auth0_data), &auth0_data_len) != PM3_SUCCESS ||
|
||||
aliro_append_tlv(0x42, (const uint8_t[]){ALIRO_AUTH0_DEFAULT_POLICY}, 1, auth0_data, sizeof(auth0_data), &auth0_data_len) != PM3_SUCCESS ||
|
||||
aliro_append_tlv(0x5C, state->protocol_version, 2, auth0_data, sizeof(auth0_data), &auth0_data_len) != PM3_SUCCESS ||
|
||||
aliro_append_tlv(0x87, state->reader_ephemeral_public_key, 65, auth0_data, sizeof(auth0_data), &auth0_data_len) != PM3_SUCCESS ||
|
||||
aliro_append_tlv(0x4C, state->transaction_identifier, 16, auth0_data, sizeof(auth0_data), &auth0_data_len) != PM3_SUCCESS ||
|
||||
aliro_append_tlv(0x4D, state->reader_identifier, 32, auth0_data, sizeof(auth0_data), &auth0_data_len) != PM3_SUCCESS) {
|
||||
aliro_append_tlv(0x42, (const uint8_t[]) {ALIRO_AUTH0_DEFAULT_POLICY}, 1, auth0_data, sizeof(auth0_data), &auth0_data_len) != PM3_SUCCESS ||
|
||||
aliro_append_tlv(0x5C, state->protocol_version, 2, auth0_data, sizeof(auth0_data), &auth0_data_len) != PM3_SUCCESS ||
|
||||
aliro_append_tlv(0x87, state->reader_ephemeral_public_key, 65, auth0_data, sizeof(auth0_data), &auth0_data_len) != PM3_SUCCESS ||
|
||||
aliro_append_tlv(0x4C, state->transaction_identifier, 16, auth0_data, sizeof(auth0_data), &auth0_data_len) != PM3_SUCCESS ||
|
||||
aliro_append_tlv(0x4D, state->reader_identifier, 32, auth0_data, sizeof(auth0_data), &auth0_data_len) != PM3_SUCCESS) {
|
||||
PrintAndLogEx(ERR, "Failed to encode AUTH0 command");
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
@@ -1787,10 +1787,10 @@ static int aliro_read_do_auth1(aliro_read_state_t *state,
|
||||
|
||||
uint8_t auth1_data[ALIRO_MAX_BUFFER] = {0};
|
||||
size_t auth1_data_len = 0;
|
||||
if (aliro_append_tlv(0x41, (const uint8_t[]){ALIRO_AUTH1_REQUEST_PUBLIC_KEY}, 1,
|
||||
auth1_data, sizeof(auth1_data), &auth1_data_len) != PM3_SUCCESS ||
|
||||
aliro_append_tlv(0x9E, auth1_signature, 64,
|
||||
auth1_data, sizeof(auth1_data), &auth1_data_len) != PM3_SUCCESS) {
|
||||
if (aliro_append_tlv(0x41, (const uint8_t[]) {ALIRO_AUTH1_REQUEST_PUBLIC_KEY}, 1,
|
||||
auth1_data, sizeof(auth1_data), &auth1_data_len) != PM3_SUCCESS ||
|
||||
aliro_append_tlv(0x9E, auth1_signature, 64,
|
||||
auth1_data, sizeof(auth1_data), &auth1_data_len) != PM3_SUCCESS) {
|
||||
PrintAndLogEx(ERR, "Failed to encode AUTH1 command");
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
@@ -2041,7 +2041,7 @@ static int aliro_parse_step_up_scopes(struct arg_str *scope_arg, aliro_step_up_s
|
||||
char *saveptr = NULL;
|
||||
char *token = strtok_r(scope_str, ",", &saveptr);
|
||||
while (token != NULL) {
|
||||
while (isspace((unsigned char)*token)) {
|
||||
while (isspace((unsigned char) * token)) {
|
||||
token++;
|
||||
}
|
||||
|
||||
@@ -3539,11 +3539,11 @@ static int aliro_read_auth_flow(const uint8_t *kpersistent, size_t kpersistent_l
|
||||
|
||||
aliro_read_print_auth1_report(&state);
|
||||
have_fast_suggestion_cmd = aliro_read_build_fast_suggestion_command(&state,
|
||||
reader_group_identifier,
|
||||
reader_group_sub_identifier,
|
||||
reader_private_key_raw,
|
||||
fast_suggestion_cmd,
|
||||
sizeof(fast_suggestion_cmd));
|
||||
reader_group_identifier,
|
||||
reader_group_sub_identifier,
|
||||
reader_private_key_raw,
|
||||
fast_suggestion_cmd,
|
||||
sizeof(fast_suggestion_cmd));
|
||||
|
||||
if (flow == ALIRO_FLOW_STEP_UP) {
|
||||
res = aliro_read_do_step_up(&state, step_up_scopes);
|
||||
|
||||
+19
-19
@@ -69,8 +69,8 @@
|
||||
static int CmdHelp(const char *Cmd);
|
||||
static void clear_and_send_command(uint8_t flags, uint16_t datalen, uint8_t *data, bool verbose);
|
||||
static int send_felica_payload_with_retries(uint8_t flags, uint16_t datalen, uint8_t *data, bool verbose,
|
||||
int expected_response_cmd, uint32_t timeout_ms, uint32_t retries, bool logging,
|
||||
PacketResponseNG *resp, const char *request_name);
|
||||
int expected_response_cmd, uint32_t timeout_ms, uint32_t retries, bool logging,
|
||||
PacketResponseNG *resp, const char *request_name);
|
||||
static felica_card_select_t last_known_card;
|
||||
|
||||
static void set_last_known_card(felica_card_select_t card) {
|
||||
@@ -312,8 +312,8 @@ static const char *felica_specification_option_name(size_t option_index) {
|
||||
}
|
||||
|
||||
static void print_specification_versions(int level,
|
||||
const felica_request_specification_version_info_t *specification_version_info,
|
||||
bool include_hex) {
|
||||
const felica_request_specification_version_info_t *specification_version_info,
|
||||
bool include_hex) {
|
||||
if (specification_version_info == NULL || specification_version_info->has_specification_version == false) {
|
||||
return;
|
||||
}
|
||||
@@ -687,7 +687,7 @@ static int send_get_container_property(uint8_t flags, uint16_t datalen, uint8_t
|
||||
}
|
||||
|
||||
static int send_get_container_issue_information(uint8_t flags, uint16_t datalen, uint8_t *data, bool verbose,
|
||||
felica_get_container_issue_info_response_t *container_issue_info_response) {
|
||||
felica_get_container_issue_info_response_t *container_issue_info_response) {
|
||||
(void)verbose;
|
||||
PacketResponseNG resp;
|
||||
if (send_felica_payload_with_retries(flags, datalen, data, false,
|
||||
@@ -706,8 +706,8 @@ static int send_get_container_issue_information(uint8_t flags, uint16_t datalen,
|
||||
}
|
||||
|
||||
static int send_get_platform_information(uint8_t flags, uint16_t datalen, uint8_t *data, bool verbose,
|
||||
felica_status_flags_t *status_flags, uint8_t *platform_information_data,
|
||||
size_t platform_information_data_capacity, size_t *platform_information_data_len) {
|
||||
felica_status_flags_t *status_flags, uint8_t *platform_information_data,
|
||||
size_t platform_information_data_capacity, size_t *platform_information_data_len) {
|
||||
(void)verbose;
|
||||
if (status_flags == NULL || platform_information_data == NULL || platform_information_data_len == NULL) {
|
||||
return PM3_EINVARG;
|
||||
@@ -759,8 +759,8 @@ static int send_get_platform_information(uint8_t flags, uint16_t datalen, uint8_
|
||||
}
|
||||
|
||||
static int send_request_specification_version(uint8_t flags, uint16_t datalen, uint8_t *data, bool verbose,
|
||||
bool logging, uint32_t timeout_ms, uint32_t retries,
|
||||
felica_request_specification_version_info_t *specification_version_info) {
|
||||
bool logging, uint32_t timeout_ms, uint32_t retries,
|
||||
felica_request_specification_version_info_t *specification_version_info) {
|
||||
if (specification_version_info == NULL) {
|
||||
return PM3_EINVARG;
|
||||
}
|
||||
@@ -932,8 +932,8 @@ static int info_felica(bool verbose) {
|
||||
|
||||
felica_get_container_issue_info_response_t container_issue_info_response;
|
||||
if (send_get_container_issue_information(optional_flags,
|
||||
sizeof(container_issue_info_request), (uint8_t *)&container_issue_info_request, false,
|
||||
&container_issue_info_response) == PM3_SUCCESS) {
|
||||
sizeof(container_issue_info_request), (uint8_t *)&container_issue_info_request, false,
|
||||
&container_issue_info_response) == PM3_SUCCESS) {
|
||||
char model_ascii[sizeof(container_issue_info_response.mobile_phone_model_information) + 1] = {0};
|
||||
bool model_is_ascii = decode_zero_padded_ascii(
|
||||
container_issue_info_response.mobile_phone_model_information,
|
||||
@@ -1116,8 +1116,8 @@ static void log_felica_retry_attempt(const char *request_name, uint32_t attempt,
|
||||
* @return PM3_SUCCESS on success
|
||||
*/
|
||||
static int send_felica_payload_with_retries(uint8_t flags, uint16_t datalen, uint8_t *data, bool verbose,
|
||||
int expected_response_cmd, uint32_t timeout_ms, uint32_t retries, bool logging,
|
||||
PacketResponseNG *resp, const char *request_name) {
|
||||
int expected_response_cmd, uint32_t timeout_ms, uint32_t retries, bool logging,
|
||||
PacketResponseNG *resp, const char *request_name) {
|
||||
for (uint32_t attempt = 0; attempt <= retries; attempt++) {
|
||||
clear_and_send_command(flags, datalen, data, verbose);
|
||||
if (waitCmdFelicaEx(false, resp, verbose, logging, timeout_ms) == false) {
|
||||
@@ -1162,10 +1162,10 @@ int send_request_service(uint8_t flags, uint16_t datalen, uint8_t *data, bool ve
|
||||
}
|
||||
PacketResponseNG resp;
|
||||
if (send_felica_payload_with_retries(flags, datalen, data, verbose,
|
||||
0x03,
|
||||
FELICA_DEFAULT_TIMEOUT_MS, 0,
|
||||
true,
|
||||
&resp, "request service") != PM3_SUCCESS) {
|
||||
0x03,
|
||||
FELICA_DEFAULT_TIMEOUT_MS, 0,
|
||||
true,
|
||||
&resp, "request service") != PM3_SUCCESS) {
|
||||
PrintAndLogEx(ERR, "\nGot no response from card");
|
||||
return PM3_ERFTRANS;
|
||||
}
|
||||
@@ -2139,10 +2139,10 @@ static int CmdHFFelicaRequestSpecificationVersion(const char *Cmd) {
|
||||
sprint_hex(request_specification_version_request.IDm, sizeof(request_specification_version_request.IDm)));
|
||||
PrintAndLogEx(SUCCESS, "Status Flag1... %s",
|
||||
sprint_hex(specification_version_info.status_flags.status_flag1,
|
||||
sizeof(specification_version_info.status_flags.status_flag1)));
|
||||
sizeof(specification_version_info.status_flags.status_flag1)));
|
||||
PrintAndLogEx(SUCCESS, "Status Flag2... %s",
|
||||
sprint_hex(specification_version_info.status_flags.status_flag2,
|
||||
sizeof(specification_version_info.status_flags.status_flag2)));
|
||||
sizeof(specification_version_info.status_flags.status_flag2)));
|
||||
|
||||
if (specification_version_info.has_specification_version) {
|
||||
print_specification_versions(SUCCESS, &specification_version_info, true);
|
||||
|
||||
@@ -4933,9 +4933,9 @@ static int CmdHFiClassLegacyRecSim(bool credit) {
|
||||
}
|
||||
|
||||
uint8_t new_div_key[8] = {0};
|
||||
if (credit == true){
|
||||
if (credit == true) {
|
||||
HFiClassCalcDivKey(csn, iClass_Key_Table[1], new_div_key, false);
|
||||
}else{
|
||||
} else {
|
||||
HFiClassCalcDivKey(csn, iClass_Key_Table[0], new_div_key, false);
|
||||
}
|
||||
|
||||
@@ -5050,8 +5050,8 @@ static int CmdHFiClassLegacyRecover(const char *Cmd) {
|
||||
} else if (test) {
|
||||
loop = 1;
|
||||
fast = false;
|
||||
}else if (debug) {
|
||||
if (loop > 10){
|
||||
} else if (debug) {
|
||||
if (loop > 10) {
|
||||
loop = 10;
|
||||
}
|
||||
fast = false;
|
||||
@@ -5065,10 +5065,10 @@ static int CmdHFiClassLegacyRecover(const char *Cmd) {
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
|
||||
if(credit == true){
|
||||
if (credit == true) {
|
||||
diversifyKey(csn, iClass_Key_Table[0], new_div_key);
|
||||
fast = false;
|
||||
}else{
|
||||
} else {
|
||||
diversifyKey(csn, iClass_Key_Table[1], new_div_key);
|
||||
}
|
||||
|
||||
|
||||
@@ -214,6 +214,10 @@ const static vocabulary_t vocabulary[] = {
|
||||
{ 0, "hf 15 writeafi" },
|
||||
{ 0, "hf 15 writedsfid" },
|
||||
{ 0, "hf 15 csetuid" },
|
||||
{ 1, "hf aliro help" },
|
||||
{ 1, "hf aliro list" },
|
||||
{ 0, "hf aliro info" },
|
||||
{ 0, "hf aliro read" },
|
||||
{ 1, "hf cipurse help" },
|
||||
{ 0, "hf cipurse info" },
|
||||
{ 0, "hf cipurse select" },
|
||||
@@ -240,6 +244,7 @@ const static vocabulary_t vocabulary[] = {
|
||||
{ 1, "hf felica help" },
|
||||
{ 1, "hf felica list" },
|
||||
{ 0, "hf felica info" },
|
||||
{ 0, "hf felica seacinfo" },
|
||||
{ 0, "hf felica raw" },
|
||||
{ 0, "hf felica rdbl" },
|
||||
{ 0, "hf felica reader" },
|
||||
@@ -473,7 +478,6 @@ const static vocabulary_t vocabulary[] = {
|
||||
{ 0, "hf mfdes getaids" },
|
||||
{ 0, "hf mfdes getappnames" },
|
||||
{ 0, "hf mfdes bruteaid" },
|
||||
{ 0, "hf mfdes bruteisofid" },
|
||||
{ 0, "hf mfdes createapp" },
|
||||
{ 0, "hf mfdes deleteapp" },
|
||||
{ 0, "hf mfdes selectapp" },
|
||||
@@ -482,6 +486,7 @@ const static vocabulary_t vocabulary[] = {
|
||||
{ 0, "hf mfdes chkeysettings" },
|
||||
{ 0, "hf mfdes getkeysettings" },
|
||||
{ 0, "hf mfdes getkeyversions" },
|
||||
{ 0, "hf mfdes bruteisofid" },
|
||||
{ 0, "hf mfdes getfileids" },
|
||||
{ 0, "hf mfdes getfileisoids" },
|
||||
{ 0, "hf mfdes lsfiles" },
|
||||
|
||||
Reference in new issue
Block a user