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

make style

Browse source
This commit is contained in:
Philippe Teuwen 2019-03-10 00:00:59 +01:00
commit 0373696662
483 changed files with 56514 additions and 52451 deletions
Download patch file Download diff file Expand all files Collapse all files

91
client/cmdlfnoralsy.c
View file

@ -11,7 +11,8 @@
static int CmdHelp(const char *Cmd);
int usage_lf_noralsy_clone(void){
int usage_lf_noralsy_clone(void)
{
PrintAndLogEx(NORMAL, "clone a Noralsy tag to a T55x7 tag.");
PrintAndLogEx(NORMAL, "Usage: lf noralsy clone [h] <card id> <year> <Q5>");
PrintAndLogEx(NORMAL, "Options:");
@ -25,7 +26,8 @@ int usage_lf_noralsy_clone(void){
return 0;
}
int usage_lf_noralsy_sim(void) {
int usage_lf_noralsy_sim(void)
{
PrintAndLogEx(NORMAL, "Enables simulation of Noralsy card with specified card number.");
PrintAndLogEx(NORMAL, "Simulation runs until the button is pressed or another USB command is issued.");
PrintAndLogEx(NORMAL, "");
@ -40,13 +42,15 @@ int usage_lf_noralsy_sim(void) {
return 0;
}
static uint8_t noralsy_chksum( uint8_t* bits, uint8_t len) {
static uint8_t noralsy_chksum(uint8_t *bits, uint8_t len)
{
uint8_t sum = 0;
for (uint8_t i = 0; i < len; i += 4)
sum ^= bytebits_to_byte(bits+i, 4);
sum ^= bytebits_to_byte(bits + i, 4);
return sum & 0x0F ;
}
int getnoralsyBits(uint32_t id, uint16_t year, uint8_t *bits) {
int getnoralsyBits(uint32_t id, uint16_t year, uint8_t *bits)
{
//preamp
num_to_bytebits(0xBB0214FF, 32, bits); // --> Have seen 0xBB0214FF / 0xBB0314FF UNKNOWN
@ -59,27 +63,28 @@ int getnoralsyBits(uint32_t id, uint16_t year, uint8_t *bits) {
uint8_t sub2 = (id & 0x000FF00) >> 8;
uint8_t sub3 = (id & 0x00000FF);
num_to_bytebits(sub1, 12, bits+32);
num_to_bytebits(year, 8, bits+44);
num_to_bytebits(0, 4, bits+52); // --> UNKNOWN. Flag?
num_to_bytebits(sub1, 12, bits + 32);
num_to_bytebits(year, 8, bits + 44);
num_to_bytebits(0, 4, bits + 52); // --> UNKNOWN. Flag?
num_to_bytebits(sub2, 8, bits+56);
num_to_bytebits(sub3, 8, bits+64);
num_to_bytebits(sub2, 8, bits + 56);
num_to_bytebits(sub3, 8, bits + 64);
//chksum byte
uint8_t chksum = noralsy_chksum(bits+32, 40);
num_to_bytebits(chksum, 4, bits+72);
uint8_t chksum = noralsy_chksum(bits + 32, 40);
num_to_bytebits(chksum, 4, bits + 72);
chksum = noralsy_chksum(bits, 76);
num_to_bytebits(chksum, 4, bits+76);
num_to_bytebits(chksum, 4, bits + 76);
return 1;
}
// by iceman
// find Noralsy preamble in already demoded data
int detectNoralsy(uint8_t *dest, size_t *size) {
int detectNoralsy(uint8_t *dest, size_t *size)
{
if (*size < 96) return -1; //make sure buffer has data
size_t startIdx = 0;
uint8_t preamble[] = {1,0,1,1,1,0,1,1,0,0,0,0};
uint8_t preamble[] = {1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0};
if (!preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx))
return -2; //preamble not found
if (*size != 96) return -3; //wrong demoded size
@ -100,7 +105,8 @@ int detectNoralsy(uint8_t *dest, size_t *size) {
**/
//see ASKDemod for what args are accepted
int CmdNoralsyDemod(const char *Cmd) {
int CmdNoralsyDemod(const char *Cmd)
{
//ASK / Manchester
bool st = true;
@ -115,8 +121,8 @@ int CmdNoralsyDemod(const char *Cmd) {
size_t size = DemodBufferLen;
int ans = detectNoralsy(DemodBuffer, &size);
if (ans < 0){
if (g_debugMode){
if (ans < 0) {
if (g_debugMode) {
if (ans == -1)
PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: too few bits found");
else if (ans == -2)
@ -129,12 +135,12 @@ int CmdNoralsyDemod(const char *Cmd) {
return 0;
}
setDemodBuf(DemodBuffer, 96, ans);
setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
setClockGrid(g_DemodClock, g_DemodStartIdx + (ans * g_DemodClock));
//got a good demod
uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
uint32_t raw3 = bytebits_to_byte(DemodBuffer+64, 32);
uint32_t raw2 = bytebits_to_byte(DemodBuffer + 32, 32);
uint32_t raw3 = bytebits_to_byte(DemodBuffer + 64, 32);
uint32_t cardid = ((raw2 & 0xFFF00000) >> 20) << 16;
cardid |= (raw2 & 0xFF) << 8;
@ -143,25 +149,25 @@ int CmdNoralsyDemod(const char *Cmd) {
uint16_t year = (raw2 & 0x000ff000) >> 12;
year = BCD2DEC(year);
year += ( year > 60 ) ? 1900: 2000;
year += (year > 60) ? 1900 : 2000;
// calc checksums
uint8_t calc1 = noralsy_chksum(DemodBuffer+32, 40);
uint8_t calc1 = noralsy_chksum(DemodBuffer + 32, 40);
uint8_t calc2 = noralsy_chksum(DemodBuffer, 76);
uint8_t chk1 = 0, chk2 = 0;
chk1 = bytebits_to_byte(DemodBuffer+72, 4);
chk2 = bytebits_to_byte(DemodBuffer+76, 4);
chk1 = bytebits_to_byte(DemodBuffer + 72, 4);
chk2 = bytebits_to_byte(DemodBuffer + 76, 4);
// test checksums
if ( chk1 != calc1 ) {
if (chk1 != calc1) {
if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: checksum 1 failed %x - %x\n", chk1, calc1);
return 0;
}
if ( chk2 != calc2 ) {
if (chk2 != calc2) {
if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Noralsy: checksum 2 failed %x - %x\n", chk2, calc2);
return 0;
}
PrintAndLogEx(SUCCESS, "Noralsy Tag Found: Card ID %u, Year: %u Raw: %08X%08X%08X", cardid, year, raw1 ,raw2, raw3);
PrintAndLogEx(SUCCESS, "Noralsy Tag Found: Card ID %u, Year: %u Raw: %08X%08X%08X", cardid, year, raw1, raw2, raw3);
if (raw1 != 0xBB0214FF) {
PrintAndLogEx(WARNING, "Unknown bits set in first block! Expected 0xBB0214FF, Found: 0x%08X", raw1);
PrintAndLogEx(WARNING, "Please post this output in forum to further research on this format");
@ -169,12 +175,14 @@ int CmdNoralsyDemod(const char *Cmd) {
return 1;
}
int CmdNoralsyRead(const char *Cmd) {
int CmdNoralsyRead(const char *Cmd)
{
lf_read(true, 8000);
return CmdNoralsyDemod(Cmd);
}
int CmdNoralsyClone(const char *Cmd) {
int CmdNoralsyClone(const char *Cmd)
{
uint16_t year = 0;
uint32_t id = 0;
@ -192,7 +200,7 @@ int CmdNoralsyClone(const char *Cmd) {
if (param_getchar(Cmd, 2) == 'Q' || param_getchar(Cmd, 2) == 'q')
blocks[0] = T5555_MODULATION_MANCHESTER | T5555_SET_BITRATE(32) | T5555_ST_TERMINATOR | 3 << T5555_MAXBLOCK_SHIFT;
if ( !getnoralsyBits(id, year, bits)) {
if (!getnoralsyBits(id, year, bits)) {
PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
return 1;
}
@ -206,14 +214,14 @@ int CmdNoralsyClone(const char *Cmd) {
print_blocks(blocks, 4);
UsbCommand resp;
UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0, 0, 0}};
for (uint8_t i=0; i<4; i++) {
for (uint8_t i = 0; i < 4; i++) {
c.arg[0] = blocks[i];
c.arg[1] = i;
clearCommandBuffer();
SendCommand(&c);
if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)) {
PrintAndLogEx(WARNING, "Error occurred, device did not respond during write operation.");
return -1;
}
@ -221,7 +229,8 @@ int CmdNoralsyClone(const char *Cmd) {
return 0;
}
int CmdNoralsySim(const char *Cmd) {
int CmdNoralsySim(const char *Cmd)
{
uint8_t bits[96];
uint8_t *bs = bits;
@ -242,7 +251,7 @@ int CmdNoralsySim(const char *Cmd) {
arg1 = clk << 8 | encoding;
arg2 = invert << 8 | separator;
if ( !getnoralsyBits(id, year, bs)) {
if (!getnoralsyBits(id, year, bs)) {
PrintAndLogEx(WARNING, "Error with tag bitstream generation.");
return 1;
}
@ -258,20 +267,22 @@ int CmdNoralsySim(const char *Cmd) {
static command_t CommandTable[] = {
{"help", CmdHelp, 1, "This help"},
{"demod", CmdNoralsyDemod,1, "Demodulate an Noralsy tag from the GraphBuffer"},
{"demod", CmdNoralsyDemod, 1, "Demodulate an Noralsy tag from the GraphBuffer"},
{"read", CmdNoralsyRead, 0, "Attempt to read and extract tag data from the antenna"},
{"clone", CmdNoralsyClone,0, "clone Noralsy to T55x7"},
{"clone", CmdNoralsyClone, 0, "clone Noralsy to T55x7"},
{"sim", CmdNoralsySim, 0, "simulate Noralsy tag"},
{NULL, NULL, 0, NULL}
};
int CmdLFNoralsy(const char *Cmd) {
int CmdLFNoralsy(const char *Cmd)
{
clearCommandBuffer();
CmdsParse(CommandTable, Cmd);
return 0;
}
int CmdHelp(const char *Cmd) {
int CmdHelp(const char *Cmd)
{
CmdsHelp(CommandTable);
return 0;
}