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

style

Browse source
This commit is contained in:
iceman1001 2025-04-13 12:25:14 +02:00
commit bc1c47e81b
7 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/src/cmdhfmfu.c
View file

@ -451,7 +451,7 @@ static int ul_comp_write(uint8_t page, const uint8_t *data, uint8_t datalen) {
uint8_t response[1] = {0xFF}; uint8_t response[1] = {0xFF};
ul_send_cmd_raw(cmd, 2 + datalen, response, sizeof(response)); ul_send_cmd_raw(cmd, 2 + datalen, response, sizeof(response));
// ACK // ACK
if (response[0] == 0x0a) { if (response[0] == CARD_ACK) {
return PM3_SUCCESS; return PM3_SUCCESS;
} }
// NACK // NACK
@ -470,7 +470,8 @@ static int ulev1_requestAuthentication(const uint8_t *pwd, uint8_t *pack, uint16
int len = ul_send_cmd_raw(cmd, sizeof(cmd), pack, packLength); int len = ul_send_cmd_raw(cmd, sizeof(cmd), pack, packLength);
// NACK tables different tags, but between 0-9 is a NEGATIVE response. // NACK tables different tags, but between 0-9 is a NEGATIVE response.
// ACK == 0xA // ACK == 0xA
if (len == 1 && pack[0] <= 0x09) { // should only give you PACK (4 byytes)
if (len == 1) {
return PM3_EWRONGANSWER; return PM3_EWRONGANSWER;
} }
return len; return len;
@ -498,10 +499,7 @@ static int ulaes_requestAuthentication(const uint8_t *key, uint8_t keyno, bool s
if (WaitForResponseTimeout(CMD_HF_MIFAREULAES_AUTH, &resp, 1500) == false) { if (WaitForResponseTimeout(CMD_HF_MIFAREULAES_AUTH, &resp, 1500) == false) {
return PM3_ETIMEOUT; return PM3_ETIMEOUT;
} }
if (resp.status != PM3_SUCCESS) {
return resp.status; return resp.status;
}
return PM3_SUCCESS;
} }
static int ulc_authentication(const uint8_t *key, bool switch_off_field) { static int ulc_authentication(const uint8_t *key, bool switch_off_field) {
@ -2048,7 +2046,7 @@ uint64_t GetHF14AMfU_Type(void) {
} }
} }
} else if ((card.uid[0] == 0x05) && (card.atqa[0] == 0x44)){ } else if ((card.uid[0] == 0x05) && (card.atqa[0] == 0x44)) {
// Infineon MY-D tests Exam high nibble // Infineon MY-D tests Exam high nibble
DropField(); DropField();
uint8_t nib = (card.uid[1] & 0xf0) >> 4; uint8_t nib = (card.uid[1] & 0xf0) >> 4;

8
client/src/cmdhftesla.c
View file

@ -193,17 +193,17 @@ static int info_hf_tesla(bool parse_certs) {
} }
sw = get_sw(response, resplen); sw = get_sw(response, resplen);
if (sw == ISO7816_OK ) { if (sw == ISO7816_OK) {
// save CERT for later // save CERT for later
uint8_t cert[MAX_CERT_SIZE] = {0}; uint8_t cert[MAX_CERT_SIZE] = {0};
memcpy(cert, response, resplen - 2); memcpy(cert, response, resplen - 2);
PrintAndLogEx(INFO, "%s", sprint_hex_inrow(cert+ (cert_len_present ? 2 : 0), resplen - 2)); PrintAndLogEx(INFO, "%s", sprint_hex_inrow(cert + (cert_len_present ? 2 : 0), resplen - 2));
if (parse_certs) { if (parse_certs) {
asn1_print(cert+ (cert_len_present ? 2 : 0), cert_len-2, " "); asn1_print(cert + (cert_len_present ? 2 : 0), cert_len - 2, " ");
} }
} }
} else if ( sw == 0x6f17 ){ } else if (sw == 0x6f17) {
PrintAndLogEx(INFO, "CERT # %i", i); PrintAndLogEx(INFO, "CERT # %i", i);
PrintAndLogEx(INFO, "No certificate in slot %i", i); PrintAndLogEx(INFO, "No certificate in slot %i", i);
} else { } else {

7
doc/commands.json
View file

@ -7873,9 +7873,10 @@
], ],
"offline": true, "offline": true,
"options": [ "options": [
"-h, --help This help" "-h, --help This help",
"-p, --parse Parse the certificates as ASN.1"
], ],
"usage": "hf telsa info [-h]" "usage": "hf telsa info [-hp]"
}, },
"hf tesla list": { "hf tesla list": {
"command": "hf tesla list", "command": "hf tesla list",
@ -13357,6 +13358,6 @@
"metadata": { "metadata": {
"commands_extracted": 767, "commands_extracted": 767,
"extracted_by": "PM3Help2JSON v1.00", "extracted_by": "PM3Help2JSON v1.00",
"extracted_on": "2025-03-24T22:47:29" "extracted_on": "2025-04-13T10:20:08"
} }
} }