mirror of
https://github.com/Proxmark/proxmark3.git
synced 2025-08-24 06:55:27 -07:00
ADD: 'hf mfu info' now prints following settings:
NFC_COUNTER_EN - If set, every read,fast_read increases a counter. NFC_COUNTER_PROT_PWD - If set, reading nfc_counter needs a successfull pwd authentication before These new settings is only valid for NTAG213/215/216,
This commit is contained in:
parent
a126332a7b
commit
5636ee8ce6
2 changed files with 87 additions and 3 deletions
|
@ -72,6 +72,7 @@ int CmdSrix4kRead(const char *Cmd)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int rawClose(void){
|
int rawClose(void){
|
||||||
UsbCommand resp;
|
UsbCommand resp;
|
||||||
UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}};
|
UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}};
|
||||||
|
@ -457,8 +458,6 @@ int HF14BStdInfo(uint8_t *data, uint8_t *datalen){
|
||||||
|
|
||||||
//add more info here
|
//add more info here
|
||||||
print_atqb_resp(data);
|
print_atqb_resp(data);
|
||||||
|
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -681,6 +680,84 @@ int CmdSriWrite( const char *Cmd){
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int srix4kChecksum(uint32_t value) {
|
||||||
|
/*
|
||||||
|
// vv = value
|
||||||
|
// pp = position
|
||||||
|
// vv vv vv pp
|
||||||
|
4 bytes : 00 1A 20 01
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define NibbleHigh(b) ( (b & 0xF0) >> 4 )
|
||||||
|
#define NibbleLow(b) ( b & 0x0F )
|
||||||
|
#define Crumb(b,p) (((b & (0x3 << p) ) >> p ) & 0xF)
|
||||||
|
|
||||||
|
// only the lower crumbs.
|
||||||
|
uint8_t block = (value & 0xFF);
|
||||||
|
uint8_t i = 0;
|
||||||
|
uint8_t valuebytes[] = {0,0,0};
|
||||||
|
|
||||||
|
// if ( strlen(Cmd) > 0){
|
||||||
|
// value = param_get32ex(Cmd, 0, 0, 16);
|
||||||
|
|
||||||
|
// block = value & 0xFF;
|
||||||
|
|
||||||
|
// value &= 0xFFFFFF00;
|
||||||
|
// value >>=8;
|
||||||
|
// }
|
||||||
|
|
||||||
|
num_to_bytes(value, 3, valuebytes);
|
||||||
|
|
||||||
|
// Scrambled part
|
||||||
|
// Crumb swapping of value.
|
||||||
|
uint8_t temp[] = {0,0};
|
||||||
|
temp[0] = (Crumb(value, 22) << 4 | Crumb(value, 14 ) << 2 | Crumb(value, 6)) << 4;
|
||||||
|
temp[0] |= Crumb(value, 20) << 4 | Crumb(value, 12 ) << 2 | Crumb(value, 4);
|
||||||
|
temp[1] = (Crumb(value, 18) << 4 | Crumb(value, 10 ) << 2 | Crumb(value, 2)) << 4;
|
||||||
|
temp[1] |= Crumb(value, 16) << 4 | Crumb(value, 8 ) << 2 | Crumb(value, 0);
|
||||||
|
|
||||||
|
// chksum part
|
||||||
|
uint32_t chksum = 0xFF - block;
|
||||||
|
|
||||||
|
// chksum is reduced by each nibbles of value.
|
||||||
|
for (i = 0; i < 3; ++i){
|
||||||
|
chksum -= NibbleHigh(valuebytes[i]);
|
||||||
|
chksum -= NibbleLow(valuebytes[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// base4 conversion
|
||||||
|
// and left shift twice
|
||||||
|
i = 3;
|
||||||
|
uint8_t base4[] = {0,0,0,0};
|
||||||
|
while( chksum !=0 ){
|
||||||
|
base4[i--] = (chksum % 4 << 2);
|
||||||
|
chksum /= 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
// merge scambled and chksum parts
|
||||||
|
uint32_t encvalue =
|
||||||
|
( NibbleLow ( base4[0]) << 28 ) |
|
||||||
|
( NibbleHigh( temp[0]) << 24 ) |
|
||||||
|
|
||||||
|
( NibbleLow ( base4[1]) << 20 ) |
|
||||||
|
( NibbleLow ( temp[0]) << 16 ) |
|
||||||
|
|
||||||
|
( NibbleLow ( base4[2]) << 12 ) |
|
||||||
|
( NibbleHigh( temp[1]) << 8 ) |
|
||||||
|
|
||||||
|
( NibbleLow ( base4[3]) << 4 ) |
|
||||||
|
NibbleLow ( temp[1] );
|
||||||
|
|
||||||
|
PrintAndLog("ICE | %08X", encvalue);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
int srix4kMagicbytes(){
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
int srix4kValid(){
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static command_t CommandTable[] =
|
static command_t CommandTable[] =
|
||||||
{
|
{
|
||||||
{"help", CmdHelp, 1, "This help"},
|
{"help", CmdHelp, 1, "This help"},
|
||||||
|
@ -693,6 +770,7 @@ static command_t CommandTable[] =
|
||||||
{"srix4kread", CmdSrix4kRead, 0, "Read contents of a SRIX4K tag"},
|
{"srix4kread", CmdSrix4kRead, 0, "Read contents of a SRIX4K tag"},
|
||||||
{"sriwrite", CmdSriWrite, 0, "Write data to a SRI512 | SRIX4K tag"},
|
{"sriwrite", CmdSriWrite, 0, "Write data to a SRI512 | SRIX4K tag"},
|
||||||
{"raw", CmdHF14BCmdRaw, 0, "Send raw hex data to tag"},
|
{"raw", CmdHF14BCmdRaw, 0, "Send raw hex data to tag"},
|
||||||
|
//{"calcSrix4", srix4kchksum, 1, "a srix4k checksum test"},
|
||||||
{NULL, NULL, 0, NULL}
|
{NULL, NULL, 0, NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -460,6 +460,8 @@ static int ulev1_print_configuration( uint8_t *data, uint8_t startPage){
|
||||||
|
|
||||||
bool strg_mod_en = (data[0] & 2);
|
bool strg_mod_en = (data[0] & 2);
|
||||||
uint8_t authlim = (data[4] & 0x07);
|
uint8_t authlim = (data[4] & 0x07);
|
||||||
|
bool nfc_cnf_en = (data[4] & 0x08);
|
||||||
|
bool nfc_cnf_prot_pwd = (data[4] & 0x10);
|
||||||
bool cfglck = (data[4] & 0x40);
|
bool cfglck = (data[4] & 0x40);
|
||||||
bool prot = (data[4] & 0x80);
|
bool prot = (data[4] & 0x80);
|
||||||
uint8_t vctid = data[5];
|
uint8_t vctid = data[5];
|
||||||
|
@ -475,6 +477,10 @@ static int ulev1_print_configuration( uint8_t *data, uint8_t startPage){
|
||||||
PrintAndLog(" - Unlimited password attempts");
|
PrintAndLog(" - Unlimited password attempts");
|
||||||
else
|
else
|
||||||
PrintAndLog(" - Max number of password attempts is %d", authlim);
|
PrintAndLog(" - Max number of password attempts is %d", authlim);
|
||||||
|
|
||||||
|
PrintAndLog(" - NFC counter %s", (nfc_cnf_en) ? "enabled":"disabled");
|
||||||
|
PrintAndLog(" - NFC counter %s", (nfc_cnf_prot_pwd) ? "not protected":"password protection enabled");
|
||||||
|
|
||||||
PrintAndLog(" - user configuration %s", cfglck ? "permanently locked":"writeable");
|
PrintAndLog(" - user configuration %s", cfglck ? "permanently locked":"writeable");
|
||||||
PrintAndLog(" - %s access is protected with password", prot ? "read and write":"write");
|
PrintAndLog(" - %s access is protected with password", prot ? "read and write":"write");
|
||||||
PrintAndLog(" - %02X, Virtual Card Type Identifier is %s default", vctid, (vctid==0x05)? "":"not");
|
PrintAndLog(" - %02X, Virtual Card Type Identifier is %s default", vctid, (vctid==0x05)? "":"not");
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue