make style
This commit is contained in:
1 parent
ac970064d3
commit
910c4d8c92
9 files changed
+37
-20
No files matched your search
@@ -1324,7 +1324,7 @@ static int CmdHFiClassESetBlk(const char *Cmd) {
|
||||
static bool iclass_detect_new_pacs(uint8_t *d) {
|
||||
uint8_t n = 0;
|
||||
while (n++ < (PICOPASS_BLOCK_SIZE / 2)) {
|
||||
if (d[n] &&
|
||||
if (d[n] &&
|
||||
d[n + 1] == 0xA6) {
|
||||
return true;
|
||||
}
|
||||
@@ -1332,7 +1332,7 @@ static bool iclass_detect_new_pacs(uint8_t *d) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// block 7 decoder for PACS
|
||||
// block 7 decoder for PACS
|
||||
static int iclass_decode_credentials_new_pacs(uint8_t *d) {
|
||||
|
||||
uint8_t offset = 0;
|
||||
@@ -1349,7 +1349,7 @@ static int iclass_decode_credentials_new_pacs(uint8_t *d) {
|
||||
return PM3_EMALLOC;
|
||||
}
|
||||
|
||||
uint8_t n = PICOPASS_BLOCK_SIZE - offset - 2;
|
||||
uint8_t n = PICOPASS_BLOCK_SIZE - offset - 2;
|
||||
byte_2_binstr(binstr, d + offset + 2, n);
|
||||
|
||||
PrintAndLogEx(NORMAL, "");
|
||||
|
||||
@@ -70,7 +70,7 @@ static uint8_t default_pwd_pack[][4] = {
|
||||
};
|
||||
|
||||
static uint64_t UL_TYPES_ARRAY[] = {
|
||||
MFU_TT_UNKNOWN, MFU_TT_UL,
|
||||
MFU_TT_UNKNOWN, MFU_TT_UL,
|
||||
MFU_TT_UL_C, MFU_TT_UL_EV1_48,
|
||||
MFU_TT_UL_EV1_128, MFU_TT_NTAG,
|
||||
MFU_TT_NTAG_203, MFU_TT_NTAG_210,
|
||||
@@ -79,7 +79,7 @@ static uint64_t UL_TYPES_ARRAY[] = {
|
||||
MFU_TT_MY_D, MFU_TT_MY_D_NFC,
|
||||
MFU_TT_MY_D_MOVE, MFU_TT_MY_D_MOVE_NFC,
|
||||
MFU_TT_MY_D_MOVE_LEAN, MFU_TT_NTAG_I2C_1K,
|
||||
MFU_TT_NTAG_I2C_2K, MFU_TT_NTAG_I2C_1K_PLUS,
|
||||
MFU_TT_NTAG_I2C_2K, MFU_TT_NTAG_I2C_1K_PLUS,
|
||||
MFU_TT_NTAG_I2C_2K_PLUS, MFU_TT_FUDAN_UL,
|
||||
MFU_TT_NTAG_213_F, MFU_TT_NTAG_216_F,
|
||||
MFU_TT_UL_EV1, MFU_TT_UL_NANO_40,
|
||||
@@ -1891,7 +1891,7 @@ static int CmdHF14AMfUInfo(const char *Cmd) {
|
||||
}
|
||||
|
||||
// Read signature
|
||||
if ((tagtype & (MFU_TT_UL_EV1_48 | MFU_TT_UL_EV1_128 | MFU_TT_UL_EV1 | MFU_TT_UL_NANO_40 |
|
||||
if ((tagtype & (MFU_TT_UL_EV1_48 | MFU_TT_UL_EV1_128 | MFU_TT_UL_EV1 | MFU_TT_UL_NANO_40 |
|
||||
MFU_TT_NTAG_210u | MFU_TT_NTAG_213 | MFU_TT_NTAG_213_F | MFU_TT_NTAG_213_C |
|
||||
MFU_TT_NTAG_213_TT | MFU_TT_NTAG_215 | MFU_TT_NTAG_216 | MFU_TT_NTAG_216_F |
|
||||
MFU_TT_NTAG_I2C_1K | MFU_TT_NTAG_I2C_2K | MFU_TT_NTAG_I2C_1K_PLUS | MFU_TT_NTAG_I2C_2K_PLUS))) {
|
||||
|
||||
+4
-4
@@ -113,12 +113,12 @@ static int CmdNfcDecode(const char *Cmd) {
|
||||
return res;
|
||||
}
|
||||
|
||||
uint8_t *tmp = dump;
|
||||
uint8_t *tmp = dump;
|
||||
|
||||
// if not MIFARE Classic default sizes, assume its Ultralight/NTAG
|
||||
if ( bytes_read != MIFARE_4K_MAX_BYTES
|
||||
&& bytes_read != MIFARE_2K_MAX_BYTES
|
||||
&& bytes_read != MIFARE_1K_MAX_BYTES
|
||||
if ( bytes_read != MIFARE_4K_MAX_BYTES
|
||||
&& bytes_read != MIFARE_2K_MAX_BYTES
|
||||
&& bytes_read != MIFARE_1K_MAX_BYTES
|
||||
&& bytes_read != MIFARE_MINI_MAX_BYTES) {
|
||||
|
||||
uint8_t **pd = &tmp;
|
||||
|
||||
@@ -34,4 +34,4 @@
|
||||
#define GEN4_CMD_SET_CONFIG_PERMANENT 0xF1
|
||||
#define GEN4_CMD_CHANGE_PASSWORD 0xFE
|
||||
|
||||
#endif
|
||||
#endif
|
||||
@@ -1208,7 +1208,7 @@ static int mfG4ExCommand(uint8_t cmd, uint8_t *pwd, uint8_t *data, size_t datale
|
||||
if (verbose) PrintAndLogEx(ERR, "No card in the field.");
|
||||
return PM3_ETIMEOUT;
|
||||
}
|
||||
|
||||
|
||||
iso14a_card_select_t card;
|
||||
memcpy(&card, (iso14a_card_select_t *)resp.data.asBytes, sizeof(iso14a_card_select_t));
|
||||
if (verbose) {
|
||||
@@ -1223,7 +1223,7 @@ static int mfG4ExCommand(uint8_t cmd, uint8_t *pwd, uint8_t *data, size_t datale
|
||||
|
||||
if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
|
||||
resplen = resp.oldarg[0];
|
||||
|
||||
|
||||
if (!resplen) {
|
||||
if (verbose) PrintAndLogEx(ERR, "No card response.");
|
||||
return PM3_EFAILED;
|
||||
|
||||
@@ -366,6 +366,7 @@ const static vocabulary_t vocabulary[] = {
|
||||
{ 0, "hf mf gen3uid" },
|
||||
{ 0, "hf mf gen3blk" },
|
||||
{ 0, "hf mf gen3freeze" },
|
||||
{ 0, "hf mf ginfo" },
|
||||
{ 0, "hf mf ggetblk" },
|
||||
{ 0, "hf mf gload" },
|
||||
{ 0, "hf mf gsave" },
|
||||
|
||||
Reference in new issue
Block a user