github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-24 15:15:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

lf nexwatch with psk2

Browse source
This commit is contained in:
rioux 2021-06-25 12:00:29 +02:00
commit e33f2a76aa
3 changed files with 20 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

87
client/src/cmdlfnexwatch.c
View file

@ -279,90 +279,12 @@ static int CmdNexWatchReader(const char *Cmd) {
}
do {
lf_read(true, 20000);
lf_read(false, 20000);
demodNexWatch(!cm);
} while (cm && !kbd_enter_pressed());
return PM3_SUCCESS;
}
//TOCHANGE
static unsigned int bin2int(unsigned char *b, int size) {
unsigned int val = 0;
for (int i = 0; i < size; i++) {
if (b[i] == '1') {
val += pow(2, size - 1 - i);
}
}
return val;
}
static uint8_t xor_parity(uint8_t *stream_, int bit_number) {
uint8_t parity_res = '0';
for (int i = bit_number - 1; i < 36; i += 4) {
if (stream_[i] == parity_res) {
parity_res = '0';
} else {
parity_res = '1';
}
}
return parity_res;
}
static uint8_t *parity(uint8_t *stream_) {
uint8_t *parity_res = malloc(4 * sizeof(uint8_t));
parity_res[0] = xor_parity(stream_, 4);
parity_res[1] = xor_parity(stream_, 2);
parity_res[2] = xor_parity(stream_, 3);
parity_res[3] = xor_parity(stream_, 1);
return parity_res;
}
static uint8_t *convertUint8toByte(uint8_t number) {
uint8_t *res = malloc(8 * sizeof(char));
uint8_t temp = number;
for (int i = 1; i < 9; i++) {
if (temp % 2) {
res[8 - i] = '1';
} else {
res[8 - i] = '0';
}
temp = temp / 2;
}
return res;
}
static uint8_t *convertUint32toByte(uint32_t number) {
uint8_t *res = malloc(32 * sizeof(char));
uint32_t temp = number;
for (int i = 0; i < 32; i++) {
res[i] = '0';
}
for (int i = 1; i < 33; i++) {
if (temp % 2) {
res[32 - i] = '1';
} else {
res[32 - i] = '0';
}
temp = temp / 2;
}
return res;
}
static void TOpsk2(uint8_t *bits, size_t size) {
uint8_t lastbit = '0';
for (size_t i = 1; i < size; i++) {
//ignore errors
if (bits[i] == 7) continue;
if (lastbit != bits[i]) {
lastbit = bits[i];
bits[i] = '1';
} else {
bits[i] = '0';
}
}
}
//ENDTOCHANGE
static int CmdNexWatchClone(const char *Cmd) {
CLIParserContext *ctx;
CLIParserInit(&ctx, "lf nexwatch clone",
@ -491,7 +413,12 @@ static int CmdNexWatchClone(const char *Cmd) {
if (use_psk2) {
blocks[0] = 270464;
psk1TOpsk2(raw, 12);
uint8_t * res_shifted = malloc(96 * sizeof(uint8_t));
uint8_t * res = byte_to_bytebits(raw, 12);
psk1TOpsk2(res, 96);
memcpy(res_shifted, &res[1], 95 * sizeof(uint8_t));
res_shifted[95] = 0;
bits_to_array(res_shifted, 96, raw);
}

11
common/lfdemod.c
View file

@ -295,6 +295,17 @@ int bits_to_array(const uint8_t *bits, size_t size, uint8_t *dest) {
return PM3_SUCCESS;
}
// Ex: 0x56 and numbytes = 1 ==> return res = {0,1,0,1,0,1,1,0}
uint8_t * byte_to_bytebits(uint8_t * bits, size_t numbytes){
uint8_t * result = malloc(numbytes * 8 * (sizeof(uint8_t)));
for(int i=0;i<numbytes;i++){
for(int j=0;j<8;j++){
result[j + i*8] = ((bits[i] & 1<<(7-j))!=0);
}
}
return result;
}
uint32_t bytebits_to_byte(uint8_t *src, size_t numbits) {
uint32_t num = 0;
for (int i = 0 ; i < numbits ; i++) {

2
common/lfdemod.h
View file

@ -48,6 +48,7 @@ int BiphaseRawDecode(uint8_t *bits, size_t *size, int *offset, int invert);
int bits_to_array(const uint8_t *bits, size_t size, uint8_t *dest);
uint32_t bytebits_to_byte(uint8_t *src, size_t numbits);
uint32_t bytebits_to_byteLSBF(uint8_t *src, size_t numbits);
uint8_t * byte_to_bytebits(uint8_t * bits, size_t numbits);
uint16_t countFC(uint8_t *bits, size_t size, bool fskAdj);
int DetectASKClock(uint8_t *dest, size_t size, int *clock, int maxErr);
bool DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low);
@ -80,4 +81,5 @@ int Em410xDecode(uint8_t *bits, size_t *size, size_t *start_idx, uint32_t *hi, u
int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx);
int detectIOProx(uint8_t *dest, size_t *size, int *waveStartIdx);
#endif