dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ADD: 'analyse chksum' added a nibble xor calc - calcSumNibbleXor

Browse Source
This commit is contained in:
iceman1001
2016-12-16 12:05:38 +01:00
parent c08c796e8d
commit 32da0a464e
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
client/cmdanalyse.c
View File

@@ -101,6 +101,22 @@ static uint8_t calcSumNibbleAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
static uint8_t calcSumNibbleAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask){ static uint8_t calcSumNibbleAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask){
return ~calcSumNibbleAdd(bytes, len, mask); return ~calcSumNibbleAdd(bytes, len, mask);
} }
static uint8_t calcSumNibbleXor( uint8_t* bytes, uint8_t len, uint32_t mask) {
uint8_t sum = 0;
for (uint8_t i = 0; i < len; i++) {
sum ^= NIBBLE_LOW(bytes[i]);
sum ^= NIBBLE_HIGH(bytes[i]);
}
sum &= mask;
return sum;
}
static uint8_t calcSumByteXor( uint8_t* bytes, uint8_t len, uint32_t mask) {
uint8_t sum = 0;
for (uint8_t i = 0; i < len; i++)
sum ^= bytes[i];
sum &= mask;
return sum;
}
static uint8_t calcSumByteAdd( uint8_t* bytes, uint8_t len, uint32_t mask) { static uint8_t calcSumByteAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
uint8_t sum = 0; uint8_t sum = 0;
@@ -114,6 +130,8 @@ static uint8_t calcSumByteAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask) {
return ~calcSumByteAdd(bytes, len, mask); return ~calcSumByteAdd(bytes, len, mask);
} }
static uint8_t calcSumByteSub( uint8_t* bytes, uint8_t len, uint32_t mask) { static uint8_t calcSumByteSub( uint8_t* bytes, uint8_t len, uint32_t mask) {
uint8_t sum = 0; uint8_t sum = 0;
for (uint8_t i = 0; i < len; i++) for (uint8_t i = 0; i < len; i++)
@@ -277,6 +295,10 @@ int CmdAnalyseCHKSUM(const char *Cmd){
PrintAndLog("Byte Subtract | 0x%X", calcSumByteSubOnes(data, len, mask)); PrintAndLog("Byte Subtract | 0x%X", calcSumByteSubOnes(data, len, mask));
PrintAndLog("Nibble Subtract | 0x%X", calcSumNibbleSubOnes(data, len, mask)); PrintAndLog("Nibble Subtract | 0x%X", calcSumNibbleSubOnes(data, len, mask));
PrintAndLog("\nXOR");
PrintAndLog("Byte Xor | 0x%X", calcSumByteXor(data, len, mask));
PrintAndLog("Nibble Xor | 0x%X", calcSumNibbleXor(data, len, mask));
return 0; return 0;
} }