Removed RND table.

diff --git a/include/mhash_384.h b/include/mhash_384.h
index 51d6e96..660b3f8 100644 (file)
--- a/include/mhash_384.h
+++ b/include/mhash_384.h
@@ -64,59 +64,16 @@ namespace internals {
 
 /*Version*/
 static const uint_fast16_t MHASH_384_VERSION_MAJOR = UINT32_C(1);
-static const uint_fast16_t MHASH_384_VERSION_MINOR = UINT32_C(2);
+static const uint_fast16_t MHASH_384_VERSION_MINOR = UINT32_C(1);
 static const uint_fast16_t MHASH_384_VERSION_PATCH = UINT32_C(0);
 
 /*Hash length definition*/
 #ifdef __cplusplus
 static const uint_fast16_t MHASH_384_LEN = UINT16_C(48);
-static const uint_fast16_t MHASH_384_RND = UINT16_C(768);
 #else
 #define MHASH_384_LEN UINT16_C(48)
-#define MHASH_384_RND UINT16_C(768)
 #endif
 
-/*Table RND: 2x256 matrix containing the pre-computed "shuffled" table indices*/
-static const uint8_t MHASH_384_TABLE_RND[2U][768U] =
-{
-       {
-               0x5F, 0x2D, 0x0B, 0x38, 0xD8, 0x23, 0x9C, 0x3F, 0xFE, 0x5D, 0xDD, 0xCE, 0x61, 0x8B, 0x72, 0xE3, 0x66, 0x74, 0x0F, 0x8F, 0x70, 0x5C, 0x58, 0x02, 0x1D, 0xC0, 0xEF, 0x7D, 0x05, 0xDA, 0xC1, 0xE2, 0x8F, 0x4E, 0xC3, 0x73, 0xFA, 0x2D, 0xE4, 0x53, 0x9E, 0x91, 0xE8, 0xBC, 0xCA, 0x45, 0x95, 0xA4,
-               0x1D, 0x05, 0x48, 0xAA, 0xB9, 0xD6, 0x25, 0xFC, 0x5F, 0xBA, 0xE7, 0xC2, 0x11, 0x23, 0xC2, 0xDD, 0xD0, 0x20, 0x0A, 0x18, 0xB2, 0x9B, 0x0F, 0x58, 0x32, 0xB2, 0x35, 0x03, 0xE9, 0x52, 0xAE, 0x1A, 0x6E, 0xBA, 0xAF, 0xAC, 0xFF, 0xEE, 0xBE, 0xE5, 0x7B, 0x71, 0x2C, 0x52, 0x99, 0x88, 0xB1, 0xEE,
-               0x2C, 0x4C, 0x97, 0xA8, 0x5B, 0x35, 0xBE, 0xB5, 0xAA, 0xEB, 0xD6, 0x3F, 0x9F, 0x8E, 0x06, 0x71, 0x7C, 0x4B, 0x3A, 0x16, 0x13, 0x2C, 0x19, 0x4F, 0x6D, 0x6F, 0x9E, 0x49, 0x7F, 0xC2, 0x21, 0xA1, 0xC9, 0xAA, 0xDC, 0xBB, 0xF1, 0x84, 0x11, 0xB7, 0x8C, 0x93, 0x81, 0x8D, 0x48, 0x04, 0xEC, 0x73,
-               0x2E, 0x65, 0x20, 0x39, 0xE5, 0xAB, 0x60, 0xFE, 0xF0, 0x4C, 0x6E, 0x2E, 0x3F, 0x5F, 0x67, 0xF4, 0x7C, 0xE8, 0xB5, 0x96, 0xBF, 0xFD, 0xD1, 0xFF, 0x84, 0x3E, 0x24, 0x84, 0x2A, 0x29, 0xD5, 0xFE, 0x26, 0xDB, 0x75, 0x7F, 0x68, 0x44, 0xE1, 0xA9, 0xD7, 0xFB, 0xA5, 0xE2, 0xA7, 0xE9, 0xFC, 0x89,
-               0xF1, 0xE2, 0x48, 0x83, 0x7B, 0x3B, 0x6F, 0x60, 0x28, 0x27, 0x01, 0x2F, 0x0E, 0xBC, 0xCB, 0xC9, 0xE6, 0x42, 0xC1, 0xAD, 0x14, 0x90, 0xD9, 0x66, 0xEB, 0x47, 0x5D, 0x96, 0x8A, 0x54, 0x98, 0xEE, 0x4C, 0x63, 0xC6, 0xF8, 0xB0, 0xC8, 0x9F, 0xF7, 0xFF, 0x40, 0x8B, 0x57, 0x76, 0xA2, 0x95, 0xA0,
-               0x57, 0x9A, 0xFD, 0x4A, 0x44, 0x30, 0xE6, 0x95, 0x62, 0x29, 0xAE, 0xAD, 0xD4, 0x7B, 0xE3, 0x21, 0x71, 0x15, 0xF7, 0x68, 0xA6, 0xF6, 0xA2, 0x4D, 0xBD, 0x3C, 0x65, 0xC8, 0xA3, 0x2D, 0x46, 0x63, 0x54, 0x9D, 0xBB, 0x1A, 0x4A, 0x9E, 0x59, 0x4F, 0xE0, 0x25, 0x82, 0xC5, 0x1F, 0x33, 0xB1, 0x35,
-               0xFB, 0x40, 0x89, 0x0B, 0xA7, 0x5E, 0x8D, 0xF7, 0xA0, 0xF9, 0x15, 0xBE, 0xB6, 0xC6, 0xDE, 0xC4, 0x88, 0x8A, 0x6F, 0xD2, 0x3B, 0xBC, 0x92, 0xA1, 0x59, 0x85, 0x97, 0x0C, 0xF8, 0x36, 0xC8, 0x34, 0x38, 0x75, 0x87, 0xE8, 0x81, 0x0D, 0x32, 0x6D, 0x0A, 0x5B, 0xDB, 0xF9, 0x7C, 0xCD, 0x12, 0x08,
-               0x03, 0xA6, 0x9C, 0xDB, 0xDA, 0xE3, 0xB6, 0xD7, 0x89, 0x37, 0x24, 0x7D, 0x80, 0x1E, 0xBF, 0xA3, 0xE4, 0x70, 0x59, 0xD0, 0x66, 0xCD, 0x74, 0x6B, 0x26, 0xF4, 0xF1, 0x51, 0x3A, 0x40, 0x8D, 0x3E, 0x15, 0x3D, 0x07, 0x8C, 0x17, 0x56, 0x6B, 0xA8, 0x92, 0x3C, 0x27, 0xD0, 0x79, 0xF2, 0x5A, 0xED,
-               0x42, 0x23, 0xFA, 0x76, 0xBB, 0x6A, 0xCE, 0xF3, 0x04, 0x78, 0x77, 0x08, 0xB6, 0xC3, 0xEB, 0x74, 0x07, 0xED, 0xDC, 0xD9, 0xB4, 0xD5, 0x39, 0x9B, 0xF9, 0x98, 0x49, 0x68, 0x8E, 0x76, 0x85, 0x39, 0x0C, 0x2E, 0xC6, 0x41, 0x46, 0x38, 0xD6, 0x91, 0x50, 0xBD, 0x30, 0x94, 0x13, 0x1A, 0x85, 0xD3,
-               0xC5, 0x6C, 0xE1, 0xE9, 0x2A, 0x7A, 0xED, 0x52, 0x08, 0x31, 0xAF, 0x83, 0xD1, 0xA5, 0x64, 0x45, 0x36, 0xF2, 0x09, 0xEA, 0x94, 0x43, 0x6C, 0x55, 0x3B, 0x2B, 0x9C, 0xB4, 0x47, 0xA2, 0xB4, 0xEA, 0x5A, 0x6A, 0x69, 0x51, 0x79, 0x01, 0xA0, 0x42, 0x79, 0x10, 0xCB, 0x88, 0xCC, 0x31, 0x97, 0xE4,
-               0xDE, 0x61, 0x69, 0xB3, 0xE1, 0x4D, 0x8B, 0x34, 0xD1, 0x46, 0xFA, 0x81, 0x73, 0x1F, 0x70, 0x33, 0x99, 0x02, 0x63, 0x51, 0xA5, 0x7E, 0x36, 0xDF, 0x4B, 0x19, 0x09, 0xB0, 0xD4, 0x44, 0x67, 0x04, 0x1E, 0x5C, 0xCC, 0x92, 0xB0, 0xEC, 0x56, 0x55, 0x43, 0x99, 0xCA, 0x4F, 0x93, 0x5D, 0xA3, 0xD4,
-               0x0D, 0xE5, 0x19, 0xB8, 0x31, 0xB1, 0x4B, 0x22, 0xC4, 0xA9, 0xF3, 0x0F, 0x30, 0x02, 0x07, 0x6B, 0x98, 0x54, 0xD8, 0x2A, 0x50, 0xAB, 0x37, 0x17, 0x65, 0x09, 0xD2, 0x0C, 0xCE, 0x6D, 0xBD, 0x12, 0x06, 0xD2, 0x0A, 0x37, 0xAF, 0xD3, 0xA4, 0xDD, 0x18, 0x0B, 0xCB, 0x78, 0xAC, 0x9F, 0x0E, 0xF5,
-               0x78, 0x60, 0xC3, 0xF5, 0x62, 0x24, 0xD9, 0x9B, 0x5E, 0x83, 0x16, 0x41, 0x03, 0x4E, 0x5A, 0x80, 0x87, 0x00, 0x29, 0x1B, 0x75, 0x94, 0x45, 0x7A, 0x18, 0xCF, 0xC5, 0xEF, 0x8C, 0x96, 0xB9, 0x56, 0xC7, 0x13, 0xF8, 0xAE, 0xBF, 0x22, 0xD5, 0xA6, 0x49, 0x21, 0xE0, 0x67, 0x20, 0x14, 0xF6, 0xB2,
-               0xAD, 0x62, 0xCF, 0x72, 0xD3, 0xB7, 0x01, 0x58, 0xCD, 0x86, 0xDF, 0x28, 0x06, 0x5E, 0xCF, 0x5B, 0xA4, 0x55, 0xCA, 0xFB, 0xAC, 0x1C, 0x9A, 0x86, 0x3D, 0x64, 0x8A, 0x25, 0xC0, 0x2F, 0x4D, 0x11, 0x69, 0x8F, 0xA8, 0xF0, 0x53, 0x1E, 0x82, 0xE0, 0x34, 0x27, 0xB8, 0x05, 0xC7, 0x86, 0xD8, 0x47,
-               0x6E, 0x28, 0x1B, 0x77, 0xF6, 0xE7, 0x53, 0x50, 0x61, 0xDE, 0x26, 0xDC, 0xB3, 0x93, 0x4A, 0x8E, 0x9D, 0x00, 0xDA, 0x6A, 0x1D, 0x16, 0xC9, 0xF4, 0x32, 0x1C, 0x33, 0x10, 0xB9, 0x00, 0x4E, 0x82, 0x1B, 0x87, 0x0D, 0x6C, 0x3A, 0x41, 0x3E, 0x2B, 0xB8, 0x7D, 0xDF, 0x90, 0x9A, 0xFC, 0xBA, 0x9D,
-               0x90, 0x77, 0x1C, 0x57, 0x10, 0xEC, 0xA9, 0xEA, 0xC1, 0xD7, 0x12, 0x7F, 0xB7, 0xB5, 0xC4, 0xF0, 0x5C, 0x7E, 0xF2, 0x1F, 0xB3, 0x72, 0xC7, 0x3D, 0x91, 0x14, 0x7E, 0xEF, 0xC0, 0x3C, 0xF3, 0x2F, 0x2B, 0xE6, 0xE7, 0x43, 0xAB, 0x22, 0xCC, 0x7A, 0x0E, 0x80, 0xA1, 0x64, 0xA7, 0x17, 0xFD, 0xF5
-       },
-       {
-               0xB7, 0x60, 0x48, 0x9F, 0x4E, 0xA6, 0x8A, 0x14, 0x43, 0x70, 0x59, 0xAE, 0xA2, 0x6F, 0xCE, 0xB6, 0xE5, 0x9B, 0xB3, 0x90, 0x25, 0x9E, 0xE2, 0x4B, 0x58, 0x8B, 0x94, 0x97, 0xCF, 0xBF, 0xA6, 0xC1, 0xD1, 0x23, 0x63, 0x11, 0x44, 0x41, 0xAC, 0xFE, 0x89, 0x49, 0x85, 0x51, 0x2C, 0xDB, 0x71, 0x95,
-               0xF9, 0x32, 0x51, 0x46, 0xE3, 0x73, 0x82, 0x21, 0x95, 0xF3, 0xFD, 0x1F, 0x70, 0x1B, 0x85, 0x0A, 0x62, 0xB6, 0xDD, 0x77, 0xC8, 0x78, 0xE0, 0xBF, 0x8B, 0x15, 0xAC, 0x43, 0x68, 0x28, 0x3D, 0xEB, 0x02, 0x75, 0xC6, 0xE3, 0xA4, 0x87, 0x44, 0xEB, 0x5B, 0x83, 0xEF, 0xDF, 0x97, 0x22, 0x62, 0xF0,
-               0xB0, 0x8C, 0xBE, 0x01, 0xCC, 0xAF, 0x7E, 0x13, 0x0E, 0xA2, 0x93, 0x92, 0xB2, 0x7D, 0xBA, 0xA0, 0x1E, 0x79, 0xD4, 0xCD, 0xFC, 0x6E, 0xB3, 0x09, 0xED, 0x84, 0x1E, 0xFB, 0x84, 0xF9, 0x24, 0x6E, 0x31, 0x94, 0x52, 0xCC, 0xE4, 0xB1, 0xFE, 0x50, 0x04, 0xF8, 0x67, 0x78, 0x90, 0x87, 0xB2, 0x5F,
-               0x39, 0x14, 0x5B, 0x91, 0xF5, 0xB4, 0x86, 0xB7, 0x31, 0x93, 0xA5, 0xE5, 0x40, 0x23, 0xA4, 0x4E, 0x0D, 0xBA, 0x08, 0x26, 0xD6, 0x4A, 0x9C, 0x2D, 0xC7, 0x03, 0xC5, 0x4A, 0x98, 0x84, 0x13, 0xBA, 0xBB, 0x05, 0xEA, 0xAA, 0x77, 0x3C, 0x1D, 0x72, 0x7E, 0x12, 0xEE, 0x99, 0xAB, 0xDD, 0x42, 0x37,
-               0x64, 0xF8, 0xB0, 0xEE, 0xEA, 0x07, 0x68, 0xE6, 0x37, 0x41, 0x1C, 0xF6, 0x4C, 0xB5, 0xEF, 0x71, 0xA5, 0xA8, 0xB6, 0x5E, 0x7D, 0x27, 0x5A, 0x8E, 0x6B, 0x03, 0xE7, 0x54, 0x3E, 0x29, 0x1B, 0xB4, 0x3D, 0x56, 0xFC, 0x8D, 0xA7, 0x52, 0x3A, 0x1A, 0xF6, 0xC9, 0xB0, 0xC3, 0x3E, 0x69, 0xDF, 0x0A,
-               0xB5, 0x3B, 0xB4, 0x1F, 0xF2, 0x4C, 0xA3, 0x66, 0x6D, 0x63, 0x0F, 0x8A, 0x07, 0xEB, 0x31, 0x01, 0x8C, 0x55, 0xD8, 0x5C, 0x57, 0x2C, 0xD0, 0xD1, 0x17, 0x7B, 0x9C, 0x5D, 0x2F, 0x36, 0xF3, 0x38, 0x8C, 0x18, 0x75, 0x3F, 0x3C, 0x34, 0xC7, 0x9C, 0x4D, 0xBC, 0x89, 0xA0, 0xC4, 0xDC, 0xF0, 0xD3,
-               0x91, 0x3B, 0xC4, 0x96, 0x16, 0x76, 0xE5, 0x1C, 0xA5, 0x61, 0xC4, 0xE2, 0xF1, 0x38, 0xC8, 0xBD, 0x4D, 0x54, 0xAE, 0x5F, 0x81, 0x17, 0x99, 0x57, 0xB8, 0x25, 0x34, 0xFA, 0xA4, 0xDB, 0x19, 0x12, 0x44, 0xA7, 0x3A, 0x9A, 0x0C, 0x53, 0x9B, 0xC0, 0x64, 0x27, 0xFA, 0xFD, 0x81, 0x2A, 0x4F, 0x19,
-               0xED, 0x6F, 0xDA, 0x26, 0x7B, 0x4C, 0x21, 0x0A, 0xA8, 0x18, 0x41, 0x26, 0xAD, 0x14, 0x4D, 0xD8, 0x28, 0x6F, 0x5C, 0x7A, 0x10, 0x09, 0x54, 0xDE, 0x72, 0xAB, 0x86, 0x9F, 0x88, 0x68, 0xE6, 0x2B, 0x32, 0x80, 0x2E, 0x86, 0x6B, 0x0B, 0x23, 0xDD, 0x49, 0xBF, 0x8F, 0xD4, 0x96, 0x46, 0x45, 0x70,
-               0xAA, 0xB1, 0xAD, 0x33, 0x01, 0xA2, 0x5B, 0x9A, 0xC1, 0x90, 0xB1, 0xDE, 0x5A, 0x8D, 0xEA, 0xD5, 0x50, 0xA9, 0x00, 0xCB, 0xD8, 0x83, 0x08, 0x06, 0x55, 0x56, 0x17, 0x98, 0x8A, 0xE8, 0x2D, 0x32, 0x6B, 0xFB, 0xFF, 0xAC, 0x50, 0x92, 0x2F, 0x18, 0x76, 0x6A, 0xCA, 0xF7, 0xAD, 0x72, 0x40, 0xF5,
-               0x45, 0x30, 0x20, 0xED, 0xFE, 0xBB, 0x22, 0x6C, 0x97, 0x0B, 0x6D, 0xB8, 0x5A, 0xE0, 0x39, 0x05, 0x81, 0xA9, 0x47, 0xA1, 0xD3, 0x7E, 0x9D, 0x0D, 0xF7, 0x80, 0xF3, 0xE8, 0x2E, 0xA9, 0x45, 0x33, 0xCB, 0xE4, 0x5D, 0x89, 0x16, 0x96, 0x19, 0x8E, 0x9B, 0xFA, 0x35, 0xC2, 0x73, 0x04, 0xEC, 0xA3,
-               0x2F, 0x76, 0xC3, 0xE6, 0x53, 0x36, 0x42, 0x83, 0x25, 0xDE, 0xE7, 0x6D, 0x9E, 0xC6, 0x64, 0x47, 0x24, 0x95, 0x6C, 0xAA, 0xD2, 0x0C, 0x4E, 0x6A, 0x7F, 0x13, 0xCB, 0x9F, 0x06, 0x0D, 0xAB, 0x10, 0xE9, 0xB9, 0x58, 0x3F, 0x99, 0x22, 0xBE, 0x59, 0x1F, 0xA6, 0xD9, 0x9D, 0x5C, 0x82, 0x8F, 0x20,
-               0x06, 0x4F, 0x57, 0xD0, 0xE0, 0x42, 0xD6, 0x98, 0xC5, 0xCA, 0xD7, 0xD0, 0x5E, 0x15, 0x7B, 0xC0, 0x35, 0xCF, 0x30, 0x7A, 0xA7, 0xC2, 0x6A, 0x03, 0x4B, 0x62, 0xB7, 0xE1, 0x79, 0xA8, 0x09, 0x88, 0x77, 0x49, 0xD2, 0x7F, 0xBE, 0x2B, 0x0B, 0x3B, 0xCF, 0xCC, 0x0F, 0x4B, 0x9A, 0x58, 0x24, 0xC9,
-               0x75, 0x3A, 0xFB, 0x5E, 0x35, 0xB9, 0x61, 0x52, 0x8F, 0xC0, 0x8B, 0xDA, 0x3D, 0xBC, 0x07, 0x73, 0x00, 0xCA, 0x6C, 0x1D, 0xAF, 0x47, 0xA1, 0xF2, 0x55, 0x65, 0xC6, 0x85, 0xF4, 0x08, 0x40, 0xA1, 0xE4, 0x2A, 0x36, 0x79, 0xE1, 0xCD, 0x92, 0x43, 0xD9, 0xCD, 0xC5, 0x34, 0x93, 0xD2, 0xB3, 0x4F,
-               0x65, 0x7F, 0x2D, 0xFF, 0x37, 0x1B, 0x69, 0xDA, 0x2C, 0xF4, 0xF6, 0x6E, 0xE8, 0xE9, 0xD5, 0x88, 0x29, 0xF2, 0x3C, 0x66, 0xE9, 0xE7, 0x12, 0x1E, 0x94, 0xE2, 0xE3, 0x3E, 0x0E, 0xD3, 0xDF, 0x78, 0x67, 0x71, 0x5F, 0xA3, 0x1A, 0xC8, 0x53, 0xD7, 0xD1, 0xF9, 0x16, 0x60, 0x59, 0xEE, 0x74, 0x7A,
-               0xF7, 0xE1, 0x1D, 0x1A, 0x02, 0x91, 0xBD, 0x9E, 0xC7, 0x20, 0xDC, 0x74, 0x48, 0x2A, 0x1C, 0x10, 0x48, 0xF8, 0x0F, 0x56, 0xAE, 0x51, 0x8D, 0xAF, 0xCE, 0x63, 0xDC, 0x2B, 0xFC, 0x21, 0xC1, 0x7C, 0x67, 0xD4, 0xF0, 0xBB, 0xFF, 0x46, 0xC3, 0xB9, 0xF5, 0x8E, 0x61, 0xBC, 0x11, 0x15, 0xF1, 0x2E,
-               0x29, 0x65, 0xBD, 0x30, 0x82, 0xCE, 0x69, 0x33, 0x7C, 0xF4, 0x66, 0xD6, 0x7D, 0x9D, 0xB5, 0x05, 0xDB, 0x04, 0xEC, 0x74, 0x0C, 0xD9, 0xD5, 0x38, 0x0E, 0xC9, 0x5D, 0x28, 0x60, 0x11, 0x27, 0x4A, 0xFD, 0xB8, 0x02, 0x80, 0x3F, 0x7C, 0xD7, 0xA0, 0xF1, 0x87, 0x00, 0x39, 0xC2, 0xEC, 0xB2, 0xEF 
-       }
-};
-
 /*Table XOR: 257x48 matrix containing pre-computed 384-bit words with HamD(a,b) >= 182 for each possible pair (a,b) with a != b*/
 static const uint8_t MHASH_384_TABLE_XOR[257U][MHASH_384_LEN] =
 {
@@ -656,9 +613,6 @@ mhash_384_t;
 /* FUNCTIONS (API)                                                          */
 /* ======================================================================== */
 
-/*Increment modulus N*/
-#define MHASH_384_INC_N(X,Y) do { if(++(X) >= (Y)) (X) = 0U; } while(0)
-
 /*Initialization*/
 static MHASH_384_INLINE void mhash_384_initialize(mhash_384_t *const ctx)
 {
@@ -673,13 +627,13 @@ static MHASH_384_INLINE void mhash_384_update(mhash_384_t *const ctx, const uint
        {
                uint8_t *const ptr_src = ctx->digest[(ctx->rnd + 0U) & 1U];
                uint8_t *const ptr_dst = ctx->digest[(ctx->rnd + 1U) & 1U];
-               const uint8_t *const ptr_xor = MHASH_384_TABLE_XOR[MHASH_384_TABLE_RND[0U][ctx->rnd] ^ input[k]];
-               const uint8_t *const ptr_mix = MHASH_384_TABLE_MIX[MHASH_384_TABLE_RND[1U][ctx->rnd] ^ input[k]];
+               const uint8_t *const ptr_xor = MHASH_384_TABLE_XOR[input[k]];
+               const uint8_t *const ptr_mix = MHASH_384_TABLE_MIX[ctx->rnd];
                for (i = 0; i < MHASH_384_LEN; ++i)
                {
                        ptr_dst[i] = ptr_src[ptr_mix[i]] ^ ptr_xor[i];
                }
-               MHASH_384_INC_N(ctx->rnd, MHASH_384_RND);
+               ctx->rnd = (ctx->rnd + 1U) & 0xFF;
        }
 }
 
@@ -695,8 +649,6 @@ static MHASH_384_INLINE void mhash_384_finalize(const mhash_384_t *const ctx, ui
        }
 }
 
-#undef MHASH_384_INC_N
-
 /* ======================================================================== */
 /* C++ WRAPPER CLASS                                                        */
 /* ======================================================================== */