X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/53b3c3e816c8a322a15d2b20652d6126baa6644a..d8b7a5f29453ba32c9486b97e5afc8fb5e3cba34:/client/cmdanalyse.c

diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index b5f9cb52..0ab2463d 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -70,7 +70,7 @@ static uint8_t calcSumCrumbAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
 		sum += CRUMB(bytes[i], 4);
 		sum += CRUMB(bytes[i], 6);
 	}
-	sum ^= mask;	
+	sum &= mask;	
     return sum;
 }
 static uint8_t calcSumCrumbAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask) {
@@ -82,7 +82,7 @@ static uint8_t calcSumNibbleAdd( uint8_t* bytes, uint8_t len, uint32_t mask) {
         sum += NIBBLE_LOW(bytes[i]);
 		sum += NIBBLE_HIGH(bytes[i]);
 	}
-	sum ^= mask;	
+	sum &= mask;	
     return sum;
 }
 static uint8_t calcSumNibbleAddOnes( uint8_t* bytes, uint8_t len, uint32_t mask){
@@ -93,7 +93,7 @@ static uint8_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];
-	sum ^= mask;	
+	sum &= mask;	
     return sum;
 }
 // Ones complement
@@ -105,7 +105,7 @@ 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++)
         sum -= bytes[i];
-	sum ^= mask;	
+	sum &= mask;	
     return sum;
 }
 static uint8_t calcSumByteSubOnes( uint8_t* bytes, uint8_t len, uint32_t mask){
@@ -117,7 +117,7 @@ static uint8_t calcSumNibbleSub( uint8_t* bytes, uint8_t len, uint32_t mask) {
         sum -= NIBBLE_LOW(bytes[i]);
 		sum -= NIBBLE_HIGH(bytes[i]);
 	}
-	sum ^= mask;	
+	sum &= mask;	
     return sum;
 }
 static uint8_t calcSumNibbleSubOnes( uint8_t* bytes, uint8_t len, uint32_t mask) {
@@ -155,8 +155,7 @@ int CmdAnalyseCRC(const char *Cmd) {
 	}
 	len >>= 1;	
 
-	PrintAndLog("\nTests with '%s' hex bytes", sprint_hex(data, len));
-	PrintAndLog("   JA: CRC8: %X  (0x6C expected)", CRC8ja(data, len) );
+	//PrintAndLog("\nTests with '%s' hex bytes", sprint_hex(data, len));
 	
 	PrintAndLog("\nTests of reflection. Two current methods in source code");	
 	PrintAndLog("   reflect(0x3e23L,3) is %04X == 0x3e26", reflect(0x3e23L,3) );
@@ -170,7 +169,6 @@ int CmdAnalyseCRC(const char *Cmd) {
 	uint8_t dataStr[] = { 0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39 };
 	uint8_t legic8 = CRC8Legic(dataStr, sizeof(dataStr));
 	
-	PrintAndLog("JA: CRC8 : %X (0x28 expected)", CRC8ja(dataStr, sizeof(dataStr)) );
 	PrintAndLog("LEGIC: CRC16: %X", CRC16Legic(dataStr, sizeof(dataStr), legic8));
 
 	//these below has been tested OK.
@@ -178,7 +176,16 @@ int CmdAnalyseCRC(const char *Cmd) {
 	PrintAndLog("LEGIC: CRC8 : %X (0xC6 expected)", legic8);
 	PrintAndLog("MAXIM: CRC8 : %X (0xA1 expected)", CRC8Maxim(dataStr, sizeof(dataStr)));
 	PrintAndLog("DNP  : CRC16: %X (0x82EA expected)", CRC16_DNP(dataStr, sizeof(dataStr)));	
-	PrintAndLog("CCITT: CRC16: %X (0xE5CC expected)", CRC16_CCITT(dataStr, sizeof(dataStr)));	
+	PrintAndLog("CCITT: CRC16: %X (0xE5CC expected)", CRC16_CCITT(dataStr, sizeof(dataStr)));
+
+	PrintAndLog("ICLASS org: CRC16: %X (0x expected)",iclass_crc16( (char*)dataStr, sizeof(dataStr)));
+	PrintAndLog("ICLASS ice: CRC16: %X (0x expected)",CRC16_ICLASS(dataStr, sizeof(dataStr)));
+
+
+
+	uint8_t dataStr1234[] = { 0x1,0x2,0x3,0x4};
+	PrintAndLog("ISO15693 org:  : CRC16: %X (0xF0B8 expected)", Iso15693Crc(dataStr1234, sizeof(dataStr1234)));
+	PrintAndLog("ISO15693 ice:  : CRC16: %X (0xF0B8 expected)", CRC16_Iso15693(dataStr1234, sizeof(dataStr1234)));
 
 	free(data);
 	return 0;
@@ -190,6 +197,7 @@ int CmdAnalyseCHKSUM(const char *Cmd){
 	uint32_t mask = 0xFF;
 	bool errors = false;
 	int len = 0;
+	memset(data, 0x0, sizeof(data));
 	
 	while(param_getchar(Cmd, cmdp) != 0x00) {
 		switch(param_getchar(Cmd, cmdp)) {