X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/ea1c1ca6f88c4e9b1bcb75cd703f6be81df9b95c..62dc7d4a6f72effa3ad22fadbd5c199f496e9471:/client/cmdanalyse.c

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 32309c1c..3cb1eb71 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -75,7 +75,7 @@ static uint8_t calculateLRC( uint8_t* bytes, uint8_t len) {
     return LRC;
 }
 
-static uint8_t calcSumCrumbAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
+static uint16_t calcSumCrumbAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
     uint8_t sum = 0;
     for (uint8_t i = 0; i < len; i++) {
         sum += CRUMB(bytes[i], 0);
@@ -86,10 +86,10 @@ static uint8_t calcSumCrumbAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
 	sum &= mask;	
     return sum;
 }
-static uint8_t calcSumCrumbAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask) {
+static uint16_t calcSumCrumbAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask) {
 	return ~calcSumCrumbAdd(bytes, len, mask);
 }
-static uint8_t calcSumNibbleAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
+static uint16_t calcSumNibbleAdd( 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]);
@@ -98,27 +98,37 @@ static uint8_t calcSumNibbleAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
 	sum &= mask;	
     return sum;
 }
-static uint8_t calcSumNibbleAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask){
+static uint16_t calcSumNibbleAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask){
 	return ~calcSumNibbleAdd(bytes, len, mask);
 }
-static uint8_t calcSumNibbleXor( uint8_t* bytes, uint8_t len, uint32_t mask) {
+static uint16_t calcSumCrumbXor(  uint8_t* bytes, uint8_t len, uint32_t mask) {
+    uint8_t sum = 0;
+    for (uint8_t i = 0; i < len; i++) {
+        sum ^= CRUMB(bytes[i], 0);
+		sum ^= CRUMB(bytes[i], 2);
+		sum ^= CRUMB(bytes[i], 4);
+		sum ^= CRUMB(bytes[i], 6);
+	}	
+	sum &= mask;
+    return sum;
+}
+static uint16_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;	
+	sum &= mask;
     return sum;
 }
-static uint8_t calcSumByteXor( uint8_t* bytes, uint8_t len, uint32_t mask) {
+static uint16_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 uint16_t calcSumByteAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
     uint8_t sum = 0;
     for (uint8_t i = 0; i < len; i++)
         sum += bytes[i];
@@ -126,23 +136,21 @@ static uint8_t calcSumByteAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
     return sum;
 }
 // Ones complement
-static uint8_t calcSumByteAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask) {
+static uint16_t calcSumByteAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask) {
 	return ~calcSumByteAdd(bytes, len, mask);
 }
 
-
-
-static uint8_t calcSumByteSub( uint8_t* bytes, uint8_t len, uint32_t mask) {
+static uint16_t calcSumByteSub( 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 calcSumByteSubOnes( uint8_t* bytes, uint8_t len, uint32_t mask){
+static uint16_t calcSumByteSubOnes( uint8_t* bytes, uint8_t len, uint32_t mask){
 	return ~calcSumByteSub(bytes, len, mask);
 }
-static uint8_t calcSumNibbleSub( uint8_t* bytes, uint8_t len, uint32_t mask) {
+static uint16_t calcSumNibbleSub( 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]);
@@ -151,10 +159,38 @@ static uint8_t calcSumNibbleSub( uint8_t* bytes, uint8_t len, uint32_t mask) {
 	sum &= mask;	
     return sum;
 }
-static uint8_t calcSumNibbleSubOnes( uint8_t* bytes, uint8_t len, uint32_t mask) {
+static uint16_t calcSumNibbleSubOnes( uint8_t* bytes, uint8_t len, uint32_t mask) {
 	return ~calcSumNibbleSub(bytes, len, mask);
 }
 
+// BSD shift checksum 8bit version
+static uint16_t calcBSDchecksum8( uint8_t* bytes, uint8_t len, uint32_t mask){
+	uint16_t sum = 0;
+	for(uint8_t i = 0; i < len; i++){
+		sum = ((sum & 0xFF) >> 1) | ((sum & 0x1) << 7);   // rotate accumulator
+		sum += bytes[i];  // add next byte
+		sum &= 0xFF;  // 
+	}
+	sum &= mask;
+	return sum;
+}
+// BSD shift checksum 4bit version
+static uint16_t calcBSDchecksum4( uint8_t* bytes, uint8_t len, uint32_t mask){
+	uint16_t sum = 0;
+	for(uint8_t i = 0; i < len; i++){
+		sum = ((sum & 0xF) >> 1) | ((sum & 0x1) << 3);   // rotate accumulator
+		sum += NIBBLE_HIGH(bytes[i]);  // add high nibble
+		sum &= 0xF;  // 
+		sum = ((sum & 0xF) >> 1) | ((sum & 0x1) << 3);   // rotate accumulator
+		sum += NIBBLE_LOW(bytes[i]);  // add low nibble
+		sum &= 0xF;  // 
+	}
+	sum &= mask;
+	return sum;
+}
+
+
+
 // measuring LFSR maximum length
 int CmdAnalyseLfsr(const char *Cmd){
 
@@ -248,8 +284,9 @@ int CmdAnalyseCHKSUM(const char *Cmd){
 	
 	uint8_t data[50];
 	uint8_t cmdp = 0;
-	uint32_t mask = 0xFF;
+	uint32_t mask = 0xFFFF;
 	bool errors = false;
+	bool useHeader = false;
 	int len = 0;
 	memset(data, 0x0, sizeof(data));
 	
@@ -267,6 +304,11 @@ int CmdAnalyseCHKSUM(const char *Cmd){
 			mask = param_get32ex(Cmd, cmdp+1, 0, 16);
 			cmdp += 2;
 			break;
+		case 'v':
+		case 'V':
+			useHeader = true;
+			cmdp++;
+			break;
 		case 'h':
 		case 'H':
 			return usage_analyse_checksum();
@@ -280,25 +322,28 @@ int CmdAnalyseCHKSUM(const char *Cmd){
 	//Validations
 	if(errors) return usage_analyse_checksum();
 	
-	PrintAndLog("\nByte Add        | 0x%X", calcSumByteAdd(data, len, mask));
-	PrintAndLog("Nibble Add      | 0x%X", calcSumNibbleAdd(data, len, mask));
-	PrintAndLog("Crumb Add       | 0x%X", calcSumCrumbAdd(data, len, mask));
-	
-	PrintAndLog("\nByte Subtract   | 0x%X", calcSumByteSub(data, len, mask));
-	PrintAndLog("Nibble Subtract | 0x%X", calcSumNibbleSub(data, len, mask));
-	
-	PrintAndLog("\nCHECKSUM - One's complement");
-	PrintAndLog("Byte Add        | 0x%X", calcSumByteAddOnes(data, len, mask));
-	PrintAndLog("Nibble Add      | 0x%X", calcSumNibbleAddOnes(data, len, mask));
-	PrintAndLog("Crumb Add       | 0x%X", calcSumCrumbAddOnes(data, len, mask));
-
-	PrintAndLog("Byte Subtract   | 0x%X", calcSumByteSubOnes(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));
-	
+	if (useHeader) {
+		PrintAndLog("     add          | sub         | add 1's compl    | sub 1's compl   | xor");
+		PrintAndLog("byte nibble crumb | byte nibble | byte nibble cumb | byte nibble     | byte nibble cumb |  BSD");
+		PrintAndLog("------------------+-------------+------------------+-----------------+--------------------");
+	}
+	PrintAndLog("0x%X 0x%X   0x%X  | 0x%X 0x%X   | 0x%X 0x%X   0x%X | 0x%X 0x%X       | 0x%X 0x%X   0x%X  | 0x%X  0x%X\n",	
+				  calcSumByteAdd(data, len, mask)
+				, calcSumNibbleAdd(data, len, mask)
+				, calcSumCrumbAdd(data, len, mask)
+				, calcSumByteSub(data, len, mask)
+				, calcSumNibbleSub(data, len, mask)
+				, calcSumByteAddOnes(data, len, mask)
+				, calcSumNibbleAddOnes(data, len, mask)
+				, calcSumCrumbAddOnes(data, len, mask)
+				, calcSumByteSubOnes(data, len, mask)
+				, calcSumNibbleSubOnes(data, len, mask)
+				, calcSumByteXor(data, len, mask)
+				, calcSumNibbleXor(data, len, mask)
+				, calcSumCrumbXor(data, len, mask)
+				, calcBSDchecksum8(data, len, mask)
+				, calcBSDchecksum4(data, len, mask)				
+			);	
 	return 0;
 }