mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-14 02:27:26 -07:00
make style
This commit is contained in:
parent
2ebada74f0
commit
db4aa08b78
28 changed files with 617 additions and 617 deletions
|
@ -399,7 +399,7 @@ static bool hitag2_write_page(uint8_t *rx, const size_t rxlen, uint8_t *tx, size
|
||||||
break;
|
break;
|
||||||
case WRITE_STATE_PAGENUM_WRITTEN:
|
case WRITE_STATE_PAGENUM_WRITTEN:
|
||||||
// Check if page number was received correctly
|
// Check if page number was received correctly
|
||||||
if ( (rxlen == 10)
|
if ((rxlen == 10)
|
||||||
&& (rx[0] == (0x82 | (blocknr << 3) | ((blocknr ^ 7) >> 2)))
|
&& (rx[0] == (0x82 | (blocknr << 3) | ((blocknr ^ 7) >> 2)))
|
||||||
&& (rx[1] == (((blocknr & 0x3) ^ 0x3) << 6))) {
|
&& (rx[1] == (((blocknr & 0x3) ^ 0x3) << 6))) {
|
||||||
|
|
||||||
|
|
|
@ -1962,7 +1962,7 @@ TEST2:
|
||||||
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
|
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
|
||||||
|
|
||||||
int res = iso14443a_select_card(uid, NULL, &cuid, true, 0, true);
|
int res = iso14443a_select_card(uid, NULL, &cuid, true, 0, true);
|
||||||
if ( res == 2 ) {
|
if (res == 2) {
|
||||||
ReaderTransmit(rats, sizeof(rats), NULL);
|
ReaderTransmit(rats, sizeof(rats), NULL);
|
||||||
res = ReaderReceive(buf, par);
|
res = ReaderReceive(buf, par);
|
||||||
if (memcmp(buf, "\x09\x78\x00\x91\x02\xDA\xBC\x19\x10\xF0\x05", 11) == 0) {
|
if (memcmp(buf, "\x09\x78\x00\x91\x02\xDA\xBC\x19\x10\xF0\x05", 11) == 0) {
|
||||||
|
|
|
@ -141,7 +141,7 @@ bool IsBlock1PCF7931(uint8_t *block) {
|
||||||
&& block[12] == 0
|
&& block[12] == 0
|
||||||
&& block[13] == 0) {
|
&& block[13] == 0) {
|
||||||
|
|
||||||
if ( (block[14] & 0x7f) <= 9
|
if ((block[14] & 0x7f) <= 9
|
||||||
&& block[15] <= 9) {
|
&& block[15] <= 9) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -93,7 +93,7 @@ int GetModels(char *Models[], int *count, uint8_t *width) {
|
||||||
PrintAndLogEx(WARNING, "out of memory?");
|
PrintAndLogEx(WARNING, "out of memory?");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if ( model.name != NULL ) {
|
if (model.name != NULL) {
|
||||||
memcpy(tmp, model.name, size);
|
memcpy(tmp, model.name, size);
|
||||||
Models[mode] = tmp;
|
Models[mode] = tmp;
|
||||||
width[mode] = plen(model.spoly);
|
width[mode] = plen(model.spoly);
|
||||||
|
|
|
@ -491,8 +491,8 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
|
||||||
// if (*stCheck)
|
// if (*stCheck)
|
||||||
bool st = DetectST(bits, &BitLen, &foundclk, &ststart, &stend);
|
bool st = DetectST(bits, &BitLen, &foundclk, &ststart, &stend);
|
||||||
|
|
||||||
if ( clk == 0 ) {
|
if (clk == 0) {
|
||||||
if ( foundclk == 32 || foundclk == 64 ) {
|
if (foundclk == 32 || foundclk == 64) {
|
||||||
clk = foundclk;
|
clk = foundclk;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1320,7 +1320,7 @@ int CmdRawDemod(const char *Cmd) {
|
||||||
void setClockGrid(int clk, int offset) {
|
void setClockGrid(int clk, int offset) {
|
||||||
g_DemodStartIdx = offset;
|
g_DemodStartIdx = offset;
|
||||||
g_DemodClock = clk;
|
g_DemodClock = clk;
|
||||||
if ( clk == 0 && offset == 0)
|
if (clk == 0 && offset == 0)
|
||||||
PrintAndLogEx(DEBUG, "DEBUG: (setClockGrid) clear settings");
|
PrintAndLogEx(DEBUG, "DEBUG: (setClockGrid) clear settings");
|
||||||
else
|
else
|
||||||
PrintAndLogEx(DEBUG, "DEBUG: (setClockGrid) demodoffset %d, clk %d", offset, clk);
|
PrintAndLogEx(DEBUG, "DEBUG: (setClockGrid) demodoffset %d, clk %d", offset, clk);
|
||||||
|
|
|
@ -524,7 +524,7 @@ int CmdHF14AInfo(const char *Cmd) {
|
||||||
(tb1 ? "" : " NOT"),
|
(tb1 ? "" : " NOT"),
|
||||||
(tc1 ? "" : " NOT"),
|
(tc1 ? "" : " NOT"),
|
||||||
fsci,
|
fsci,
|
||||||
fsci < sizeof(atsFSC)/sizeof(atsFSC[0]) ? atsFSC[fsci] : -1
|
fsci < sizeof(atsFSC) / sizeof(atsFSC[0]) ? atsFSC[fsci] : -1
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
pos = 2;
|
pos = 2;
|
||||||
|
@ -959,7 +959,7 @@ int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
|
||||||
// get frame length from ATS in data field
|
// get frame length from ATS in data field
|
||||||
if (resp.arg[0] > 1) {
|
if (resp.arg[0] > 1) {
|
||||||
uint8_t fsci = resp.d.asBytes[1] & 0x0f;
|
uint8_t fsci = resp.d.asBytes[1] & 0x0f;
|
||||||
if (fsci < sizeof(atsFSC)/sizeof(atsFSC[0]))
|
if (fsci < sizeof(atsFSC) / sizeof(atsFSC[0]))
|
||||||
frameLength = atsFSC[fsci];
|
frameLength = atsFSC[fsci];
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -967,7 +967,7 @@ int SelectCard14443_4(bool disconnect, iso14a_card_select_t *card) {
|
||||||
iso14a_card_select_t *vcard = (iso14a_card_select_t *) resp.d.asBytes;
|
iso14a_card_select_t *vcard = (iso14a_card_select_t *) resp.d.asBytes;
|
||||||
if (vcard->ats_len > 1) {
|
if (vcard->ats_len > 1) {
|
||||||
uint8_t fsci = vcard->ats[1] & 0x0f;
|
uint8_t fsci = vcard->ats[1] & 0x0f;
|
||||||
if (fsci < sizeof(atsFSC)/sizeof(atsFSC[0]))
|
if (fsci < sizeof(atsFSC) / sizeof(atsFSC[0]))
|
||||||
frameLength = atsFSC[fsci];
|
frameLength = atsFSC[fsci];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1001,7 +1001,7 @@ int CmdExchangeAPDU(bool chainingin, uint8_t *datain, int datainlen, bool activa
|
||||||
// timeout must be authomatically set by "get ATS"
|
// timeout must be authomatically set by "get ATS"
|
||||||
UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, (datainlen & 0xFFFF), 0}};
|
UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_NO_DISCONNECT | cmdc, (datainlen & 0xFFFF), 0}};
|
||||||
|
|
||||||
if ( datain )
|
if (datain)
|
||||||
memcpy(c.d.asBytes, datain, datainlen);
|
memcpy(c.d.asBytes, datain, datainlen);
|
||||||
|
|
||||||
SendCommand(&c);
|
SendCommand(&c);
|
||||||
|
|
|
@ -467,7 +467,7 @@ static bool getHitagUid(uint32_t *uid) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( uid )
|
if (uid)
|
||||||
*uid = bytes_to_num(resp.d.asBytes, 4);
|
*uid = bytes_to_num(resp.d.asBytes, 4);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -485,7 +485,7 @@ int CmdLFHitagInfo(const char *Cmd) {
|
||||||
|
|
||||||
// read UID
|
// read UID
|
||||||
uint32_t uid = 0;
|
uint32_t uid = 0;
|
||||||
if ( getHitagUid( &uid ) == false )
|
if (getHitagUid(&uid) == false)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
PrintAndLogEx(SUCCESS, "UID: %08X", uid);
|
PrintAndLogEx(SUCCESS, "UID: %08X", uid);
|
||||||
|
@ -569,7 +569,7 @@ int CmdLFHitagReader(const char *Cmd) {
|
||||||
PrintAndLogEx(SUCCESS, "Valid Hitag2 tag found - UID: %08x", id);
|
PrintAndLogEx(SUCCESS, "Valid Hitag2 tag found - UID: %08x", id);
|
||||||
if (htf != RHT2F_UID_ONLY) {
|
if (htf != RHT2F_UID_ONLY) {
|
||||||
|
|
||||||
PrintAndLogEx(SUCCESS, "Dumping tag memory..." );
|
PrintAndLogEx(SUCCESS, "Dumping tag memory...");
|
||||||
uint8_t *data = resp.d.asBytes;
|
uint8_t *data = resp.d.asBytes;
|
||||||
|
|
||||||
char filename[FILE_PATH_SIZE];
|
char filename[FILE_PATH_SIZE];
|
||||||
|
@ -582,7 +582,7 @@ int CmdLFHitagReader(const char *Cmd) {
|
||||||
saveFileJSON(filename, "json", jsfHitag, data, 48);
|
saveFileJSON(filename, "json", jsfHitag, data, 48);
|
||||||
|
|
||||||
// block3, 1 byte
|
// block3, 1 byte
|
||||||
printHitagConfiguration(data[4*3] );
|
printHitagConfiguration(data[4 * 3]);
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -73,14 +73,14 @@ int detectIndala(uint8_t *dest, size_t *size, uint8_t *invert) {
|
||||||
|
|
||||||
// PSK1
|
// PSK1
|
||||||
bool res = preambleSearch(dest, preamble64, sizeof(preamble64), &found_size, &idx);
|
bool res = preambleSearch(dest, preamble64, sizeof(preamble64), &found_size, &idx);
|
||||||
if ( res ) {
|
if (res) {
|
||||||
PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK1 found 64");
|
PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK1 found 64");
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
idx = 0;
|
idx = 0;
|
||||||
found_size = *size;
|
found_size = *size;
|
||||||
res = preambleSearch(dest, preamble64_i, sizeof(preamble64_i), &found_size, &idx);
|
res = preambleSearch(dest, preamble64_i, sizeof(preamble64_i), &found_size, &idx);
|
||||||
if ( res ) {
|
if (res) {
|
||||||
PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK1 found 64 inverted preamble");
|
PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK1 found 64 inverted preamble");
|
||||||
goto inv;
|
goto inv;
|
||||||
}
|
}
|
||||||
|
@ -110,7 +110,7 @@ int detectIndala(uint8_t *dest, size_t *size, uint8_t *invert) {
|
||||||
idx = 0;
|
idx = 0;
|
||||||
found_size = *size;
|
found_size = *size;
|
||||||
res = preambleSearch(dest, preamble64, sizeof(preamble64), &found_size, &idx);
|
res = preambleSearch(dest, preamble64, sizeof(preamble64), &found_size, &idx);
|
||||||
if ( res ) {
|
if (res) {
|
||||||
PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 64 preamble");
|
PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 64 preamble");
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
@ -118,7 +118,7 @@ int detectIndala(uint8_t *dest, size_t *size, uint8_t *invert) {
|
||||||
idx = 0;
|
idx = 0;
|
||||||
found_size = *size;
|
found_size = *size;
|
||||||
res = preambleSearch(dest, preamble224, sizeof(preamble224), &found_size, &idx);
|
res = preambleSearch(dest, preamble224, sizeof(preamble224), &found_size, &idx);
|
||||||
if ( res ) {
|
if (res) {
|
||||||
PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 224 preamble");
|
PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 224 preamble");
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
@ -126,7 +126,7 @@ int detectIndala(uint8_t *dest, size_t *size, uint8_t *invert) {
|
||||||
idx = 0;
|
idx = 0;
|
||||||
found_size = *size;
|
found_size = *size;
|
||||||
res = preambleSearch(dest, preamble64_i, sizeof(preamble64_i), &found_size, &idx);
|
res = preambleSearch(dest, preamble64_i, sizeof(preamble64_i), &found_size, &idx);
|
||||||
if ( res ) {
|
if (res) {
|
||||||
PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 64 inverted preamble");
|
PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 64 inverted preamble");
|
||||||
goto inv;
|
goto inv;
|
||||||
}
|
}
|
||||||
|
@ -134,13 +134,13 @@ int detectIndala(uint8_t *dest, size_t *size, uint8_t *invert) {
|
||||||
idx = 0;
|
idx = 0;
|
||||||
found_size = *size;
|
found_size = *size;
|
||||||
res = preambleSearch(dest, preamble224_i, sizeof(preamble224_i), &found_size, &idx);
|
res = preambleSearch(dest, preamble224_i, sizeof(preamble224_i), &found_size, &idx);
|
||||||
if ( res ) {
|
if (res) {
|
||||||
PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 224 inverted preamble");
|
PrintAndLogEx(DEBUG, "DEBUG: detectindala PSK2 found 224 inverted preamble");
|
||||||
goto inv;
|
goto inv;
|
||||||
}
|
}
|
||||||
|
|
||||||
inv:
|
inv:
|
||||||
if ( res == 0 ) {
|
if (res == 0) {
|
||||||
return -4;
|
return -4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -215,7 +215,7 @@ int CmdIndalaDemod(const char *Cmd) {
|
||||||
uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
|
uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
|
||||||
uid1 = bytebits_to_byte(DemodBuffer, 32);
|
uid1 = bytebits_to_byte(DemodBuffer, 32);
|
||||||
uid2 = bytebits_to_byte(DemodBuffer + 32, 32);
|
uid2 = bytebits_to_byte(DemodBuffer + 32, 32);
|
||||||
uint64_t foo = (((uint64_t)uid1 << 32) & 0x1FFFFFFF ) | (uid2 & 0x7FFFFFFF );
|
uint64_t foo = (((uint64_t)uid1 << 32) & 0x1FFFFFFF) | (uid2 & 0x7FFFFFFF);
|
||||||
|
|
||||||
if (DemodBufferLen == 64) {
|
if (DemodBufferLen == 64) {
|
||||||
PrintAndLogEx(
|
PrintAndLogEx(
|
||||||
|
@ -227,19 +227,19 @@ int CmdIndalaDemod(const char *Cmd) {
|
||||||
);
|
);
|
||||||
|
|
||||||
uint16_t p1 = 0;
|
uint16_t p1 = 0;
|
||||||
p1 |= DemodBuffer[32+ 3] << 8;
|
p1 |= DemodBuffer[32 + 3] << 8;
|
||||||
p1 |= DemodBuffer[32+ 6] << 5;
|
p1 |= DemodBuffer[32 + 6] << 5;
|
||||||
p1 |= DemodBuffer[32+ 8] << 4;
|
p1 |= DemodBuffer[32 + 8] << 4;
|
||||||
p1 |= DemodBuffer[32+ 9] << 3;
|
p1 |= DemodBuffer[32 + 9] << 3;
|
||||||
p1 |= DemodBuffer[32+11] << 1;
|
p1 |= DemodBuffer[32 + 11] << 1;
|
||||||
p1 |= DemodBuffer[32+16] << 6;
|
p1 |= DemodBuffer[32 + 16] << 6;
|
||||||
p1 |= DemodBuffer[32+19] << 7;
|
p1 |= DemodBuffer[32 + 19] << 7;
|
||||||
p1 |= DemodBuffer[32+20] << 10;
|
p1 |= DemodBuffer[32 + 20] << 10;
|
||||||
p1 |= DemodBuffer[32+21] << 2;
|
p1 |= DemodBuffer[32 + 21] << 2;
|
||||||
p1 |= DemodBuffer[32+22] << 0;
|
p1 |= DemodBuffer[32 + 22] << 0;
|
||||||
p1 |= DemodBuffer[32+24] << 9;
|
p1 |= DemodBuffer[32 + 24] << 9;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
uint16_t fc = 0;
|
uint16_t fc = 0;
|
||||||
fc |= DemodBuffer[32+ 1] << 0;
|
fc |= DemodBuffer[32+ 1] << 0;
|
||||||
fc |= DemodBuffer[32+ 2] << 1;
|
fc |= DemodBuffer[32+ 2] << 1;
|
||||||
|
@ -250,13 +250,13 @@ int CmdIndalaDemod(const char *Cmd) {
|
||||||
fc |= DemodBuffer[32+14] << 6;
|
fc |= DemodBuffer[32+14] << 6;
|
||||||
fc |= DemodBuffer[32+15] << 7;
|
fc |= DemodBuffer[32+15] << 7;
|
||||||
fc |= DemodBuffer[32+17] << 8;
|
fc |= DemodBuffer[32+17] << 8;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
PrintAndLogEx(NORMAL, "");
|
PrintAndLogEx(NORMAL, "");
|
||||||
PrintAndLogEx(SUCCESS, "Possible de-scramble patterns");
|
PrintAndLogEx(SUCCESS, "Possible de-scramble patterns");
|
||||||
PrintAndLogEx(SUCCESS, "\tPrinted | __%04d__ [0x%X]", p1, p1);
|
PrintAndLogEx(SUCCESS, "\tPrinted | __%04d__ [0x%X]", p1, p1);
|
||||||
//PrintAndLogEx(SUCCESS, "\tPrinted | __%04d__ [0x%X]", fc, fc);
|
//PrintAndLogEx(SUCCESS, "\tPrinted | __%04d__ [0x%X]", fc, fc);
|
||||||
PrintAndLogEx(SUCCESS, "\tInternal ID | %" PRIu64 , foo);
|
PrintAndLogEx(SUCCESS, "\tInternal ID | %" PRIu64, foo);
|
||||||
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
@ -532,7 +532,7 @@ int CmdIndalaSim(const char *Cmd) {
|
||||||
int CmdIndalaClone(const char *Cmd) {
|
int CmdIndalaClone(const char *Cmd) {
|
||||||
|
|
||||||
bool isLongUid = false;
|
bool isLongUid = false;
|
||||||
uint8_t data[7*4];
|
uint8_t data[7 * 4];
|
||||||
int datalen = 0;
|
int datalen = 0;
|
||||||
|
|
||||||
CLIParserInit("lf indala clone",
|
CLIParserInit("lf indala clone",
|
||||||
|
@ -555,7 +555,7 @@ int CmdIndalaClone(const char *Cmd) {
|
||||||
CLIGetHexWithReturn(2, data, &datalen);
|
CLIGetHexWithReturn(2, data, &datalen);
|
||||||
CLIParserFree();
|
CLIParserFree();
|
||||||
|
|
||||||
UsbCommand c = {0, {0,0,0}};
|
UsbCommand c = {0, {0, 0, 0}};
|
||||||
|
|
||||||
if (isLongUid) {
|
if (isLongUid) {
|
||||||
PrintAndLogEx(INFO, "Preparing to clone Indala 224bit tag with UID %s", sprint_hex(data, datalen));
|
PrintAndLogEx(INFO, "Preparing to clone Indala 224bit tag with UID %s", sprint_hex(data, datalen));
|
||||||
|
|
|
@ -41,8 +41,8 @@ int usage_lf_keri_sim(void) {
|
||||||
// find KERI preamble in already demoded data
|
// find KERI preamble in already demoded data
|
||||||
int detectKeri(uint8_t *dest, size_t *size, bool *invert) {
|
int detectKeri(uint8_t *dest, size_t *size, bool *invert) {
|
||||||
|
|
||||||
uint8_t preamble[] = {1,1,1,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
|
uint8_t preamble[] = {1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
|
||||||
uint8_t preamble_i[] = {0,0,0,1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
|
uint8_t preamble_i[] = {0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0};
|
||||||
|
|
||||||
// sanity check.
|
// sanity check.
|
||||||
if (*size < sizeof(preamble) + 100) return -1;
|
if (*size < sizeof(preamble) + 100) return -1;
|
||||||
|
@ -162,7 +162,7 @@ int CmdKeriClone(const char *Cmd) {
|
||||||
|
|
||||||
// 3 LSB is ONE
|
// 3 LSB is ONE
|
||||||
uint64_t data = ((uint64_t)internalid << 3) + 7;
|
uint64_t data = ((uint64_t)internalid << 3) + 7;
|
||||||
PrintAndLogEx(INFO, "Preparing to clone KERI to T55x7 with Internal Id: %" PRIx64, internalid );
|
PrintAndLogEx(INFO, "Preparing to clone KERI to T55x7 with Internal Id: %" PRIx64, internalid);
|
||||||
|
|
||||||
//
|
//
|
||||||
blocks[1] = data >> 32;
|
blocks[1] = data >> 32;
|
||||||
|
|
|
@ -1369,7 +1369,7 @@ bool AquireData(uint8_t page, uint8_t block, bool pwdmode, uint32_t password) {
|
||||||
// bit1 = page to read from
|
// bit1 = page to read from
|
||||||
// arg1: which block to read
|
// arg1: which block to read
|
||||||
// arg2: password
|
// arg2: password
|
||||||
uint8_t arg0 = ( page << 1 | (pwdmode) );
|
uint8_t arg0 = (page << 1 | (pwdmode));
|
||||||
UsbCommand c = {CMD_T55XX_READ_BLOCK, {arg0, block, password}};
|
UsbCommand c = {CMD_T55XX_READ_BLOCK, {arg0, block, password}};
|
||||||
clearCommandBuffer();
|
clearCommandBuffer();
|
||||||
SendCommand(&c);
|
SendCommand(&c);
|
||||||
|
@ -1697,13 +1697,13 @@ int CmdT55xxChkPwds(const char *Cmd) {
|
||||||
size_t datalen = 0;
|
size_t datalen = 0;
|
||||||
|
|
||||||
// TODO, a way of reallocating memory if file was larger
|
// TODO, a way of reallocating memory if file was larger
|
||||||
keyBlock = calloc(4*200, sizeof(uint8_t));
|
keyBlock = calloc(4 * 200, sizeof(uint8_t));
|
||||||
if ( keyBlock == NULL ) {
|
if (keyBlock == NULL) {
|
||||||
PrintAndLogDevice(WARNING, "error, cannot allocate memory ");
|
PrintAndLogDevice(WARNING, "error, cannot allocate memory ");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int res = loadFileDICTIONARY(filename, "dic", keyBlock, &datalen, 4, &keycount );
|
int res = loadFileDICTIONARY(filename, "dic", keyBlock, &datalen, 4, &keycount);
|
||||||
if (res || keycount == 0) {
|
if (res || keycount == 0) {
|
||||||
PrintAndLogEx(WARNING, "No keys found in file");
|
PrintAndLogEx(WARNING, "No keys found in file");
|
||||||
free(keyBlock);
|
free(keyBlock);
|
||||||
|
@ -1834,7 +1834,7 @@ int CmdT55xxRecoverPW(const char *Cmd) {
|
||||||
while (bit < 32) {
|
while (bit < 32) {
|
||||||
curr_password = orig_password ^ (1u << bit);
|
curr_password = orig_password ^ (1u << bit);
|
||||||
found = tryOnePassword(curr_password);
|
found = tryOnePassword(curr_password);
|
||||||
if ( found == 1)
|
if (found == 1)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
bit++;
|
bit++;
|
||||||
|
@ -1859,7 +1859,7 @@ int CmdT55xxRecoverPW(const char *Cmd) {
|
||||||
}
|
}
|
||||||
|
|
||||||
found = tryOnePassword(curr_password);
|
found = tryOnePassword(curr_password);
|
||||||
if ( found == 1 )
|
if (found == 1)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
bit++;
|
bit++;
|
||||||
|
@ -1881,7 +1881,7 @@ int CmdT55xxRecoverPW(const char *Cmd) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
found = tryOnePassword(curr_password);
|
found = tryOnePassword(curr_password);
|
||||||
if ( found == 1 )
|
if (found == 1)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
bit++;
|
bit++;
|
||||||
|
|
|
@ -989,7 +989,7 @@ pcrc(const poly_t message, const poly_t divisor, const poly_t init, const poly_t
|
||||||
pshift(&result, result, 0UL, ofs, (init.length > max + divisor.length ? init.length - max - divisor.length : 0UL) + divisor.length + ofs, 0UL);
|
pshift(&result, result, 0UL, ofs, (init.length > max + divisor.length ? init.length - max - divisor.length : 0UL) + divisor.length + ofs, 0UL);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( result.bitmap != NULL )
|
if (result.bitmap != NULL)
|
||||||
psum(&result, xorout, 0UL);
|
psum(&result, xorout, 0UL);
|
||||||
|
|
||||||
return (result);
|
return (result);
|
||||||
|
|
|
@ -480,156 +480,156 @@ static const struct malias aliases[];
|
||||||
*/
|
*/
|
||||||
static const struct mpreset models[] = {
|
static const struct mpreset models[] = {
|
||||||
{64UL, b64, b64a, P_LE | P_CONFIR, b64a, b64b, b64c, aliases + 130}, /* 0 */
|
{64UL, b64, b64a, P_LE | P_CONFIR, b64a, b64b, b64c, aliases + 130}, /* 0 */
|
||||||
{32UL, b32+ 0, 0, P_BE | P_CONFIR, 0, b32+148, 0, aliases+107}, /* 1 */
|
{32UL, b32 + 0, 0, P_BE | P_CONFIR, 0, b32 + 148, 0, aliases + 107}, /* 1 */
|
||||||
{40UL, b40, 0, P_BE | P_ACADEM, b40a, b40b, b40c, aliases + 115}, /* 2 */
|
{40UL, b40, 0, P_BE | P_ACADEM, b40a, b40b, b40c, aliases + 115}, /* 2 */
|
||||||
{24UL, b32+ 3, b32+ 76, P_LE | P_ATTEST, 0, b32+153, 0, aliases+ 77}, /* 3 */
|
{24UL, b32 + 3, b32 + 76, P_LE | P_ATTEST, 0, b32 + 153, 0, aliases + 77}, /* 3 */
|
||||||
{32UL, b32+ 8, 0, P_BE | P_ATTEST, b32+209, b32+ 92, b32+159, aliases+ 98}, /* 4 */
|
{32UL, b32 + 8, 0, P_BE | P_ATTEST, b32 + 209, b32 + 92, b32 + 159, aliases + 98}, /* 4 */
|
||||||
{32UL, b32+ 8, b32+209, P_BE | P_ATTEST, 0, b32+ 7, 0, aliases+104}, /* 5 */
|
{32UL, b32 + 8, b32 + 209, P_BE | P_ATTEST, 0, b32 + 7, 0, aliases + 104}, /* 5 */
|
||||||
{32UL, b32+ 8, b32+209, P_BE | P_ATTEST, b32+209, b32+196, b32+159, aliases+ 96}, /* 6 */
|
{32UL, b32 + 8, b32 + 209, P_BE | P_ATTEST, b32 + 209, b32 + 196, b32 + 159, aliases + 96}, /* 6 */
|
||||||
{32UL, b32+ 8, b32+209, P_LE | P_CONFIR, 0, b32+ 56, 0, aliases+103}, /* 7 */
|
{32UL, b32 + 8, b32 + 209, P_LE | P_CONFIR, 0, b32 + 56, 0, aliases + 103}, /* 7 */
|
||||||
{32UL, b32+ 8, b32+209, P_LE | P_ATTEST, b32+209, b32+162, b32+175, aliases+102}, /* 8 */
|
{32UL, b32 + 8, b32 + 209, P_LE | P_ATTEST, b32 + 209, b32 + 162, b32 + 175, aliases + 102}, /* 8 */
|
||||||
{16UL, b32 + 9, 0, P_BE | P_ATTEST, 0, b32 + 5, 0, aliases + 36}, /* 9 */
|
{16UL, b32 + 9, 0, P_BE | P_ATTEST, 0, b32 + 5, 0, aliases + 36}, /* 9 */
|
||||||
{16UL, b32 + 9, 0, P_BE | P_ATTEST, b32 + 1, b32 + 4, b32 + 9, aliases + 35}, /* 10 */
|
{16UL, b32 + 9, 0, P_BE | P_ATTEST, b32 + 1, b32 + 4, b32 + 9, aliases + 35}, /* 10 */
|
||||||
{ 8UL, b32+ 10, 0, P_BE | P_ATTEST, 0, b32+189, 0, aliases+158}, /* 11 */
|
{ 8UL, b32 + 10, 0, P_BE | P_ATTEST, 0, b32 + 189, 0, aliases + 158}, /* 11 */
|
||||||
{ 8UL, b32+ 10, 0, P_BE | P_ACADEM, b32+ 75, b32+126, b32+134, aliases+147}, /* 12 */
|
{ 8UL, b32 + 10, 0, P_BE | P_ACADEM, b32 + 75, b32 + 126, b32 + 134, aliases + 147}, /* 12 */
|
||||||
{ 8UL, b32+ 10, b32+201, P_LE | P_ACADEM, 0, b32+165, 0, aliases+156}, /* 13 */
|
{ 8UL, b32 + 10, b32 + 201, P_LE | P_ACADEM, 0, b32 + 165, 0, aliases + 156}, /* 13 */
|
||||||
{16UL, b32+ 11, b32+205, P_LE | P_ATTEST, 0, b32+124, 0, aliases+ 58}, /* 14 */
|
{16UL, b32 + 11, b32 + 205, P_LE | P_ATTEST, 0, b32 + 124, 0, aliases + 58}, /* 14 */
|
||||||
{31UL, b32+ 12, b32+208, P_BE | P_CONFIR, b32+208, b32+ 26, b32+121, aliases+ 88}, /* 15 */
|
{31UL, b32 + 12, b32 + 208, P_BE | P_CONFIR, b32 + 208, b32 + 26, b32 + 121, aliases + 88}, /* 15 */
|
||||||
{ 6UL, b32 + 14, 0, P_LE | P_ACADEM, 0, b32 + 25, 0, aliases + 124}, /* 16 */
|
{ 6UL, b32 + 14, 0, P_LE | P_ACADEM, 0, b32 + 25, 0, aliases + 124}, /* 16 */
|
||||||
{82UL, b82, 0, P_LE | P_ATTEST, 0, b82a, 0, aliases+161}, /* 17 */
|
{82UL, b82, 0, P_LE | P_ATTEST, 0, b82a, 0, aliases + 161}, /* 17 */
|
||||||
{16UL, b32 + 18, 0, P_BE | P_ATTEST, 0, b32 + 53, 0, aliases + 73}, /* 18 */
|
{16UL, b32 + 18, 0, P_BE | P_ATTEST, 0, b32 + 53, 0, aliases + 73}, /* 18 */
|
||||||
{16UL, b32+ 18, 0, P_BE | P_ACADEM, b32+205, b32+164, b32+ 29, aliases+ 42}, /* 19 */
|
{16UL, b32 + 18, 0, P_BE | P_ACADEM, b32 + 205, b32 + 164, b32 + 29, aliases + 42}, /* 19 */
|
||||||
{16UL, b32 + 18, 0, P_LE | P_ATTEST, 0, b32 + 38, 0, aliases + 50}, /* 20 */
|
{16UL, b32 + 18, 0, P_LE | P_ATTEST, 0, b32 + 38, 0, aliases + 50}, /* 20 */
|
||||||
{16UL, b32+ 18, b32+ 29, P_BE | P_ATTEST, 0, b32+180, 0, aliases+ 63}, /* 21 */
|
{16UL, b32 + 18, b32 + 29, P_BE | P_ATTEST, 0, b32 + 180, 0, aliases + 63}, /* 21 */
|
||||||
{16UL, b32 + 18, b32 + 108, P_LE | P_ATTEST, 0, b32 + 43, 0, aliases + 66}, /* 22 */
|
{16UL, b32 + 18, b32 + 108, P_LE | P_ATTEST, 0, b32 + 43, 0, aliases + 66}, /* 22 */
|
||||||
{16UL, b32+ 18, b32+138, P_LE | P_THIRDP, 0, b32+ 83, 0, aliases+ 62}, /* 23 */
|
{16UL, b32 + 18, b32 + 138, P_LE | P_THIRDP, 0, b32 + 83, 0, aliases + 62}, /* 23 */
|
||||||
{16UL, b32+ 18, b32+157, P_LE | P_ATTEST, 0, b32+150, 0, aliases+ 48}, /* 24 */
|
{16UL, b32 + 18, b32 + 157, P_LE | P_ATTEST, 0, b32 + 150, 0, aliases + 48}, /* 24 */
|
||||||
{16UL, b32+ 18, b32+205, P_BE | P_ATTEST, 0, b32+ 47, 0, aliases+ 44}, /* 25 */
|
{16UL, b32 + 18, b32 + 205, P_BE | P_ATTEST, 0, b32 + 47, 0, aliases + 44}, /* 25 */
|
||||||
{16UL, b32+ 18, b32+205, P_BE | P_ATTEST, b32+205, b32+172, b32+ 29, aliases+ 41}, /* 26 */
|
{16UL, b32 + 18, b32 + 205, P_BE | P_ATTEST, b32 + 205, b32 + 172, b32 + 29, aliases + 41}, /* 26 */
|
||||||
{16UL, b32+ 18, b32+205, P_LE | P_ATTEST, 0, b32+ 88, 0, aliases+ 56}, /* 27 */
|
{16UL, b32 + 18, b32 + 205, P_LE | P_ATTEST, 0, b32 + 88, 0, aliases + 56}, /* 27 */
|
||||||
{16UL, b32+ 18, b32+205, P_LE | P_ATTEST, b32+205, b32+114, b32+187, aliases+ 45}, /* 28 */
|
{16UL, b32 + 18, b32 + 205, P_LE | P_ATTEST, b32 + 205, b32 + 114, b32 + 187, aliases + 45}, /* 28 */
|
||||||
{ 7UL, b32+ 19, 0, P_BE | P_ACADEM, 0, b32+183, 0, aliases+134}, /* 29 */
|
{ 7UL, b32 + 19, 0, P_BE | P_ACADEM, 0, b32 + 183, 0, aliases + 134}, /* 29 */
|
||||||
{ 6UL, b32+ 27, b32+195, P_BE | P_ACADEM, 0, b32+185, 0, aliases+122}, /* 30 */
|
{ 6UL, b32 + 27, b32 + 195, P_BE | P_ACADEM, 0, b32 + 185, 0, aliases + 122}, /* 30 */
|
||||||
{ 8UL, b32 + 28, 0, P_BE | P_ACADEM, 0, b32 + 57, 0, aliases + 145}, /* 31 */
|
{ 8UL, b32 + 28, 0, P_BE | P_ACADEM, 0, b32 + 57, 0, aliases + 145}, /* 31 */
|
||||||
{ 8UL, b32+ 28, b32+158, P_BE | P_ATTEST, 0, b32+118, 0, aliases+153}, /* 32 */
|
{ 8UL, b32 + 28, b32 + 158, P_BE | P_ATTEST, 0, b32 + 118, 0, aliases + 153}, /* 32 */
|
||||||
{ 8UL, b32+ 28, b32+197, P_BE | P_ATTEST, 0, b32+ 95, 0, aliases+148}, /* 33 */
|
{ 8UL, b32 + 28, b32 + 197, P_BE | P_ATTEST, 0, b32 + 95, 0, aliases + 148}, /* 33 */
|
||||||
{ 8UL, b32+ 28, b32+201, P_BE | P_ATTEST, b32+201, b32+ 70, b32+156, aliases+157}, /* 34 */
|
{ 8UL, b32 + 28, b32 + 201, P_BE | P_ATTEST, b32 + 201, b32 + 70, b32 + 156, aliases + 157}, /* 34 */
|
||||||
{ 8UL, b32+ 28, b32+201, P_LE | P_ATTEST, 0, b32+116, 0, aliases+159}, /* 35 */
|
{ 8UL, b32 + 28, b32 + 201, P_LE | P_ATTEST, 0, b32 + 116, 0, aliases + 159}, /* 35 */
|
||||||
{16UL, b32+ 30, b32+205, P_BE | P_ATTEST, b32+205, b32+131, b32+179, aliases+ 61}, /* 36 */
|
{16UL, b32 + 30, b32 + 205, P_BE | P_ATTEST, b32 + 205, b32 + 131, b32 + 179, aliases + 61}, /* 36 */
|
||||||
{32UL, b32+ 31, b32+209, P_LE | P_ATTEST, b32+209, b32+178, b32+145, aliases+101}, /* 37 */
|
{32UL, b32 + 31, b32 + 209, P_LE | P_ATTEST, b32 + 209, b32 + 178, b32 + 145, aliases + 101}, /* 37 */
|
||||||
{14UL, b32+ 35, 0, P_LE | P_ATTEST, 0, b32+ 36, 0, aliases+ 17}, /* 38 */
|
{14UL, b32 + 35, 0, P_LE | P_ATTEST, 0, b32 + 36, 0, aliases + 17}, /* 38 */
|
||||||
{ 5UL, b32+ 46, b32+194, P_LE | P_THIRDP, b32+194, b32+160, b32+ 49, aliases+120}, /* 39 */
|
{ 5UL, b32 + 46, b32 + 194, P_LE | P_THIRDP, b32 + 194, b32 + 160, b32 + 49, aliases + 120}, /* 39 */
|
||||||
{ 8UL, b32+ 48, 0, P_BE | P_ATTEST, 0, b32+ 61, 0, aliases+155}, /* 40 */
|
{ 8UL, b32 + 48, 0, P_BE | P_ATTEST, 0, b32 + 61, 0, aliases + 155}, /* 40 */
|
||||||
{ 8UL, b32+ 48, b32+201, P_BE | P_ATTEST, b32+201, b32+176, b32+ 63, aliases+139}, /* 41 */
|
{ 8UL, b32 + 48, b32 + 201, P_BE | P_ATTEST, b32 + 201, b32 + 176, b32 + 63, aliases + 139}, /* 41 */
|
||||||
{ 4UL, b32+ 49, 0, P_LE | P_ACADEM, 0, b32+ 89, 0, aliases+112}, /* 42 */
|
{ 4UL, b32 + 49, 0, P_LE | P_ACADEM, 0, b32 + 89, 0, aliases + 112}, /* 42 */
|
||||||
{ 4UL, b32+ 49, b32+186, P_BE | P_ACADEM, b32+186, b32+136, b32+ 33, aliases+113}, /* 43 */
|
{ 4UL, b32 + 49, b32 + 186, P_BE | P_ACADEM, b32 + 186, b32 + 136, b32 + 33, aliases + 113}, /* 43 */
|
||||||
{ 8UL, b32+ 51, 0, P_LE | P_ATTEST, 0, b32+126, 0, aliases+152}, /* 44 */
|
{ 8UL, b32 + 51, 0, P_LE | P_ATTEST, 0, b32 + 126, 0, aliases + 152}, /* 44 */
|
||||||
{ 8UL, b32+ 51, b32+201, P_BE | P_ATTEST, 0, b32+193, 0, aliases+154}, /* 45 */
|
{ 8UL, b32 + 51, b32 + 201, P_BE | P_ATTEST, 0, b32 + 193, 0, aliases + 154}, /* 45 */
|
||||||
{24UL, b32+ 54, b32+206, P_BE | P_ACADEM, b32+206, b32+143, b32+ 21, aliases+ 80}, /* 46 */
|
{24UL, b32 + 54, b32 + 206, P_BE | P_ACADEM, b32 + 206, b32 + 143, b32 + 21, aliases + 80}, /* 46 */
|
||||||
{ 8UL, b32+ 59, 0, P_LE | P_ATTEST, 0, b32+ 22, 0, aliases+142}, /* 47 */
|
{ 8UL, b32 + 59, 0, P_LE | P_ATTEST, 0, b32 + 22, 0, aliases + 142}, /* 47 */
|
||||||
{16UL, b32+ 60, 0, P_BE | P_CONFIR, b32+205, b32+154, b32+127, aliases+ 38}, /* 48 */
|
{16UL, b32 + 60, 0, P_BE | P_CONFIR, b32 + 205, b32 + 154, b32 + 127, aliases + 38}, /* 48 */
|
||||||
{16UL, b32+ 60, 0, P_LE | P_CONFIR, b32+205, b32+184, b32+ 86, aliases+ 37}, /* 49 */
|
{16UL, b32 + 60, 0, P_LE | P_CONFIR, b32 + 205, b32 + 184, b32 + 86, aliases + 37}, /* 49 */
|
||||||
{64UL, b64d, 0, P_BE | P_ACADEM, 0, b64e, 0, aliases+128}, /* 50 */
|
{64UL, b64d, 0, P_BE | P_ACADEM, 0, b64e, 0, aliases + 128}, /* 50 */
|
||||||
{64UL, b64d, b64a, P_BE | P_CONFIR, b64a, b64f, b64g, aliases+131}, /* 51 */
|
{64UL, b64d, b64a, P_BE | P_CONFIR, b64a, b64f, b64g, aliases + 131}, /* 51 */
|
||||||
{64UL, b64d, b64a, P_LE | P_ATTEST, b64a, b64h, b64i, aliases+132}, /* 52 */
|
{64UL, b64d, b64a, P_LE | P_ATTEST, b64a, b64h, b64i, aliases + 132}, /* 52 */
|
||||||
{ 5UL, b32+ 66, b32+ 66, P_BE | P_ATTEST, 0, 0, 0, aliases+117}, /* 53 */
|
{ 5UL, b32 + 66, b32 + 66, P_BE | P_ATTEST, 0, 0, 0, aliases + 117}, /* 53 */
|
||||||
{ 8UL, b32+ 67, 0, P_BE | P_ACADEM, b32+201, b32+115, b32+ 74, aliases+146}, /* 54 */
|
{ 8UL, b32 + 67, 0, P_BE | P_ACADEM, b32 + 201, b32 + 115, b32 + 74, aliases + 146}, /* 54 */
|
||||||
{16UL, b32+ 77, 0, P_BE | P_ATTEST, 0, b32+ 78, 0, aliases+ 59}, /* 55 */
|
{16UL, b32 + 77, 0, P_BE | P_ATTEST, 0, b32 + 78, 0, aliases + 59}, /* 55 */
|
||||||
{10UL, b32+ 79, 0, P_BE | P_ACADEM, b32+202, b32+ 68, b32+ 52, aliases+ 6}, /* 56 */
|
{10UL, b32 + 79, 0, P_BE | P_ACADEM, b32 + 202, b32 + 68, b32 + 52, aliases + 6}, /* 56 */
|
||||||
{24UL, b32+ 80, b32+133, P_BE | P_ATTEST, 0, b32+ 32, 0, aliases+ 79}, /* 57 */
|
{24UL, b32 + 80, b32 + 133, P_BE | P_ATTEST, 0, b32 + 32, 0, aliases + 79}, /* 57 */
|
||||||
{24UL, b32+ 80, b32+199, P_BE | P_ATTEST, 0, b32+ 94, 0, aliases+ 78}, /* 58 */
|
{24UL, b32 + 80, b32 + 199, P_BE | P_ATTEST, 0, b32 + 94, 0, aliases + 78}, /* 58 */
|
||||||
{ 3UL, b32+ 81, 0, P_BE | P_ACADEM, b32+177, b32+ 96, b32+ 62, aliases+ 85}, /* 59 */
|
{ 3UL, b32 + 81, 0, P_BE | P_ACADEM, b32 + 177, b32 + 96, b32 + 62, aliases + 85}, /* 59 */
|
||||||
{ 3UL, b32+ 81, b32+177, P_LE | P_ACADEM, 0, b32+151, 0, aliases+ 86}, /* 60 */
|
{ 3UL, b32 + 81, b32 + 177, P_LE | P_ACADEM, 0, b32 + 151, 0, aliases + 86}, /* 60 */
|
||||||
{11UL, b32+ 82, 0, P_BE | P_ACADEM, 0, b32+ 15, 0, aliases+ 10}, /* 61 */
|
{11UL, b32 + 82, 0, P_BE | P_ACADEM, 0, b32 + 15, 0, aliases + 10}, /* 61 */
|
||||||
{ 6UL, b32+ 84, 0, P_LE | P_ATTEST, 0, b32+117, 0, aliases+123}, /* 62 */
|
{ 6UL, b32 + 84, 0, P_LE | P_ATTEST, 0, b32 + 117, 0, aliases + 123}, /* 62 */
|
||||||
{16UL, b32+ 87, 0, P_BE | P_THIRDP, 0, b32+149, 0, aliases+ 52}, /* 63 */
|
{16UL, b32 + 87, 0, P_BE | P_THIRDP, 0, b32 + 149, 0, aliases + 52}, /* 63 */
|
||||||
{11UL, b32+ 90, b32+ 6, P_BE | P_ATTEST, 0, b32+141, 0, aliases+ 9}, /* 64 */
|
{11UL, b32 + 90, b32 + 6, P_BE | P_ATTEST, 0, b32 + 141, 0, aliases + 9}, /* 64 */
|
||||||
{16UL, b32+ 91, 0, P_BE | P_ATTEST, 0, b32+ 37, 0, aliases+ 60}, /* 65 */
|
{16UL, b32 + 91, 0, P_BE | P_ATTEST, 0, b32 + 37, 0, aliases + 60}, /* 65 */
|
||||||
{24UL, b32+ 97, 0, P_BE | P_ACADEM, 0, b32+ 40, 0, aliases+ 82}, /* 66 */
|
{24UL, b32 + 97, 0, P_BE | P_ACADEM, 0, b32 + 40, 0, aliases + 82}, /* 66 */
|
||||||
{24UL, b32+ 97, b32+206, P_BE | P_ATTEST, b32+206, b32+ 34, b32+100, aliases+ 84}, /* 67 */
|
{24UL, b32 + 97, b32 + 206, P_BE | P_ATTEST, b32 + 206, b32 + 34, b32 + 100, aliases + 84}, /* 67 */
|
||||||
{16UL, b32+ 98, 0, P_BE | P_ATTEST, 0, b32+200, 0, aliases+ 67}, /* 68 */
|
{16UL, b32 + 98, 0, P_BE | P_ATTEST, 0, b32 + 200, 0, aliases + 67}, /* 68 */
|
||||||
{16UL, b32+ 98, 0, P_LE | P_CONFIR, 0, b32+146, 0, aliases+ 24}, /* 69 */
|
{16UL, b32 + 98, 0, P_LE | P_CONFIR, 0, b32 + 146, 0, aliases + 24}, /* 69 */
|
||||||
{16UL, b32+ 98, 0, P_LE | P_ATTEST, b32+205, b32+ 64, b32+137, aliases+ 55}, /* 70 */
|
{16UL, b32 + 98, 0, P_LE | P_ATTEST, b32 + 205, b32 + 64, b32 + 137, aliases + 55}, /* 70 */
|
||||||
{16UL, b32+ 98, b32+ 99, P_BE | P_ATTEST, 0, b32+123, 0, aliases+ 34}, /* 71 */
|
{16UL, b32 + 98, b32 + 99, P_BE | P_ATTEST, 0, b32 + 123, 0, aliases + 34}, /* 71 */
|
||||||
{16UL, b32+ 98, b32+205, P_BE | P_THIRDP, 0, b32+135, 0, aliases+ 32}, /* 72 */
|
{16UL, b32 + 98, b32 + 205, P_BE | P_THIRDP, 0, b32 + 135, 0, aliases + 32}, /* 72 */
|
||||||
{16UL, b32+ 98, b32+205, P_LE | P_ATTEST, 0, b32+ 71, 0, aliases+ 57}, /* 73 */
|
{16UL, b32 + 98, b32 + 205, P_LE | P_ATTEST, 0, b32 + 71, 0, aliases + 57}, /* 73 */
|
||||||
{16UL, b32+ 98, b32+205, P_LE | P_THIRDP, b32+205, b32+142, b32+137, aliases+ 68}, /* 74 */
|
{16UL, b32 + 98, b32 + 205, P_LE | P_THIRDP, b32 + 205, b32 + 142, b32 + 137, aliases + 68}, /* 74 */
|
||||||
{14UL, b32+101, 0, P_BE | P_ACADEM, b32+204, b32+155, b32+ 16, aliases+ 18}, /* 75 */
|
{14UL, b32 + 101, 0, P_BE | P_ACADEM, b32 + 204, b32 + 155, b32 + 16, aliases + 18}, /* 75 */
|
||||||
{30UL, b32+102, b32+207, P_BE | P_ACADEM, b32+207, b32+ 20, b32+169, aliases+ 87}, /* 76 */
|
{30UL, b32 + 102, b32 + 207, P_BE | P_ACADEM, b32 + 207, b32 + 20, b32 + 169, aliases + 87}, /* 76 */
|
||||||
{12UL, b32+103, 0, P_BE | P_ACADEM, 0, b32+191, 0, aliases+ 13}, /* 77 */
|
{12UL, b32 + 103, 0, P_BE | P_ACADEM, 0, b32 + 191, 0, aliases + 13}, /* 77 */
|
||||||
{12UL, b32+103, 0, P_BELE | P_ACADEM, 0, b32+174, 0, aliases+ 15}, /* 78 */
|
{12UL, b32 + 103, 0, P_BELE | P_ACADEM, 0, b32 + 174, 0, aliases + 15}, /* 78 */
|
||||||
{32UL, b32+104, 0, P_BE | P_ATTEST, 0, b32+ 50, 0, aliases+ 92}, /* 79 */
|
{32UL, b32 + 104, 0, P_BE | P_ATTEST, 0, b32 + 50, 0, aliases + 92}, /* 79 */
|
||||||
{21UL, b32+105, 0, P_BE | P_ACADEM, 0, b32+ 93, 0, aliases+ 75}, /* 80 */
|
{21UL, b32 + 105, 0, P_BE | P_ACADEM, 0, b32 + 93, 0, aliases + 75}, /* 80 */
|
||||||
{24UL, b32+106, 0, P_BE | P_ACADEM, 0, b32+163, 0, aliases+ 81}, /* 81 */
|
{24UL, b32 + 106, 0, P_BE | P_ACADEM, 0, b32 + 163, 0, aliases + 81}, /* 81 */
|
||||||
{24UL, b32+106, b32+144, P_BE | P_ATTEST, 0, b32+ 39, 0, aliases+ 83}, /* 82 */
|
{24UL, b32 + 106, b32 + 144, P_BE | P_ATTEST, 0, b32 + 39, 0, aliases + 83}, /* 82 */
|
||||||
{ 7UL, b32+109, 0, P_BE | P_ACADEM, 0, b32+152, 0, aliases+136}, /* 83 */
|
{ 7UL, b32 + 109, 0, P_BE | P_ACADEM, 0, b32 + 152, 0, aliases + 136}, /* 83 */
|
||||||
{15UL, b32+110, 0, P_BE | P_ACADEM, 0, b32+ 13, 0, aliases+ 20}, /* 84 */
|
{15UL, b32 + 110, 0, P_BE | P_ACADEM, 0, b32 + 13, 0, aliases + 20}, /* 84 */
|
||||||
{16UL, b32+111, 0, P_BE | P_ATTEST, 0, b32+167, 0, aliases+ 64}, /* 85 */
|
{16UL, b32 + 111, 0, P_BE | P_ATTEST, 0, b32 + 167, 0, aliases + 64}, /* 85 */
|
||||||
{10UL, b32+112, 0, P_BE | P_ATTEST, 0, b32+ 85, 0, aliases+ 4}, /* 86 */
|
{10UL, b32 + 112, 0, P_BE | P_ATTEST, 0, b32 + 85, 0, aliases + 4}, /* 86 */
|
||||||
{ 8UL, b32+119, 0, P_BE | P_ACADEM, 0, b32+183, 0, aliases+150}, /* 87 */
|
{ 8UL, b32 + 119, 0, P_BE | P_ACADEM, 0, b32 + 183, 0, aliases + 150}, /* 87 */
|
||||||
{ 8UL, b32+119, 0, P_LE | P_THIRDP, 0, b32+ 41, 0, aliases+160}, /* 88 */
|
{ 8UL, b32 + 119, 0, P_LE | P_THIRDP, 0, b32 + 41, 0, aliases + 160}, /* 88 */
|
||||||
{ 8UL, b32+119, b32+201, P_BE | P_ACADEM, 0, b32+173, 0, aliases+141}, /* 89 */
|
{ 8UL, b32 + 119, b32 + 201, P_BE | P_ACADEM, 0, b32 + 173, 0, aliases + 141}, /* 89 */
|
||||||
{ 6UL, b32+120, b32+195, P_BE | P_ATTEST, 0, b32+ 55, 0, aliases+121}, /* 90 */
|
{ 6UL, b32 + 120, b32 + 195, P_BE | P_ATTEST, 0, b32 + 55, 0, aliases + 121}, /* 90 */
|
||||||
{ 7UL, b32+122, b32+198, P_LE | P_ACADEM, 0, b32+128, 0, aliases+135}, /* 91 */
|
{ 7UL, b32 + 122, b32 + 198, P_LE | P_ACADEM, 0, b32 + 128, 0, aliases + 135}, /* 91 */
|
||||||
{16UL, b32+125, 0, P_BE | P_CONFIR, 0, b32+ 17, 0, aliases+ 65}, /* 92 */
|
{16UL, b32 + 125, 0, P_BE | P_CONFIR, 0, b32 + 17, 0, aliases + 65}, /* 92 */
|
||||||
{ 8UL, b32+129, 0, P_LE | P_ATTEST, 0, b32+ 42, 0, aliases+140}, /* 93 */
|
{ 8UL, b32 + 129, 0, P_LE | P_ATTEST, 0, b32 + 42, 0, aliases + 140}, /* 93 */
|
||||||
{ 5UL, b32+130, 0, P_LE | P_ACADEM, 0, b32+ 58, 0, aliases+118}, /* 94 */
|
{ 5UL, b32 + 130, 0, P_LE | P_ACADEM, 0, b32 + 58, 0, aliases + 118}, /* 94 */
|
||||||
{32UL, b32+132, b32+209, P_LE | P_CONFIR, b32+209, b32+107, b32+ 65, aliases+ 95}, /* 95 */
|
{32UL, b32 + 132, b32 + 209, P_LE | P_CONFIR, b32 + 209, b32 + 107, b32 + 65, aliases + 95}, /* 95 */
|
||||||
{17UL, b32+140, 0, P_BE | P_ACADEM, 0, b32+ 44, 0, aliases+ 74}, /* 96 */
|
{17UL, b32 + 140, 0, P_BE | P_ACADEM, 0, b32 + 44, 0, aliases + 74}, /* 96 */
|
||||||
{ 6UL, b32+147, 0, P_BE | P_ACADEM, b32+195, b32+ 72, b32+182, aliases+125}, /* 97 */
|
{ 6UL, b32 + 147, 0, P_BE | P_ACADEM, b32 + 195, b32 + 72, b32 + 182, aliases + 125}, /* 97 */
|
||||||
{16UL, b32+161, b32+205, P_BE | P_ACADEM, 0, b32+ 73, 0, aliases+ 31}, /* 98 */
|
{16UL, b32 + 161, b32 + 205, P_BE | P_ACADEM, 0, b32 + 73, 0, aliases + 31}, /* 98 */
|
||||||
{15UL, b32+166, 0, P_BE | P_ATTEST, b32+ 2, b32+ 69, b32+166, aliases+ 21}, /* 99 */
|
{15UL, b32 + 166, 0, P_BE | P_ATTEST, b32 + 2, b32 + 69, b32 + 166, aliases + 21}, /* 99 */
|
||||||
{12UL, b32+168, 0, P_BE | P_ACADEM, b32+203, b32+139, b32+ 24, aliases+ 14}, /* 100 */
|
{12UL, b32 + 168, 0, P_BE | P_ACADEM, b32 + 203, b32 + 139, b32 + 24, aliases + 14}, /* 100 */
|
||||||
{ 8UL, b32+171, 0, P_BE | P_ACADEM, 0, b32+147, 0, aliases+143}, /* 101 */
|
{ 8UL, b32 + 171, 0, P_BE | P_ACADEM, 0, b32 + 147, 0, aliases + 143}, /* 101 */
|
||||||
{13UL, b32+181, 0, P_BE | P_ATTEST, 0, b32+ 45, 0, aliases+ 16}, /* 102 */
|
{13UL, b32 + 181, 0, P_BE | P_ATTEST, 0, b32 + 45, 0, aliases + 16}, /* 102 */
|
||||||
{12UL, b32+188, b32+203, P_BE | P_ACADEM, 0, b32+170, 0, aliases+ 12}, /* 103 */
|
{12UL, b32 + 188, b32 + 203, P_BE | P_ACADEM, 0, b32 + 170, 0, aliases + 12}, /* 103 */
|
||||||
{32UL, b32+190, b32+209, P_LE | P_ATTEST, b32+209, b32+ 23, b32+113, aliases+ 93}, /* 104 */
|
{32UL, b32 + 190, b32 + 209, P_LE | P_ATTEST, b32 + 209, b32 + 23, b32 + 113, aliases + 93}, /* 104 */
|
||||||
{10UL, b32+192, b32+202, P_BE | P_ACADEM, 0, b32+112, 0, aliases+ 5}, /* 105 */
|
{10UL, b32 + 192, b32 + 202, P_BE | P_ACADEM, 0, b32 + 112, 0, aliases + 5}, /* 105 */
|
||||||
{ 0UL, 0, 0, P_BE | P_UNDFCL, 0, 0, 0, NULL }, /* terminating entry */
|
{ 0UL, 0, 0, P_BE | P_UNDFCL, 0, 0, 0, NULL }, /* terminating entry */
|
||||||
};
|
};
|
||||||
# define NPRESETS 106
|
# define NPRESETS 106
|
||||||
|
|
||||||
/* List of names with pointers to models, pre-sorted for use with bsearch() */
|
/* List of names with pointers to models, pre-sorted for use with bsearch() */
|
||||||
static const struct malias aliases[] = {
|
static const struct malias aliases[] = {
|
||||||
{"ARC", models+ 69}, /* 0 */
|
{"ARC", models + 69}, /* 0 */
|
||||||
{"B-CRC-32", models + 6}, /* 1 */
|
{"B-CRC-32", models + 6}, /* 1 */
|
||||||
{"CKSUM", models + 4}, /* 2 */
|
{"CKSUM", models + 4}, /* 2 */
|
||||||
{"CRC-10", models+ 86}, /* 3 */
|
{"CRC-10", models + 86}, /* 3 */
|
||||||
{"CRC-10/ATM", models+ 86}, /* 4 */
|
{"CRC-10/ATM", models + 86}, /* 4 */
|
||||||
{"CRC-10/CDMA2000", models+105}, /* 5 */
|
{"CRC-10/CDMA2000", models + 105}, /* 5 */
|
||||||
{"CRC-10/GSM", models+ 56}, /* 6 */
|
{"CRC-10/GSM", models + 56}, /* 6 */
|
||||||
{"CRC-10/I-610", models+ 86}, /* 7 */
|
{"CRC-10/I-610", models + 86}, /* 7 */
|
||||||
{"CRC-11", models+ 64}, /* 8 */
|
{"CRC-11", models + 64}, /* 8 */
|
||||||
{"CRC-11/FLEXRAY", models+ 64}, /* 9 */
|
{"CRC-11/FLEXRAY", models + 64}, /* 9 */
|
||||||
{"CRC-11/UMTS", models+ 61}, /* 10 */
|
{"CRC-11/UMTS", models + 61}, /* 10 */
|
||||||
{"CRC-12/3GPP", models+ 78}, /* 11 */
|
{"CRC-12/3GPP", models + 78}, /* 11 */
|
||||||
{"CRC-12/CDMA2000", models+103}, /* 12 */
|
{"CRC-12/CDMA2000", models + 103}, /* 12 */
|
||||||
{"CRC-12/DECT", models+ 77}, /* 13 */
|
{"CRC-12/DECT", models + 77}, /* 13 */
|
||||||
{"CRC-12/GSM", models+100}, /* 14 */
|
{"CRC-12/GSM", models + 100}, /* 14 */
|
||||||
{"CRC-12/UMTS", models+ 78}, /* 15 */
|
{"CRC-12/UMTS", models + 78}, /* 15 */
|
||||||
{"CRC-13/BBC", models+102}, /* 16 */
|
{"CRC-13/BBC", models + 102}, /* 16 */
|
||||||
{"CRC-14/DARC", models+ 38}, /* 17 */
|
{"CRC-14/DARC", models + 38}, /* 17 */
|
||||||
{"CRC-14/GSM", models+ 75}, /* 18 */
|
{"CRC-14/GSM", models + 75}, /* 18 */
|
||||||
{"CRC-15", models+ 84}, /* 19 */
|
{"CRC-15", models + 84}, /* 19 */
|
||||||
{"CRC-15/CAN", models+ 84}, /* 20 */
|
{"CRC-15/CAN", models + 84}, /* 20 */
|
||||||
{"CRC-15/MPT1327", models+ 99}, /* 21 */
|
{"CRC-15/MPT1327", models + 99}, /* 21 */
|
||||||
{"CRC-16", models+ 69}, /* 22 */
|
{"CRC-16", models + 69}, /* 22 */
|
||||||
{"CRC-16/ACORN", models + 18}, /* 23 */
|
{"CRC-16/ACORN", models + 18}, /* 23 */
|
||||||
{"CRC-16/ARC", models+ 69}, /* 24 */
|
{"CRC-16/ARC", models + 69}, /* 24 */
|
||||||
{"CRC-16/AUG-CCITT", models + 21}, /* 25 */
|
{"CRC-16/AUG-CCITT", models + 21}, /* 25 */
|
||||||
{"CRC-16/AUTOSAR", models + 25}, /* 26 */
|
{"CRC-16/AUTOSAR", models + 25}, /* 26 */
|
||||||
{"CRC-16/BUYPASS", models+ 68}, /* 27 */
|
{"CRC-16/BUYPASS", models + 68}, /* 27 */
|
||||||
{"CRC-16/CCITT", models + 20}, /* 28 */
|
{"CRC-16/CCITT", models + 20}, /* 28 */
|
||||||
{"CRC-16/CCITT-FALSE", models + 25}, /* 29 */
|
{"CRC-16/CCITT-FALSE", models + 25}, /* 29 */
|
||||||
{"CRC-16/CCITT-TRUE", models + 20}, /* 30 */
|
{"CRC-16/CCITT-TRUE", models + 20}, /* 30 */
|
||||||
{"CRC-16/CDMA2000", models+ 98}, /* 31 */
|
{"CRC-16/CDMA2000", models + 98}, /* 31 */
|
||||||
{"CRC-16/CMS", models+ 72}, /* 32 */
|
{"CRC-16/CMS", models + 72}, /* 32 */
|
||||||
{"CRC-16/DARC", models + 26}, /* 33 */
|
{"CRC-16/DARC", models + 26}, /* 33 */
|
||||||
{"CRC-16/DDS-110", models+ 71}, /* 34 */
|
{"CRC-16/DDS-110", models + 71}, /* 34 */
|
||||||
{"CRC-16/DECT-R", models + 10}, /* 35 */
|
{"CRC-16/DECT-R", models + 10}, /* 35 */
|
||||||
{"CRC-16/DECT-X", models + 9}, /* 36 */
|
{"CRC-16/DECT-X", models + 9}, /* 36 */
|
||||||
{"CRC-16/DNP", models+ 49}, /* 37 */
|
{"CRC-16/DNP", models + 49}, /* 37 */
|
||||||
{"CRC-16/EN-13757", models+ 48}, /* 38 */
|
{"CRC-16/EN-13757", models + 48}, /* 38 */
|
||||||
{"CRC-16/EPC", models + 26}, /* 39 */
|
{"CRC-16/EPC", models + 26}, /* 39 */
|
||||||
{"CRC-16/EPC-C1G2", models + 26}, /* 40 */
|
{"CRC-16/EPC-C1G2", models + 26}, /* 40 */
|
||||||
{"CRC-16/GENIBUS", models + 26}, /* 41 */
|
{"CRC-16/GENIBUS", models + 26}, /* 41 */
|
||||||
|
@ -637,62 +637,62 @@ static const struct malias aliases[] = {
|
||||||
{"CRC-16/I-CODE", models + 26}, /* 43 */
|
{"CRC-16/I-CODE", models + 26}, /* 43 */
|
||||||
{"CRC-16/IBM-3740", models + 25}, /* 44 */
|
{"CRC-16/IBM-3740", models + 25}, /* 44 */
|
||||||
{"CRC-16/IBM-SDLC", models + 28}, /* 45 */
|
{"CRC-16/IBM-SDLC", models + 28}, /* 45 */
|
||||||
{"CRC-16/IEC-61158-2", models+ 36}, /* 46 */
|
{"CRC-16/IEC-61158-2", models + 36}, /* 46 */
|
||||||
{"CRC-16/ISO-HDLC", models + 28}, /* 47 */
|
{"CRC-16/ISO-HDLC", models + 28}, /* 47 */
|
||||||
{"CRC-16/ISO-IEC-14443-3-A", models + 24}, /* 48 */
|
{"CRC-16/ISO-IEC-14443-3-A", models + 24}, /* 48 */
|
||||||
{"CRC-16/ISO-IEC-14443-3-B", models + 28}, /* 49 */
|
{"CRC-16/ISO-IEC-14443-3-B", models + 28}, /* 49 */
|
||||||
{"CRC-16/KERMIT", models + 20}, /* 50 */
|
{"CRC-16/KERMIT", models + 20}, /* 50 */
|
||||||
{"CRC-16/LHA", models+ 69}, /* 51 */
|
{"CRC-16/LHA", models + 69}, /* 51 */
|
||||||
{"CRC-16/LJ1200", models+ 63}, /* 52 */
|
{"CRC-16/LJ1200", models + 63}, /* 52 */
|
||||||
{"CRC-16/LTE", models + 18}, /* 53 */
|
{"CRC-16/LTE", models + 18}, /* 53 */
|
||||||
{"CRC-16/MAXIM", models+ 70}, /* 54 */
|
{"CRC-16/MAXIM", models + 70}, /* 54 */
|
||||||
{"CRC-16/MAXIM-DOW", models+ 70}, /* 55 */
|
{"CRC-16/MAXIM-DOW", models + 70}, /* 55 */
|
||||||
{"CRC-16/MCRF4XX", models + 27}, /* 56 */
|
{"CRC-16/MCRF4XX", models + 27}, /* 56 */
|
||||||
{"CRC-16/MODBUS", models+ 73}, /* 57 */
|
{"CRC-16/MODBUS", models + 73}, /* 57 */
|
||||||
{"CRC-16/NRSC-5", models + 14}, /* 58 */
|
{"CRC-16/NRSC-5", models + 14}, /* 58 */
|
||||||
{"CRC-16/OPENSAFETY-A", models+ 55}, /* 59 */
|
{"CRC-16/OPENSAFETY-A", models + 55}, /* 59 */
|
||||||
{"CRC-16/OPENSAFETY-B", models+ 65}, /* 60 */
|
{"CRC-16/OPENSAFETY-B", models + 65}, /* 60 */
|
||||||
{"CRC-16/PROFIBUS", models+ 36}, /* 61 */
|
{"CRC-16/PROFIBUS", models + 36}, /* 61 */
|
||||||
{"CRC-16/RIELLO", models + 23}, /* 62 */
|
{"CRC-16/RIELLO", models + 23}, /* 62 */
|
||||||
{"CRC-16/SPI-FUJITSU", models + 21}, /* 63 */
|
{"CRC-16/SPI-FUJITSU", models + 21}, /* 63 */
|
||||||
{"CRC-16/T10-DIF", models+ 85}, /* 64 */
|
{"CRC-16/T10-DIF", models + 85}, /* 64 */
|
||||||
{"CRC-16/TELEDISK", models+ 92}, /* 65 */
|
{"CRC-16/TELEDISK", models + 92}, /* 65 */
|
||||||
{"CRC-16/TMS37157", models + 22}, /* 66 */
|
{"CRC-16/TMS37157", models + 22}, /* 66 */
|
||||||
{"CRC-16/UMTS", models+ 68}, /* 67 */
|
{"CRC-16/UMTS", models + 68}, /* 67 */
|
||||||
{"CRC-16/USB", models+ 74}, /* 68 */
|
{"CRC-16/USB", models + 74}, /* 68 */
|
||||||
{"CRC-16/V-41-LSB", models + 20}, /* 69 */
|
{"CRC-16/V-41-LSB", models + 20}, /* 69 */
|
||||||
{"CRC-16/V-41-MSB", models + 18}, /* 70 */
|
{"CRC-16/V-41-MSB", models + 18}, /* 70 */
|
||||||
{"CRC-16/VERIFONE", models+ 68}, /* 71 */
|
{"CRC-16/VERIFONE", models + 68}, /* 71 */
|
||||||
{"CRC-16/X-25", models + 28}, /* 72 */
|
{"CRC-16/X-25", models + 28}, /* 72 */
|
||||||
{"CRC-16/XMODEM", models + 18}, /* 73 */
|
{"CRC-16/XMODEM", models + 18}, /* 73 */
|
||||||
{"CRC-17/CAN-FD", models+ 96}, /* 74 */
|
{"CRC-17/CAN-FD", models + 96}, /* 74 */
|
||||||
{"CRC-21/CAN-FD", models+ 80}, /* 75 */
|
{"CRC-21/CAN-FD", models + 80}, /* 75 */
|
||||||
{"CRC-24", models+ 82}, /* 76 */
|
{"CRC-24", models + 82}, /* 76 */
|
||||||
{"CRC-24/BLE", models + 3}, /* 77 */
|
{"CRC-24/BLE", models + 3}, /* 77 */
|
||||||
{"CRC-24/FLEXRAY-A", models+ 58}, /* 78 */
|
{"CRC-24/FLEXRAY-A", models + 58}, /* 78 */
|
||||||
{"CRC-24/FLEXRAY-B", models+ 57}, /* 79 */
|
{"CRC-24/FLEXRAY-B", models + 57}, /* 79 */
|
||||||
{"CRC-24/INTERLAKEN", models+ 46}, /* 80 */
|
{"CRC-24/INTERLAKEN", models + 46}, /* 80 */
|
||||||
{"CRC-24/LTE-A", models+ 81}, /* 81 */
|
{"CRC-24/LTE-A", models + 81}, /* 81 */
|
||||||
{"CRC-24/LTE-B", models+ 66}, /* 82 */
|
{"CRC-24/LTE-B", models + 66}, /* 82 */
|
||||||
{"CRC-24/OPENPGP", models+ 82}, /* 83 */
|
{"CRC-24/OPENPGP", models + 82}, /* 83 */
|
||||||
{"CRC-24/OS-9", models+ 67}, /* 84 */
|
{"CRC-24/OS-9", models + 67}, /* 84 */
|
||||||
{"CRC-3/GSM", models+ 59}, /* 85 */
|
{"CRC-3/GSM", models + 59}, /* 85 */
|
||||||
{"CRC-3/ROHC", models+ 60}, /* 86 */
|
{"CRC-3/ROHC", models + 60}, /* 86 */
|
||||||
{"CRC-30/CDMA", models+ 76}, /* 87 */
|
{"CRC-30/CDMA", models + 76}, /* 87 */
|
||||||
{"CRC-31/PHILIPS", models + 15}, /* 88 */
|
{"CRC-31/PHILIPS", models + 15}, /* 88 */
|
||||||
{"CRC-32", models + 8}, /* 89 */
|
{"CRC-32", models + 8}, /* 89 */
|
||||||
{"CRC-32/AAL5", models + 6}, /* 90 */
|
{"CRC-32/AAL5", models + 6}, /* 90 */
|
||||||
{"CRC-32/ADCCP", models + 8}, /* 91 */
|
{"CRC-32/ADCCP", models + 8}, /* 91 */
|
||||||
{"CRC-32/AIXM", models+ 79}, /* 92 */
|
{"CRC-32/AIXM", models + 79}, /* 92 */
|
||||||
{"CRC-32/AUTOSAR", models+104}, /* 93 */
|
{"CRC-32/AUTOSAR", models + 104}, /* 93 */
|
||||||
{"CRC-32/BASE91-C", models+ 37}, /* 94 */
|
{"CRC-32/BASE91-C", models + 37}, /* 94 */
|
||||||
{"CRC-32/BASE91-D", models+ 95}, /* 95 */
|
{"CRC-32/BASE91-D", models + 95}, /* 95 */
|
||||||
{"CRC-32/BZIP2", models + 6}, /* 96 */
|
{"CRC-32/BZIP2", models + 6}, /* 96 */
|
||||||
{"CRC-32/CASTAGNOLI", models+ 37}, /* 97 */
|
{"CRC-32/CASTAGNOLI", models + 37}, /* 97 */
|
||||||
{"CRC-32/CKSUM", models + 4}, /* 98 */
|
{"CRC-32/CKSUM", models + 4}, /* 98 */
|
||||||
{"CRC-32/DECT-B", models + 6}, /* 99 */
|
{"CRC-32/DECT-B", models + 6}, /* 99 */
|
||||||
{"CRC-32/INTERLAKEN", models+ 37}, /* 100 */
|
{"CRC-32/INTERLAKEN", models + 37}, /* 100 */
|
||||||
{"CRC-32/ISCSI", models+ 37}, /* 101 */
|
{"CRC-32/ISCSI", models + 37}, /* 101 */
|
||||||
{"CRC-32/ISO-HDLC", models + 8}, /* 102 */
|
{"CRC-32/ISO-HDLC", models + 8}, /* 102 */
|
||||||
{"CRC-32/JAMCRC", models + 7}, /* 103 */
|
{"CRC-32/JAMCRC", models + 7}, /* 103 */
|
||||||
{"CRC-32/MPEG-2", models + 5}, /* 104 */
|
{"CRC-32/MPEG-2", models + 5}, /* 104 */
|
||||||
|
@ -700,76 +700,76 @@ static const struct malias aliases[] = {
|
||||||
{"CRC-32/V-42", models + 8}, /* 106 */
|
{"CRC-32/V-42", models + 8}, /* 106 */
|
||||||
{"CRC-32/XFER", models + 1}, /* 107 */
|
{"CRC-32/XFER", models + 1}, /* 107 */
|
||||||
{"CRC-32/XZ", models + 8}, /* 108 */
|
{"CRC-32/XZ", models + 8}, /* 108 */
|
||||||
{"CRC-32C", models+ 37}, /* 109 */
|
{"CRC-32C", models + 37}, /* 109 */
|
||||||
{"CRC-32D", models+ 95}, /* 110 */
|
{"CRC-32D", models + 95}, /* 110 */
|
||||||
{"CRC-32Q", models+ 79}, /* 111 */
|
{"CRC-32Q", models + 79}, /* 111 */
|
||||||
{"CRC-4/G-704", models+ 42}, /* 112 */
|
{"CRC-4/G-704", models + 42}, /* 112 */
|
||||||
{"CRC-4/INTERLAKEN", models+ 43}, /* 113 */
|
{"CRC-4/INTERLAKEN", models + 43}, /* 113 */
|
||||||
{"CRC-4/ITU", models+ 42}, /* 114 */
|
{"CRC-4/ITU", models + 42}, /* 114 */
|
||||||
{"CRC-40/GSM", models + 2}, /* 115 */
|
{"CRC-40/GSM", models + 2}, /* 115 */
|
||||||
{"CRC-5/EPC", models+ 53}, /* 116 */
|
{"CRC-5/EPC", models + 53}, /* 116 */
|
||||||
{"CRC-5/EPC-C1G2", models+ 53}, /* 117 */
|
{"CRC-5/EPC-C1G2", models + 53}, /* 117 */
|
||||||
{"CRC-5/G-704", models+ 94}, /* 118 */
|
{"CRC-5/G-704", models + 94}, /* 118 */
|
||||||
{"CRC-5/ITU", models+ 94}, /* 119 */
|
{"CRC-5/ITU", models + 94}, /* 119 */
|
||||||
{"CRC-5/USB", models+ 39}, /* 120 */
|
{"CRC-5/USB", models + 39}, /* 120 */
|
||||||
{"CRC-6/CDMA2000-A", models+ 90}, /* 121 */
|
{"CRC-6/CDMA2000-A", models + 90}, /* 121 */
|
||||||
{"CRC-6/CDMA2000-B", models + 30}, /* 122 */
|
{"CRC-6/CDMA2000-B", models + 30}, /* 122 */
|
||||||
{"CRC-6/DARC", models+ 62}, /* 123 */
|
{"CRC-6/DARC", models + 62}, /* 123 */
|
||||||
{"CRC-6/G-704", models + 16}, /* 124 */
|
{"CRC-6/G-704", models + 16}, /* 124 */
|
||||||
{"CRC-6/GSM", models+ 97}, /* 125 */
|
{"CRC-6/GSM", models + 97}, /* 125 */
|
||||||
{"CRC-6/ITU", models + 16}, /* 126 */
|
{"CRC-6/ITU", models + 16}, /* 126 */
|
||||||
{"CRC-64", models+ 50}, /* 127 */
|
{"CRC-64", models + 50}, /* 127 */
|
||||||
{"CRC-64/ECMA-182", models+ 50}, /* 128 */
|
{"CRC-64/ECMA-182", models + 50}, /* 128 */
|
||||||
{"CRC-64/GO-ECMA", models+ 52}, /* 129 */
|
{"CRC-64/GO-ECMA", models + 52}, /* 129 */
|
||||||
{"CRC-64/GO-ISO", models + 0}, /* 130 */
|
{"CRC-64/GO-ISO", models + 0}, /* 130 */
|
||||||
{"CRC-64/WE", models+ 51}, /* 131 */
|
{"CRC-64/WE", models + 51}, /* 131 */
|
||||||
{"CRC-64/XZ", models+ 52}, /* 132 */
|
{"CRC-64/XZ", models + 52}, /* 132 */
|
||||||
{"CRC-7", models + 29}, /* 133 */
|
{"CRC-7", models + 29}, /* 133 */
|
||||||
{"CRC-7/MMC", models + 29}, /* 134 */
|
{"CRC-7/MMC", models + 29}, /* 134 */
|
||||||
{"CRC-7/ROHC", models+ 91}, /* 135 */
|
{"CRC-7/ROHC", models + 91}, /* 135 */
|
||||||
{"CRC-7/UMTS", models+ 83}, /* 136 */
|
{"CRC-7/UMTS", models + 83}, /* 136 */
|
||||||
{"CRC-8", models + 11}, /* 137 */
|
{"CRC-8", models + 11}, /* 137 */
|
||||||
{"CRC-8/AES", models+ 35}, /* 138 */
|
{"CRC-8/AES", models + 35}, /* 138 */
|
||||||
{"CRC-8/AUTOSAR", models+ 41}, /* 139 */
|
{"CRC-8/AUTOSAR", models + 41}, /* 139 */
|
||||||
{"CRC-8/BLUETOOTH", models+ 93}, /* 140 */
|
{"CRC-8/BLUETOOTH", models + 93}, /* 140 */
|
||||||
{"CRC-8/CDMA2000", models+ 89}, /* 141 */
|
{"CRC-8/CDMA2000", models + 89}, /* 141 */
|
||||||
{"CRC-8/DARC", models+ 47}, /* 142 */
|
{"CRC-8/DARC", models + 47}, /* 142 */
|
||||||
{"CRC-8/DVB-S2", models+101}, /* 143 */
|
{"CRC-8/DVB-S2", models + 101}, /* 143 */
|
||||||
{"CRC-8/EBU", models+ 35}, /* 144 */
|
{"CRC-8/EBU", models + 35}, /* 144 */
|
||||||
{"CRC-8/GSM-A", models + 31}, /* 145 */
|
{"CRC-8/GSM-A", models + 31}, /* 145 */
|
||||||
{"CRC-8/GSM-B", models+ 54}, /* 146 */
|
{"CRC-8/GSM-B", models + 54}, /* 146 */
|
||||||
{"CRC-8/I-432-1", models + 12}, /* 147 */
|
{"CRC-8/I-432-1", models + 12}, /* 147 */
|
||||||
{"CRC-8/I-CODE", models+ 33}, /* 148 */
|
{"CRC-8/I-CODE", models + 33}, /* 148 */
|
||||||
{"CRC-8/ITU", models + 12}, /* 149 */
|
{"CRC-8/ITU", models + 12}, /* 149 */
|
||||||
{"CRC-8/LTE", models+ 87}, /* 150 */
|
{"CRC-8/LTE", models + 87}, /* 150 */
|
||||||
{"CRC-8/MAXIM", models+ 44}, /* 151 */
|
{"CRC-8/MAXIM", models + 44}, /* 151 */
|
||||||
{"CRC-8/MAXIM-DOW", models+ 44}, /* 152 */
|
{"CRC-8/MAXIM-DOW", models + 44}, /* 152 */
|
||||||
{"CRC-8/MIFARE-MAD", models+ 32}, /* 153 */
|
{"CRC-8/MIFARE-MAD", models + 32}, /* 153 */
|
||||||
{"CRC-8/NRSC-5", models+ 45}, /* 154 */
|
{"CRC-8/NRSC-5", models + 45}, /* 154 */
|
||||||
{"CRC-8/OPENSAFETY", models+ 40}, /* 155 */
|
{"CRC-8/OPENSAFETY", models + 40}, /* 155 */
|
||||||
{"CRC-8/ROHC", models+ 13}, /* 156 */
|
{"CRC-8/ROHC", models + 13}, /* 156 */
|
||||||
{"CRC-8/SAE-J1850", models+ 34}, /* 157 */
|
{"CRC-8/SAE-J1850", models + 34}, /* 157 */
|
||||||
{"CRC-8/SMBUS", models+ 11}, /* 158 */
|
{"CRC-8/SMBUS", models + 11}, /* 158 */
|
||||||
{"CRC-8/TECH-3250", models+ 35}, /* 159 */
|
{"CRC-8/TECH-3250", models + 35}, /* 159 */
|
||||||
{"CRC-8/WCDMA", models+ 88}, /* 160 */
|
{"CRC-8/WCDMA", models + 88}, /* 160 */
|
||||||
{"CRC-82/DARC", models+ 17}, /* 161 */
|
{"CRC-82/DARC", models + 17}, /* 161 */
|
||||||
{"CRC-A", models+ 24}, /* 162 */
|
{"CRC-A", models + 24}, /* 162 */
|
||||||
{"CRC-B", models+ 28}, /* 163 */
|
{"CRC-B", models + 28}, /* 163 */
|
||||||
{"CRC-CCITT", models+ 20}, /* 164 */
|
{"CRC-CCITT", models + 20}, /* 164 */
|
||||||
{"CRC-IBM", models+ 69}, /* 165 */
|
{"CRC-IBM", models + 69}, /* 165 */
|
||||||
{"DOW-CRC", models+ 44}, /* 166 */
|
{"DOW-CRC", models + 44}, /* 166 */
|
||||||
{"JAMCRC", models+ 7}, /* 167 */
|
{"JAMCRC", models + 7}, /* 167 */
|
||||||
{"KERMIT", models+ 20}, /* 168 */
|
{"KERMIT", models + 20}, /* 168 */
|
||||||
{"MODBUS", models+ 73}, /* 169 */
|
{"MODBUS", models + 73}, /* 169 */
|
||||||
{"PKZIP", models+ 8}, /* 170 */
|
{"PKZIP", models + 8}, /* 170 */
|
||||||
{"R-CRC-16", models+ 10}, /* 171 */
|
{"R-CRC-16", models + 10}, /* 171 */
|
||||||
{"X-25", models+ 28}, /* 172 */
|
{"X-25", models + 28}, /* 172 */
|
||||||
{"X-CRC-12", models+ 77}, /* 173 */
|
{"X-CRC-12", models + 77}, /* 173 */
|
||||||
{"X-CRC-16", models+ 9}, /* 174 */
|
{"X-CRC-16", models + 9}, /* 174 */
|
||||||
{"XFER", models+ 1}, /* 175 */
|
{"XFER", models + 1}, /* 175 */
|
||||||
{"XMODEM", models+ 18}, /* 176 */
|
{"XMODEM", models + 18}, /* 176 */
|
||||||
{"ZMODEM", models+ 18}, /* 177 */
|
{"ZMODEM", models + 18}, /* 177 */
|
||||||
{NULL, NULL }, /* terminating entry */
|
{NULL, NULL}, /* terminating entry */
|
||||||
};
|
};
|
||||||
# define NALIASES 178
|
# define NALIASES 178
|
||||||
|
|
||||||
|
|
|
@ -70,7 +70,7 @@ static int l_GetFromBigBuf(lua_State *L) {
|
||||||
len = luaL_checknumber(L, 2);
|
len = luaL_checknumber(L, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( len == 0 ) {
|
if (len == 0) {
|
||||||
//signal error by returning Nil, errorstring
|
//signal error by returning Nil, errorstring
|
||||||
lua_pushnil(L);
|
lua_pushnil(L);
|
||||||
lua_pushstring(L, "You need to supply number of bytes larger than zero");
|
lua_pushstring(L, "You need to supply number of bytes larger than zero");
|
||||||
|
@ -126,7 +126,7 @@ static int l_GetFromFlashMem(lua_State *L) {
|
||||||
len = luaL_checknumber(L, 2);
|
len = luaL_checknumber(L, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( len == 0 ) {
|
if (len == 0) {
|
||||||
//signal error by returning Nil, errorstring
|
//signal error by returning Nil, errorstring
|
||||||
lua_pushnil(L);
|
lua_pushnil(L);
|
||||||
lua_pushstring(L, "You need to supply number of bytes larger than zero");
|
lua_pushstring(L, "You need to supply number of bytes larger than zero");
|
||||||
|
|
|
@ -519,12 +519,12 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
|
||||||
}
|
}
|
||||||
|
|
||||||
int foo = getClosestClock(minClk);
|
int foo = getClosestClock(minClk);
|
||||||
if (foo > 0 ) {
|
if (foo > 0) {
|
||||||
for (uint8_t i = 0; i < 10; i++) {
|
for (uint8_t i = 0; i < 10; i++) {
|
||||||
if ( tmpclk[i][0] == foo ) {
|
if (tmpclk[i][0] == foo) {
|
||||||
tmpclk[i][1]++;
|
tmpclk[i][1]++;
|
||||||
|
|
||||||
if ( tmpclk[i][2] == 0) {
|
if (tmpclk[i][2] == 0) {
|
||||||
tmpclk[i][2] = shortestWaveIdx;
|
tmpclk[i][2] = shortestWaveIdx;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -543,7 +543,7 @@ int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clo
|
||||||
, tmpclk[i][2]
|
, tmpclk[i][2]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if ( max < tmpclk[i][1] ) {
|
if (max < tmpclk[i][1]) {
|
||||||
*clock = tmpclk[i][0];
|
*clock = tmpclk[i][0];
|
||||||
shortestWaveIdx = tmpclk[i][2];
|
shortestWaveIdx = tmpclk[i][2];
|
||||||
max = tmpclk[i][1];
|
max = tmpclk[i][1];
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue