X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/09bb01c73d4a5828ba5a94e2a01a7d3b6645e6ef..ed55e9aec4739dcc8d477a2363abd0fb2d5d7241:/client/cmdanalyse.c?ds=inline

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index 0d6072cb..36ef3aa7 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -101,6 +101,33 @@ 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){
 	return ~calcSumNibbleAdd(bytes, len, mask);
 }
+static uint8_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 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) {
     uint8_t sum = 0;
@@ -114,6 +141,8 @@ static uint8_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) {
     uint8_t sum = 0;
     for (uint8_t i = 0; i < len; i++)
@@ -230,7 +259,7 @@ int CmdAnalyseCHKSUM(const char *Cmd){
 	
 	uint8_t data[50];
 	uint8_t cmdp = 0;
-	uint32_t mask = 0xFF;
+	uint32_t mask = 0xFFFF;
 	bool errors = false;
 	int len = 0;
 	memset(data, 0x0, sizeof(data));
@@ -262,21 +291,24 @@ 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("     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");
+	PrintAndLog("------------------+-------------+------------------+-----------------+--------------------");
+	PrintAndLog("0x%02X 0x%02X   0x%02X  | 0x%02X 0x%02X   | 0x%02X 0x%02X   0x%02X | 0x%02X 0x%02X       | 0x%02X 0x%02X   0x%02X",
+				  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)
+			);	
 	return 0;
 }
 
@@ -423,6 +455,9 @@ static void generate(uint8_t *data, uint8_t len) {
 }
 int CmdAnalyseHid(const char *Cmd){
 
+	uint8_t key[8] = {0};	
+	uint8_t key_std_format[8] = {0};
+	uint8_t key_iclass_format[8] = {0};
 	uint8_t data[16] = {0};
 	bool isReverse = FALSE;
 	int len = 0;
@@ -435,12 +470,20 @@ int CmdAnalyseHid(const char *Cmd){
 	param_gethex_ex(Cmd, 1, data, &len);
 	if ( len%2 ) return usage_analyse_hid();
 	
-	len >>= 1;
-	
-	if ( isReverse )
+	len >>= 1;	
+
+	memcpy(key, data, 8);
+
+	if ( isReverse ) {
 		generate_rev(data, len);
-	else 
+		permutekey_rev(key, key_std_format);
+		printf(" holiman iclass key | %s \n", sprint_hex(key_std_format, 8));
+	}
+	else {
 		generate(data, len);
+		permutekey(key, key_iclass_format);		
+		printf(" holiman std key | %s \n", sprint_hex(key_iclass_format, 8));
+	}
 	return 0;
 }