From 4002cca0106765b5d853c09b19d16ebee6074a13 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Wed, 22 Sep 2021 01:27:28 +0100 Subject: [PATCH] Reformat. --- .clang-format | 7 +++++-- adler32.h | 11 ++++++----- crc16.c | 1 - crc16.h | 49 +++++++++++++++++++++++-------------------------- crc16_ccitt.c | 1 - crc16_ccitt.h | 49 +++++++++++++++++++++++-------------------------- crc32.c | 1 - crc32.h | 6 +++--- crc64.c | 1 - crc64.h | 6 +++--- fletcher16.c | 1 - fletcher16.h | 11 ++++++----- fletcher32.c | 1 - fletcher32.h | 11 ++++++----- library.h | 26 +++++++++++++------------- spamsum.c | 32 +++++++++++++++----------------- spamsum.h | 45 ++++++++++++++++++++++----------------------- 17 files changed, 125 insertions(+), 134 deletions(-) diff --git a/.clang-format b/.clang-format index b33cb50..c567052 100644 --- a/.clang-format +++ b/.clang-format @@ -70,9 +70,12 @@ IncludeCategories: - Regex: '^("(win32|windows))' Priority: 1 SortPriority: -1 + - Regex: '^("library.h")' + Priority: 0 + SortPriority: -1 - Regex: '.*' - Priority: 1 - SortPriority: 1 + Priority: 0 + SortPriority: 0 IncludeIsMainRegex: '(Test)?$' IndentCaseLabels: true IndentPPDirectives: None diff --git a/adler32.h b/adler32.h index ca595c6..0761340 100644 --- a/adler32.h +++ b/adler32.h @@ -21,14 +21,15 @@ #define ADLER_MODULE 65521 -typedef struct { +typedef struct +{ uint16_t sum1; uint16_t sum2; } adler32_ctx; AARU_EXPORT adler32_ctx* AARU_CALL adler32_init(); -AARU_EXPORT int AARU_CALL adler32_update(adler32_ctx* ctx, const uint8_t* data, uint32_t len); -AARU_EXPORT int AARU_CALL adler32_final(adler32_ctx* ctx, uint32_t* checksum); -AARU_EXPORT void AARU_CALL adler32_free(adler32_ctx* ctx); +AARU_EXPORT int AARU_CALL adler32_update(adler32_ctx* ctx, const uint8_t* data, uint32_t len); +AARU_EXPORT int AARU_CALL adler32_final(adler32_ctx* ctx, uint32_t* checksum); +AARU_EXPORT void AARU_CALL adler32_free(adler32_ctx* ctx); -#endif //AARU_CHECKSUMS_NATIVE_ADLER32_H +#endif // AARU_CHECKSUMS_NATIVE_ADLER32_H diff --git a/crc16.c b/crc16.c index a438164..7a6f42d 100644 --- a/crc16.c +++ b/crc16.c @@ -20,7 +20,6 @@ #include #include "library.h" - #include "crc16.h" AARU_EXPORT crc16_ctx* AARU_CALL crc16_init(void) diff --git a/crc16.h b/crc16.h index 89a1eaf..d6bf698 100644 --- a/crc16.h +++ b/crc16.h @@ -21,31 +21,28 @@ typedef struct uint16_t crc; } crc16_ctx; -static uint16_t crc16_table[256] = -{ - 0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241, 0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, - 0xC5C1, 0xC481, 0x0440, 0xCC01, 0x0CC0, 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40, 0x0A00, 0xCAC1, - 0xCB81, 0x0B40, 0xC901, 0x09C0, 0x0880, 0xC841, 0xD801, 0x18C0, 0x1980, 0xD941, 0x1B00, 0xDBC1, 0xDA81, - 0x1A40, 0x1E00, 0xDEC1, 0xDF81, 0x1F40, 0xDD01, 0x1DC0, 0x1C80, 0xDC41, 0x1400, 0xD4C1, 0xD581, 0x1540, - 0xD701, 0x17C0, 0x1680, 0xD641, 0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081, 0x1040, 0xF001, - 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, 0xF281, 0x3240, 0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, - 0x3480, 0xF441, 0x3C00, 0xFCC1, 0xFD81, 0x3D40, 0xFF01, 0x3FC0, 0x3E80, 0xFE41, 0xFA01, 0x3AC0, 0x3B80, - 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840, 0x2800, 0xE8C1, 0xE981, 0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41, - 0xEE01, 0x2EC0, 0x2F80, 0xEF41, 0x2D00, 0xEDC1, 0xEC81, 0x2C40, 0xE401, 0x24C0, 0x2580, 0xE541, 0x2700, - 0xE7C1, 0xE681, 0x2640, 0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0, 0x2080, 0xE041, 0xA001, 0x60C0, - 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281, 0x6240, 0x6600, 0xA6C1, 0xA781, 0x6740, 0xA501, 0x65C0, 0x6480, - 0xA441, 0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41, 0xAA01, 0x6AC0, 0x6B80, 0xAB41, - 0x6900, 0xA9C1, 0xA881, 0x6840, 0x7800, 0xB8C1, 0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41, 0xBE01, - 0x7EC0, 0x7F80, 0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40, 0xB401, 0x74C0, 0x7580, 0xB541, 0x7700, 0xB7C1, - 0xB681, 0x7640, 0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101, 0x71C0, 0x7080, 0xB041, 0x5000, 0x90C1, 0x9181, - 0x5140, 0x9301, 0x53C0, 0x5280, 0x9241, 0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481, 0x5440, - 0x9C01, 0x5CC0, 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40, 0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, - 0x59C0, 0x5880, 0x9841, 0x8801, 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40, 0x4E00, 0x8EC1, - 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41, 0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, - 0x8641, 0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040 -}; +static uint16_t crc16_table[256] = { + 0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241, 0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, + 0xC481, 0x0440, 0xCC01, 0x0CC0, 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40, 0x0A00, 0xCAC1, 0xCB81, 0x0B40, + 0xC901, 0x09C0, 0x0880, 0xC841, 0xD801, 0x18C0, 0x1980, 0xD941, 0x1B00, 0xDBC1, 0xDA81, 0x1A40, 0x1E00, 0xDEC1, + 0xDF81, 0x1F40, 0xDD01, 0x1DC0, 0x1C80, 0xDC41, 0x1400, 0xD4C1, 0xD581, 0x1540, 0xD701, 0x17C0, 0x1680, 0xD641, + 0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081, 0x1040, 0xF001, 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, + 0xF281, 0x3240, 0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, 0x3480, 0xF441, 0x3C00, 0xFCC1, 0xFD81, 0x3D40, + 0xFF01, 0x3FC0, 0x3E80, 0xFE41, 0xFA01, 0x3AC0, 0x3B80, 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840, 0x2800, 0xE8C1, + 0xE981, 0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41, 0xEE01, 0x2EC0, 0x2F80, 0xEF41, 0x2D00, 0xEDC1, 0xEC81, 0x2C40, + 0xE401, 0x24C0, 0x2580, 0xE541, 0x2700, 0xE7C1, 0xE681, 0x2640, 0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0, + 0x2080, 0xE041, 0xA001, 0x60C0, 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281, 0x6240, 0x6600, 0xA6C1, 0xA781, 0x6740, + 0xA501, 0x65C0, 0x6480, 0xA441, 0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41, 0xAA01, 0x6AC0, + 0x6B80, 0xAB41, 0x6900, 0xA9C1, 0xA881, 0x6840, 0x7800, 0xB8C1, 0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41, + 0xBE01, 0x7EC0, 0x7F80, 0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40, 0xB401, 0x74C0, 0x7580, 0xB541, 0x7700, 0xB7C1, + 0xB681, 0x7640, 0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101, 0x71C0, 0x7080, 0xB041, 0x5000, 0x90C1, 0x9181, 0x5140, + 0x9301, 0x53C0, 0x5280, 0x9241, 0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481, 0x5440, 0x9C01, 0x5CC0, + 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40, 0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, 0x59C0, 0x5880, 0x9841, + 0x8801, 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40, 0x4E00, 0x8EC1, 0x8F81, 0x4F40, 0x8D01, 0x4DC0, + 0x4C80, 0x8C41, 0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641, 0x8201, 0x42C0, 0x4380, 0x8341, + 0x4100, 0x81C1, 0x8081, 0x4040}; AARU_EXPORT crc16_ctx* AARU_CALL crc16_init(); -AARU_EXPORT int AARU_CALL crc16_update(crc16_ctx* ctx, const uint8_t* data, uint32_t len); -AARU_EXPORT int AARU_CALL crc16_final(crc16_ctx* ctx, uint16_t* crc); -AARU_EXPORT void AARU_CALL crc16_free(crc16_ctx* ctx); \ No newline at end of file +AARU_EXPORT int AARU_CALL crc16_update(crc16_ctx* ctx, const uint8_t* data, uint32_t len); +AARU_EXPORT int AARU_CALL crc16_final(crc16_ctx* ctx, uint16_t* crc); +AARU_EXPORT void AARU_CALL crc16_free(crc16_ctx* ctx); \ No newline at end of file diff --git a/crc16_ccitt.c b/crc16_ccitt.c index bffaabc..f7f10eb 100644 --- a/crc16_ccitt.c +++ b/crc16_ccitt.c @@ -20,7 +20,6 @@ #include #include "library.h" - #include "crc16_ccitt.h" AARU_EXPORT crc16_ccitt_ctx* AARU_CALL crc16_ccitt_init(void) diff --git a/crc16_ccitt.h b/crc16_ccitt.h index 653fc2e..323ecf2 100644 --- a/crc16_ccitt.h +++ b/crc16_ccitt.h @@ -21,31 +21,28 @@ typedef struct uint16_t crc; } crc16_ccitt_ctx; -static uint16_t crc16_ccitt_table[256] = -{ - 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, - 0xd1ad, 0xe1ce, 0xf1ef, 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, 0x9339, 0x8318, - 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de, 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, - 0x5485, 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, 0x3653, 0x2672, 0x1611, 0x0630, - 0x76d7, 0x66f6, 0x5695, 0x46b4, 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, 0x48c4, - 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823, 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, - 0xa90a, 0xb92b, 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, 0xdbfd, 0xcbdc, 0xfbbf, - 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, - 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, - 0x2e32, 0x1e51, 0x0e70, 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, 0x9188, 0x81a9, - 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, - 0x6067, 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, 0x02b1, 0x1290, 0x22f3, 0x32d2, - 0x4235, 0x5214, 0x6277, 0x7256, 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d, 0x34e2, - 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, - 0xc71d, 0xd73c, 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, 0xd94c, 0xc96d, 0xf90e, - 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab, 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3, - 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, - 0x1ad0, 0x2ab3, 0x3a92, 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, 0x7c26, 0x6c07, - 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1, 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, - 0x9ff8, 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0 -}; +static uint16_t crc16_ccitt_table[256] = { + 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, + 0xe1ce, 0xf1ef, 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, 0x9339, 0x8318, 0xb37b, 0xa35a, + 0xd3bd, 0xc39c, 0xf3ff, 0xe3de, 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, 0xa56a, 0xb54b, + 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4, + 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, + 0x2802, 0x3823, 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, + 0x1a71, 0x0a50, 0x3a33, 0x2a12, 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, 0x6ca6, 0x7c87, + 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, + 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70, 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, + 0x9f59, 0x8f78, 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, 0x1080, 0x00a1, 0x30c2, 0x20e3, + 0x5004, 0x4025, 0x7046, 0x6067, 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, 0x02b1, 0x1290, + 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d, + 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, + 0xc71d, 0xd73c, 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, 0xd94c, 0xc96d, 0xf90e, 0xe92f, + 0x99c8, 0x89e9, 0xb98a, 0xa9ab, 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3, 0xcb7d, 0xdb5c, + 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92, + 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, + 0x1ce0, 0x0cc1, 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8, 0x6e17, 0x7e36, 0x4e55, 0x5e74, + 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0}; AARU_EXPORT crc16_ccitt_ctx* AARU_CALL crc16_ccitt_init(); -AARU_EXPORT int AARU_CALL crc16_ccitt_update(crc16_ccitt_ctx* ctx, const uint8_t* data, uint32_t len); -AARU_EXPORT int AARU_CALL crc16_ccitt_final(crc16_ccitt_ctx* ctx, uint16_t* crc); -AARU_EXPORT void AARU_CALL crc16_ccitt_free(crc16_ccitt_ctx* ctx); \ No newline at end of file +AARU_EXPORT int AARU_CALL crc16_ccitt_update(crc16_ccitt_ctx* ctx, const uint8_t* data, uint32_t len); +AARU_EXPORT int AARU_CALL crc16_ccitt_final(crc16_ccitt_ctx* ctx, uint16_t* crc); +AARU_EXPORT void AARU_CALL crc16_ccitt_free(crc16_ccitt_ctx* ctx); \ No newline at end of file diff --git a/crc32.c b/crc32.c index fcfb640..40fcf1f 100644 --- a/crc32.c +++ b/crc32.c @@ -20,7 +20,6 @@ #include #include "library.h" - #include "crc32.h" AARU_EXPORT crc32_ctx* AARU_CALL crc32_init(void) diff --git a/crc32.h b/crc32.h index 81fe446..72ae8d5 100644 --- a/crc32.h +++ b/crc32.h @@ -26,6 +26,6 @@ typedef struct #define CRC32_ISO_SEED 0xFFFFFFFF AARU_EXPORT crc32_ctx* AARU_CALL crc32_init(); -AARU_EXPORT int AARU_CALL crc32_update(crc32_ctx* ctx, const uint8_t* data, uint32_t len); -AARU_EXPORT int AARU_CALL crc32_final(crc32_ctx* ctx, uint32_t* crc); -AARU_EXPORT void AARU_CALL crc32_free(crc32_ctx* ctx); \ No newline at end of file +AARU_EXPORT int AARU_CALL crc32_update(crc32_ctx* ctx, const uint8_t* data, uint32_t len); +AARU_EXPORT int AARU_CALL crc32_final(crc32_ctx* ctx, uint32_t* crc); +AARU_EXPORT void AARU_CALL crc32_free(crc32_ctx* ctx); \ No newline at end of file diff --git a/crc64.c b/crc64.c index 39577d0..8248dce 100644 --- a/crc64.c +++ b/crc64.c @@ -20,7 +20,6 @@ #include #include "library.h" - #include "crc64.h" AARU_EXPORT crc64_ctx* AARU_CALL crc64_init(void) diff --git a/crc64.h b/crc64.h index 3caad5f..1a0b15f 100644 --- a/crc64.h +++ b/crc64.h @@ -26,6 +26,6 @@ typedef struct #define CRC64_ECMA_SEED 0xFFFFFFFFFFFFFFFF AARU_EXPORT crc64_ctx* AARU_CALL crc64_init(); -AARU_EXPORT int AARU_CALL crc64_update(crc64_ctx* ctx, const uint8_t* data, uint32_t len); -AARU_EXPORT int AARU_CALL crc64_final(crc64_ctx* ctx, uint64_t* crc); -AARU_EXPORT void AARU_CALL crc64_free(crc64_ctx* ctx); \ No newline at end of file +AARU_EXPORT int AARU_CALL crc64_update(crc64_ctx* ctx, const uint8_t* data, uint32_t len); +AARU_EXPORT int AARU_CALL crc64_final(crc64_ctx* ctx, uint64_t* crc); +AARU_EXPORT void AARU_CALL crc64_free(crc64_ctx* ctx); \ No newline at end of file diff --git a/fletcher16.c b/fletcher16.c index 6604147..a7b4d03 100644 --- a/fletcher16.c +++ b/fletcher16.c @@ -20,7 +20,6 @@ #include #include "library.h" - #include "fletcher16.h" AARU_EXPORT fletcher16_ctx* AARU_CALL fletcher16_init() diff --git a/fletcher16.h b/fletcher16.h index 20dacd4..2aa2f58 100644 --- a/fletcher16.h +++ b/fletcher16.h @@ -21,14 +21,15 @@ #define FLETCHER16_MODULE 0xFF -typedef struct { +typedef struct +{ uint8_t sum1; uint8_t sum2; } fletcher16_ctx; AARU_EXPORT fletcher16_ctx* AARU_CALL fletcher16_init(); -AARU_EXPORT int AARU_CALL fletcher16_update(fletcher16_ctx* ctx, const uint8_t* data, uint32_t len); -AARU_EXPORT int AARU_CALL fletcher16_final(fletcher16_ctx* ctx, uint16_t* checksum); -AARU_EXPORT void AARU_CALL fletcher16_free(fletcher16_ctx* ctx); +AARU_EXPORT int AARU_CALL fletcher16_update(fletcher16_ctx* ctx, const uint8_t* data, uint32_t len); +AARU_EXPORT int AARU_CALL fletcher16_final(fletcher16_ctx* ctx, uint16_t* checksum); +AARU_EXPORT void AARU_CALL fletcher16_free(fletcher16_ctx* ctx); -#endif//AARU_CHECKSUMS_NATIVE_FLETCHER16_H +#endif // AARU_CHECKSUMS_NATIVE_FLETCHER16_H diff --git a/fletcher32.c b/fletcher32.c index 27954a6..81186bc 100644 --- a/fletcher32.c +++ b/fletcher32.c @@ -20,7 +20,6 @@ #include #include "library.h" - #include "fletcher32.h" AARU_EXPORT fletcher32_ctx* AARU_CALL fletcher32_init() diff --git a/fletcher32.h b/fletcher32.h index 8ace23f..c5d991f 100644 --- a/fletcher32.h +++ b/fletcher32.h @@ -21,14 +21,15 @@ #define FLETCHER32_MODULE 0xFFFF -typedef struct { +typedef struct +{ uint16_t sum1; uint16_t sum2; } fletcher32_ctx; AARU_EXPORT fletcher32_ctx* AARU_CALL fletcher32_init(); -AARU_EXPORT int AARU_CALL fletcher32_update(fletcher32_ctx* ctx, const uint8_t* data, uint32_t len); -AARU_EXPORT int AARU_CALL fletcher32_final(fletcher32_ctx* ctx, uint32_t* checksum); -AARU_EXPORT void AARU_CALL fletcher32_free(fletcher32_ctx* ctx); +AARU_EXPORT int AARU_CALL fletcher32_update(fletcher32_ctx* ctx, const uint8_t* data, uint32_t len); +AARU_EXPORT int AARU_CALL fletcher32_final(fletcher32_ctx* ctx, uint32_t* checksum); +AARU_EXPORT void AARU_CALL fletcher32_free(fletcher32_ctx* ctx); -#endif//AARU_CHECKSUMS_NATIVE_FLETCHER32_H +#endif // AARU_CHECKSUMS_NATIVE_FLETCHER32_H diff --git a/library.h b/library.h index 5899c71..fab20d2 100644 --- a/library.h +++ b/library.h @@ -2,29 +2,29 @@ #define AARU_CHECKSUMS_NATIVE_LIBRARY_H #ifdef __cplusplus -#define EXTERNC extern "C" +#define EXTERNC extern "C" #else #define EXTERNC #endif -#if defined(_WIN32) -#define AARU_CALL __stdcall -#define AARU_EXPORT EXTERNC __declspec(dllexport) +#if defined(_WIN32) +#define AARU_CALL __stdcall +#define AARU_EXPORT EXTERNC __declspec(dllexport) #define AARU_LOCAL -#else +#else #define AARU_CALL #if defined(__APPLE__) -#define AARU_EXPORT EXTERNC __attribute__((visibility("default"))) -#define AARU_LOCAL __attribute__((visibility("hidden"))) -#else -#if __GNUC__ >= 4 -#define AARU_EXPORT EXTERNC __attribute__ ((visibility("default"))) -#define AARU_LOCAL __attribute__((visibility("hidden"))) +#define AARU_EXPORT EXTERNC __attribute__((visibility("default"))) +#define AARU_LOCAL __attribute__((visibility("hidden"))) #else -#define AARU_EXPORT EXTERNC +#if __GNUC__ >= 4 +#define AARU_EXPORT EXTERNC __attribute__((visibility("default"))) +#define AARU_LOCAL __attribute__((visibility("hidden"))) +#else +#define AARU_EXPORT EXTERNC #define idaAARU_LOCAL_local #endif #endif #endif -#endif//AARU_CHECKSUMS_NATIVE_LIBRARY_H +#endif // AARU_CHECKSUMS_NATIVE_LIBRARY_H diff --git a/spamsum.c b/spamsum.c index bd2fe90..3073fdf 100644 --- a/spamsum.c +++ b/spamsum.c @@ -22,14 +22,12 @@ #include #include "library.h" - #include "spamsum.h" -static uint8_t b64[] = {0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, - 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, - 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, - 0x6E, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, - 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2B, 0x2F}; +static uint8_t b64[] = {0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, + 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, + 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, + 0x77, 0x78, 0x79, 0x7A, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x2B, 0x2F}; AARU_EXPORT spamsum_ctx* AARU_CALL spamsum_init(void) { @@ -39,7 +37,7 @@ AARU_EXPORT spamsum_ctx* AARU_CALL spamsum_init(void) memset(ctx, 0, sizeof(spamsum_ctx)); ctx->bh_end = 1; - ctx->bh[0].h = HASH_INIT; + ctx->bh[0].h = HASH_INIT; ctx->bh[0].half_h = HASH_INIT; return ctx; @@ -62,7 +60,7 @@ AARU_EXPORT void AARU_CALL spamsum_free(spamsum_ctx* ctx) } #define ROLL_SUM(ctx) ((ctx)->roll.h1 + (ctx)->roll.h2 + (ctx)->roll.h3) -#define SUM_HASH(c, h) (((h) * HASH_PRIME) ^ (c)); +#define SUM_HASH(c, h) (((h)*HASH_PRIME) ^ (c)); #define SSDEEP_BS(index) (MIN_BLOCKSIZE << (index)) AARU_LOCAL void fuzzy_engine_step(spamsum_ctx* ctx, uint8_t c) @@ -76,7 +74,7 @@ AARU_LOCAL void fuzzy_engine_step(spamsum_ctx* ctx, uint8_t c) for(i = ctx->bh_start; i < ctx->bh_end; ++i) { - ctx->bh[i].h = SUM_HASH(c, ctx->bh[i].h); + ctx->bh[i].h = SUM_HASH(c, ctx->bh[i].h); ctx->bh[i].half_h = SUM_HASH(c, ctx->bh[i].half_h); } @@ -95,7 +93,7 @@ AARU_LOCAL void fuzzy_engine_step(spamsum_ctx* ctx, uint8_t c) if(0 == ctx->bh[i].d_len) fuzzy_try_fork_blockhash(ctx); ctx->bh[i].digest[ctx->bh[i].d_len] = b64[ctx->bh[i].h % 64]; - ctx->bh[i].half_digest = b64[ctx->bh[i].half_h % 64]; + ctx->bh[i].half_digest = b64[ctx->bh[i].half_h % 64]; if(ctx->bh[i].d_len < SPAMSUM_LENGTH - 1) { @@ -106,11 +104,11 @@ AARU_LOCAL void fuzzy_engine_step(spamsum_ctx* ctx, uint8_t c) * last few pieces of the message into a single piece * */ ctx->bh[i].digest[++ctx->bh[i].d_len] = 0; - ctx->bh[i].h = HASH_INIT; + ctx->bh[i].h = HASH_INIT; if(ctx->bh[i].d_len >= SPAMSUM_LENGTH / 2) continue; - ctx->bh[i].half_h = HASH_INIT; + ctx->bh[i].half_h = HASH_INIT; ctx->bh[i].half_digest = 0; } else @@ -162,11 +160,11 @@ AARU_LOCAL void fuzzy_try_fork_blockhash(spamsum_ctx* ctx) assert(ctx->bh_end != 0); - uint32_t obh = ctx->bh_end - 1; - uint32_t nbh = ctx->bh_end; - ctx->bh[nbh].h = ctx->bh[obh].h; - ctx->bh[nbh].half_h = ctx->bh[obh].half_h; - ctx->bh[nbh].digest[0] = 0; + uint32_t obh = ctx->bh_end - 1; + uint32_t nbh = ctx->bh_end; + ctx->bh[nbh].h = ctx->bh[obh].h; + ctx->bh[nbh].half_h = ctx->bh[obh].half_h; + ctx->bh[nbh].digest[0] = 0; ctx->bh[nbh].half_digest = 0; ctx->bh[nbh].d_len = 0; ++ctx->bh_end; diff --git a/spamsum.h b/spamsum.h index 9a7e998..27f50c9 100644 --- a/spamsum.h +++ b/spamsum.h @@ -17,23 +17,23 @@ */ #define SPAMSUM_LENGTH 64 -#define NUM_BLOCKHASHES 31 -#define ROLLING_WINDOW 7 -#define HASH_INIT 0x28021967 -#define HASH_PRIME 0x01000193 -#define MIN_BLOCKSIZE 3 -#define FUZZY_MAX_RESULT ((2 * SPAMSUM_LENGTH) + 20) +#define NUM_BLOCKHASHES 31 +#define ROLLING_WINDOW 7 +#define HASH_INIT 0x28021967 +#define HASH_PRIME 0x01000193 +#define MIN_BLOCKSIZE 3 +#define FUZZY_MAX_RESULT ((2 * SPAMSUM_LENGTH) + 20) -typedef struct +typedef struct { - uint32_t h; - uint32_t half_h; - uint8_t digest[SPAMSUM_LENGTH]; - uint8_t half_digest; - uint32_t d_len; + uint32_t h; + uint32_t half_h; + uint8_t digest[SPAMSUM_LENGTH]; + uint8_t half_digest; + uint32_t d_len; } blockhash_ctx; -typedef struct +typedef struct { uint8_t window[ROLLING_WINDOW]; uint32_t h1; @@ -42,22 +42,21 @@ typedef struct uint32_t n; } roll_state; -typedef struct +typedef struct { - uint32_t bh_start; - uint32_t bh_end; - blockhash_ctx bh[NUM_BLOCKHASHES]; - uint64_t total_size; - roll_state roll; + uint32_t bh_start; + uint32_t bh_end; + blockhash_ctx bh[NUM_BLOCKHASHES]; + uint64_t total_size; + roll_state roll; } spamsum_ctx; AARU_EXPORT spamsum_ctx* AARU_CALL spamsum_init(void); -AARU_EXPORT int AARU_CALL spamsum_update(spamsum_ctx* ctx, const uint8_t* data, uint32_t len); -AARU_EXPORT uint8_t* AARU_CALL spamsum_final(spamsum_ctx* ctx); -AARU_EXPORT void AARU_CALL spamsum_free(spamsum_ctx* ctx); +AARU_EXPORT int AARU_CALL spamsum_update(spamsum_ctx* ctx, const uint8_t* data, uint32_t len); +AARU_EXPORT uint8_t* AARU_CALL spamsum_final(spamsum_ctx* ctx); +AARU_EXPORT void AARU_CALL spamsum_free(spamsum_ctx* ctx); AARU_LOCAL void fuzzy_engine_step(spamsum_ctx* ctx, uint8_t c); AARU_LOCAL void roll_hash(spamsum_ctx* ctx, uint8_t c); AARU_LOCAL void fuzzy_try_reduce_blockhash(spamsum_ctx* ctx); AARU_LOCAL void fuzzy_try_fork_blockhash(spamsum_ctx* ctx); -