Added MHASH_384_TABLE_RND to computation.

diff --git a/etc/bin/table_RND.txt b/etc/bin/table_RND.txt
new file mode 100644 (file)
index 0000000..c5b6cc5
--- /dev/null
+++ b/etc/bin/table_RND.txt
@@ -0,0 +1,5 @@
+uint8_t MHASH_384_TABLE_RND[2][256U] =
+{
+       { 0xA0,0x29,0x11,0x79,0x49,0x3A,0xF5,0xCF,0xBE,0xD9,0x9F,0x41,0xC0,0xC4,0x95,0xDF,0x12,0xC7,0xEC,0x36,0x38,0x65,0x58,0xAE,0x8D,0xA4,0xAF,0x06,0xC1,0x61,0x35,0xFF,0x0A,0x07,0xA2,0xF4,0xB9,0x4D,0x1A,0xBB,0xD4,0x52,0x80,0xE5,0x02,0x77,0xDB,0x7D,0x64,0xF2,0xB1,0xFD,0xDD,0x6F,0x83,0xF3,0x60,0xBD,0xE9,0x03,0x92,0xCE,0xD5,0xB4,0x1D,0x99,0x19,0x81,0x6B,0x87,0xD1,0xB7,0xFB,0xE6,0x68,0xEE,0x5B,0x31,0x46,0xE4,0x32,0x88,0xF1,0x9C,0xF8,0x00,0x6A,0x90,0x96,0x27,0xA1,0xB2,0x97,0x4E,0x26,0xC2,0xBC,0x72,0x30,0x3C,0xD2,0x2B,0x8A,0x18,0x50,0x70,0xF9,0x8B,0x76,0x14,0x5A,0x13,0x62,0x01,0xA6,0x75,0xDE,0x59,0x5F,0xB8,0x53,0x56,0xD6,0xD7,0xC8,0x86,0x3F,0x3B,0x74,0x15,0x21,0x6D,0x17,0xAB,0xAA,0x1F,0xB0,0xB5,0x2F,0x1C,0x9E,0xA9,0xFC,0xB6,0xE3,0xA5,0x8E,0xD0,0xD3,0x05,0x0E,0x8F,0xC3,0xCA,0x33,0x0F,0xAD,0x04,0xBF,0x34,0xE2,0x51,0xFA,0xF6,0x8C,0x47,0xED,0x0D,0x63,0x9D,0x20,0x1B,0xA7,0x6E,0x93,0x22,0x44,0x69,0xCC,0xEB,0x91,0x0B,0x0C,0xE7,0xA8,0x85,0xCD,0xC6,0x66,0x54,0x98,0x09,0xAC,0x7B,0x2C,0x4C,0x2D,0x4B,0x08,0xEA,0x28,0x5C,0x3D,0x24,0x73,0xE1,0xD8,0x37,0x43,0x40,0x16,0x71,0xF7,0x89,0x82,0x94,0xC5,0x57,0xFE,0x7E,0x6C,0x7F,0x78,0xDA,0x48,0x55,0x5E,0x25,0x84,0x67,0x7C,0x9A,0x2E,0x10,0x2A,0x4F,0xBA,0x39,0xE0,0xA3,0x1E,0x5D,0x7A,0xF0,0xB3,0xCB,0xE8,0x9B,0xEF,0xDC,0x3E,0x23,0xC9,0x45,0x4A,0x42 }, /*0*/
+       { 0xBE,0x42,0x9C,0x51,0xF0,0x34,0x13,0x92,0xCA,0x38,0x8C,0x71,0xAD,0x23,0xD9,0x0F,0x97,0x39,0x12,0xF5,0xE6,0xC9,0xB5,0x0A,0x57,0x8B,0x0C,0x85,0x64,0x3F,0x1E,0x21,0xA4,0x30,0x5E,0x6C,0x46,0x93,0xFF,0x53,0xEF,0x20,0xC7,0xFB,0xE4,0x8D,0x91,0xAB,0x4C,0xCE,0x19,0x36,0xF4,0x14,0x3D,0x5C,0x50,0x03,0x3B,0xAC,0xE9,0x22,0x3E,0xDC,0x7F,0x7D,0x28,0x9E,0xE1,0x2D,0x79,0xDB,0x8A,0xEA,0xC0,0x8F,0xC2,0xA6,0xE5,0xFE,0x44,0xDF,0x1B,0x41,0x95,0x29,0x75,0x24,0x27,0xDE,0x1A,0xA1,0x69,0xC1,0xBB,0x5D,0xA3,0x88,0xCC,0x43,0x59,0x87,0x65,0xA5,0x4A,0x1C,0x00,0xF1,0x9B,0x2B,0x04,0xC6,0xDD,0x56,0x45,0xE8,0x73,0x8E,0xF3,0xBD,0xC8,0x26,0x09,0x08,0xD2,0xEE,0xBA,0xEB,0x2E,0xFC,0x82,0x3C,0xBC,0xF7,0x84,0x96,0xEC,0xD8,0xC4,0xFD,0x89,0x07,0x15,0x40,0x66,0x98,0x49,0x7E,0xCB,0xB4,0x70,0x7B,0x60,0xF6,0xB0,0xF8,0xFA,0x5A,0x68,0x4B,0xD3,0xAE,0x54,0x99,0x11,0xD4,0x32,0x72,0xE0,0xAA,0xF2,0xD1,0x67,0xAF,0x6E,0x7A,0xD7,0x83,0xB9,0x77,0x7C,0x35,0xE2,0x62,0xB7,0xA8,0x6A,0x17,0x52,0x81,0x18,0xB3,0xC5,0x48,0xA9,0xA0,0x4D,0x37,0x2F,0xD5,0x6D,0x78,0x58,0x0B,0x0D,0x55,0xB2,0x94,0x1F,0x2A,0x6F,0x4E,0x6B,0x74,0x2C,0x3A,0x80,0x90,0xB1,0x33,0xC3,0x25,0xA7,0x4F,0x5F,0x01,0xD0,0x9A,0x1D,0x86,0xCF,0xCD,0x16,0xDA,0x05,0xB8,0xE7,0xBF,0x0E,0x10,0x47,0x06,0xED,0xD6,0x61,0x02,0x76,0x63,0xA2,0x5B,0xF9,0x9D,0x31,0xB6,0xE3,0x9F }  /*1*/
+};

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

diff --git a/src/self_test.h b/src/self_test.h
index 842ee04..9769425 100644 (file)
--- a/src/self_test.h
+++ b/src/self_test.h
@@ -91,7 +91,7 @@ static const uint8_t TEST_RESULT[][MHASH_384_LEN] =
 
 static MHASH_384_INLINE uint32_t test_distance_xor(const uint8_t *const a, const uint8_t *const b)
 {
-       uint32_t k, distance = 0;
+       uint_fast32_t k, distance = 0;
        for (k = 0; k < MHASH_384_LEN; k++)
        {
                uint8_t c = a[k] ^ b[k];
@@ -106,7 +106,7 @@ static MHASH_384_INLINE uint32_t test_distance_xor(const uint8_t *const a, const
 
 static MHASH_384_INLINE uint32_t test_distance_mix(const uint8_t *const a, const uint8_t *const b)
 {
-       uint32_t k, distance = 0;
+       uint_fast32_t k, distance = 0;
        for (k = 0; k < MHASH_384_LEN; ++k)
        {
                if (a[k] != b[k])
@@ -119,12 +119,35 @@ static MHASH_384_INLINE uint32_t test_distance_mix(const uint8_t *const a, const
 
 static int self_test(void)
 {
-       uint_fast32_t i, j;
+       uint_fast32_t i, j, k;
        uint8_t result[MHASH_384_LEN];
        mhash_384_t context;
 
+       /*test RND table*/
+       fprintf(stderr, "Self-test, step 1 of 4 running...\n");
+       for (i = 0U; i < 256U; i++)
+       {
+               MY_ASSERT((MHASH_384_TABLE_RND[0U][i] != MHASH_384_TABLE_RND[1U][i]), "RND table verification failed");
+       }
+       for (i = 0U; i < 2U; i++)
+       {
+               for (j = 0U; j < 256U; j++)
+               {
+                       int found = 0;
+                       for (k = 0U; k < 256U; k++)
+                       {
+                               if (MHASH_384_TABLE_RND[i][k] == (uint8_t)j)
+                               {
+                                       MY_ASSERT((!found), "RND table verification failed");
+                                       found = 1;
+                               }
+                       }
+                       MY_ASSERT(found, "RND table verification failed");
+               }
+       }
+
        /*test XOR table*/
-       fprintf(stderr, "Self-test, step 1 of 3 running...\n");
+       fprintf(stderr, "Self-test, step 2 of 4 running...\n");
        for (i = 0U; i < 257U; i++)
        {
                for (j = 0U; j < 257U; j++)
@@ -142,7 +165,7 @@ static int self_test(void)
        }
 
        /*test MIX table*/
-       fprintf(stderr, "Self-test, step 2 of 3 running...\n");
+       fprintf(stderr, "Self-test, step 3 of 4 running...\n");
        for (i = 0U; i < 256U; i++)
        {
                for (j = 0U; j < 256U; j++)
@@ -167,7 +190,7 @@ static int self_test(void)
        }
 
        /*test hash function*/
-       fprintf(stderr, "Self-test, step 3 of 3 running...\n");
+       fprintf(stderr, "Self-test, step 4 of 4 running...\n");
        for (i = 0; TEST_VECTOR[i].str; ++i)
        {
                fprintf(stderr, "VECTOR[%X]: ...", (unsigned int)i);