]> git.zerfleddert.de Git - proxmark3-svn/commitdiff
FIX: @marshmellow found out that the CRC-8/Maxim was not always giving the right...
authoriceman1001 <iceman@iuse.se>
Thu, 12 Mar 2015 19:33:36 +0000 (20:33 +0100)
committericeman1001 <iceman@iuse.se>
Thu, 12 Mar 2015 19:33:36 +0000 (20:33 +0100)
common/crc.c
common/crc.h

index 153ff11c235d50ecaf8f60de04654986e25c887a..1bd0cefe07df1cb1bd32a391846a5a8e5865d69c 100644 (file)
@@ -42,14 +42,12 @@ uint32_t crc_finish(crc_t *crc)
        return ( crc->state ^ crc->final_xor ) & crc->mask;
 }
 
-int CRC8Maxim(uint8_t *buff, size_t size  ) {
+uint32_t CRC8Maxim(uint8_t *buff, size_t size) {
        
        crc_t crc;
-       crc_init(&crc, 8, 0x31, 0x00, 0x00);
-       crc_clear(&crc);
-
-       for ( int i=0; i < size; ++i){
+       crc_init(&crc, 9, 0x8c, 0x00, 0x00);
+       for ( uint8_t i = 0; i < size; ++i){
                crc_update(&crc, buff[i], 8);
        }
        return crc_finish(&crc);
-}
+}
\ No newline at end of file
index eb91196bdf7beb944ca9b540981fcf8685fc8b23..8c152fa2b6141e971be5b3089d319c57c4b70a54 100644 (file)
@@ -38,7 +38,7 @@ extern void crc_clear(crc_t *crc);
 extern uint32_t crc_finish(crc_t *crc);
 
 // Calculate CRC-8/Maxim checksum
-int CRC8Maxim(uint8_t *buff, size_t size  );
+uint32_t CRC8Maxim(uint8_t *buff, size_t size  );
 
 /* Static initialization of a crc structure */
 #define CRC_INITIALIZER(_order, _polynom, _initial_value, _final_xor) { \
Impressum, Datenschutz