Reformatage du code de référence

Pour que la comparaison avec la spécification soit plus évidente.

2 files changed, 119 insertions, 202 deletions

diff --git a/src/cipher.c b/src/cipher.c
index bb2d46a..e5ccd15 100644
--- a/src/cipher.c
+++ b/src/cipher.c
@@ -8,55 +8,35 @@
 
 enum permutation
 {
-    PERMUTATION_ENCRYPTION = 0,
-    PERMUTATION_DECRYPTION = 1,
+    PERMUTATION_ENCRYPTION = 0, /* PI(i) */
+    PERMUTATION_DECRYPTION = 1, /* PI^-1(i) */
     PERMUTATION_NONE
 };
 
 typedef enum permutation permutation;
 
 static const uint8_t PERMUTATIONS[2][BLOCK_BYTES] = {
-    /* PI(i) */
-    [0] = { 13, 9, 14, 8, 10, 11, 12, 15,
-            4,  5, 3,  1, 2,  6,  0,  7 },
-    /* PI^-1(i) */
-    [1] = { 14, 11, 12, 10, 8, 9, 13, 15,
-            3,  1,  4,  5,  6, 0, 2,  7 }
+    [PERMUTATION_ENCRYPTION] = { 13,  9, 14,  8, 10, 11, 12, 15,  4,  5,  3,  1,  2,  6,  0,  7 },
+    [PERMUTATION_DECRYPTION] = { 14, 11, 12, 10,  8,  9, 13, 15,  3,  1,  4,  5,  6,  0,  2,  7 }
 };
 
 static const uint8_t S[256] = {
-    32,  0,   178, 133, 59,  53,  166, 164,
-    48,  228, 106, 44,  255, 89,  226, 14,
-    248, 30,  122, 128, 21,  189, 62,  177,
-    232, 243, 162, 194, 218, 81,  42,  16,
-    33,  1,   35,  120, 92,  36,  39,  181,
-    55,  199, 43,  31,  174, 10,  119, 95,
-    111, 9,   157, 129, 4,   90,  41,  220,
-    57,  156, 5,   87,  151, 116, 121, 23,
-    68,  198, 230, 233, 221, 65,  242, 138,
-    84,  202, 110, 74,  225, 173, 182, 136,
-    28,  152, 126, 206, 99,  73,  58,  93,
-    12,  239, 246, 52,  86,  37,  46,  214,
-    103, 117, 85,  118, 184, 210, 97,  217,
-    113, 139, 205, 11,  114, 108, 49,  75,
-    105, 253, 123, 109, 96,  60,  47,  98,
-    63,  34,  115, 19,  201, 130, 127, 83,
-    50,  18,  160, 124, 2,   135, 132, 134,
-    147, 78,  104, 70,  141, 195, 219, 236,
-    155, 183, 137, 146, 167, 190, 61,  216,
-    234, 80,  145, 241, 51,  56,  224, 169,
-    163, 131, 161, 27,  207, 6,   149, 7,
-    158, 237, 185, 245, 76,  192, 244, 45,
-    22,  250, 180, 3,   38,  179, 144, 79,
-    171, 101, 252, 254, 20,  247, 227, 148,
-    238, 172, 140, 26,  222, 203, 40,  64,
-    125, 200, 196, 72,  107, 223, 165, 82,
-    229, 251, 215, 100, 249, 240, 211, 94,
-    102, 150, 143, 29,  69,  54,  204, 197,
-    77,  159, 191, 15,  209, 8,   235, 67,
-    66,  25,  231, 153, 168, 142, 88,  193,
-    154, 212, 24,  71,  170, 175, 188, 91,
-    213, 17,  208, 176, 112, 187, 13,  186
+    0x20, 0x00, 0xB2, 0x85, 0x3B, 0x35, 0xA6, 0xA4, 0x30, 0xE4, 0x6A, 0x2C, 0xFF, 0x59, 0xE2, 0x0E,
+    0xF8, 0x1E, 0x7A, 0x80, 0x15, 0xBD, 0x3E, 0xB1, 0xE8, 0xF3, 0xA2, 0xC2, 0xDA, 0x51, 0x2A, 0x10,
+    0x21, 0x01, 0x23, 0x78, 0x5C, 0x24, 0x27, 0xB5, 0x37, 0xC7, 0x2B, 0x1F, 0xAE, 0x0A, 0x77, 0x5F,
+    0x6F, 0x09, 0x9D, 0x81, 0x04, 0x5A, 0x29, 0xDC, 0x39, 0x9C, 0x05, 0x57, 0x97, 0x74, 0x79, 0x17,
+    0x44, 0xC6, 0xE6, 0xE9, 0xDD, 0x41, 0xF2, 0x8A, 0x54, 0xCA, 0x6E, 0x4A, 0xE1, 0xAD, 0xB6, 0x88,
+    0x1C, 0x98, 0x7E, 0xCE, 0x63, 0x49, 0x3A, 0x5D, 0x0C, 0xEF, 0xF6, 0x34, 0x56, 0x25, 0x2E, 0xD6,
+    0x67, 0x75, 0x55, 0x76, 0xB8, 0xD2, 0x61, 0xD9, 0x71, 0x8B, 0xCD, 0x0B, 0x72, 0x6C, 0x31, 0x4B,
+    0x69, 0xFD, 0x7B, 0x6D, 0x60, 0x3C, 0x2F, 0x62, 0x3F, 0x22, 0x73, 0x13, 0xC9, 0x82, 0x7F, 0x53,
+    0x32, 0x12, 0xA0, 0x7C, 0x02, 0x87, 0x84, 0x86, 0x93, 0x4E, 0x68, 0x46, 0x8D, 0xC3, 0xDB, 0xEC,
+    0x9B, 0xB7, 0x89, 0x92, 0xA7, 0xBE, 0x3D, 0xD8, 0xEA, 0x50, 0x91, 0xF1, 0x33, 0x38, 0xE0, 0xA9,
+    0xA3, 0x83, 0xA1, 0x1B, 0xCF, 0x06, 0x95, 0x07, 0x9E, 0xED, 0xB9, 0xF5, 0x4C, 0xC0, 0xF4, 0x2D,
+    0x16, 0xFA, 0xB4, 0x03, 0x26, 0xB3, 0x90, 0x4F, 0xAB, 0x65, 0xFC, 0xFE, 0x14, 0xF7, 0xE3, 0x94,
+    0xEE, 0xAC, 0x8C, 0x1A, 0xDE, 0xCB, 0x28, 0x40, 0x7D, 0xC8, 0xC4, 0x48, 0x6B, 0xDF, 0xA5, 0x52,
+    0xE5, 0xFB, 0xD7, 0x64, 0xF9, 0xF0, 0xD3, 0x5E, 0x66, 0x96, 0x8F, 0x1D, 0x45, 0x36, 0xCC, 0xC5,
+    0x4D, 0x9F, 0xBF, 0x0F, 0xD1, 0x08, 0xEB, 0x43, 0x42, 0x19, 0xE7, 0x99, 0xA8, 0x8E, 0x58, 0xC1,
+    0x9A, 0xD4, 0x18, 0x47, 0xAA, 0xAF, 0xBC, 0x5B, 0xD5, 0x11, 0xD0, 0xB0, 0x70, 0xBB, 0x0D, 0xBA
 };
 
 
diff --git a/src/tweakey.c b/src/tweakey.c
index 4b3896d..776352f 100644
--- a/src/tweakey.c
+++ b/src/tweakey.c
@@ -43,94 +43,101 @@ void tweakey_state_extract(
 }
 
 
+static const uint8_t M_1[256] = {
+    0x00, 0x08, 0x10, 0x18, 0x20, 0x28, 0x30, 0x38, 0x41, 0x49, 0x51, 0x59, 0x61, 0x69, 0x71, 0x79,
+    0x82, 0x8A, 0x92, 0x9A, 0xA2, 0xAA, 0xB2, 0xBA, 0xC3, 0xCB, 0xD3, 0xDB, 0xE3, 0xEB, 0xF3, 0xFB,
+    0x04, 0x0C, 0x14, 0x1C, 0x24, 0x2C, 0x34, 0x3C, 0x45, 0x4D, 0x55, 0x5D, 0x65, 0x6D, 0x75, 0x7D,
+    0x86, 0x8E, 0x96, 0x9E, 0xA6, 0xAE, 0xB6, 0xBE, 0xC7, 0xCF, 0xD7, 0xDF, 0xE7, 0xEF, 0xF7, 0xFF,
+    0x08, 0x00, 0x18, 0x10, 0x28, 0x20, 0x38, 0x30, 0x49, 0x41, 0x59, 0x51, 0x69, 0x61, 0x79, 0x71,
+    0x8A, 0x82, 0x9A, 0x92, 0xAA, 0xA2, 0xBA, 0xB2, 0xCB, 0xC3, 0xDB, 0xD3, 0xEB, 0xE3, 0xFB, 0xF3,
+    0x0C, 0x04, 0x1C, 0x14, 0x2C, 0x24, 0x3C, 0x34, 0x4D, 0x45, 0x5D, 0x55, 0x6D, 0x65, 0x7D, 0x75,
+    0x8E, 0x86, 0x9E, 0x96, 0xAE, 0xA6, 0xBE, 0xB6, 0xCF, 0xC7, 0xDF, 0xD7, 0xEF, 0xE7, 0xFF, 0xF7,
+    0x10, 0x18, 0x00, 0x08, 0x30, 0x38, 0x20, 0x28, 0x51, 0x59, 0x41, 0x49, 0x71, 0x79, 0x61, 0x69,
+    0x92, 0x9A, 0x82, 0x8A, 0xB2, 0xBA, 0xA2, 0xAA, 0xD3, 0xDB, 0xC3, 0xCB, 0xF3, 0xFB, 0xE3, 0xEB,
+    0x14, 0x1C, 0x04, 0x0C, 0x34, 0x3C, 0x24, 0x2C, 0x55, 0x5D, 0x45, 0x4D, 0x75, 0x7D, 0x65, 0x6D,
+    0x96, 0x9E, 0x86, 0x8E, 0xB6, 0xBE, 0xA6, 0xAE, 0xD7, 0xDF, 0xC7, 0xCF, 0xF7, 0xFF, 0xE7, 0xEF,
+    0x18, 0x10, 0x08, 0x00, 0x38, 0x30, 0x28, 0x20, 0x59, 0x51, 0x49, 0x41, 0x79, 0x71, 0x69, 0x61,
+    0x9A, 0x92, 0x8A, 0x82, 0xBA, 0xB2, 0xAA, 0xA2, 0xDB, 0xD3, 0xCB, 0xC3, 0xFB, 0xF3, 0xEB, 0xE3,
+    0x1C, 0x14, 0x0C, 0x04, 0x3C, 0x34, 0x2C, 0x24, 0x5D, 0x55, 0x4D, 0x45, 0x7D, 0x75, 0x6D, 0x65,
+    0x9E, 0x96, 0x8E, 0x86, 0xBE, 0xB6, 0xAE, 0xA6, 0xDF, 0xD7, 0xCF, 0xC7, 0xFF, 0xF7, 0xEF, 0xE7
+};
+
+static const uint8_t M_2[256] = {
+    0x00, 0x40, 0x80, 0xC0, 0x00, 0x40, 0x80, 0xC0, 0x08, 0x48, 0x88, 0xC8, 0x08, 0x48, 0x88, 0xC8,
+    0x10, 0x50, 0x90, 0xD0, 0x10, 0x50, 0x90, 0xD0, 0x18, 0x58, 0x98, 0xD8, 0x18, 0x58, 0x98, 0xD8,
+    0x20, 0x60, 0xA0, 0xE0, 0x20, 0x60, 0xA0, 0xE0, 0x28, 0x68, 0xA8, 0xE8, 0x28, 0x68, 0xA8, 0xE8,
+    0x30, 0x70, 0xB0, 0xF0, 0x30, 0x70, 0xB0, 0xF0, 0x38, 0x78, 0xB8, 0xF8, 0x38, 0x78, 0xB8, 0xF8,
+    0x41, 0x01, 0xC1, 0x81, 0x41, 0x01, 0xC1, 0x81, 0x49, 0x09, 0xC9, 0x89, 0x49, 0x09, 0xC9, 0x89,
+    0x51, 0x11, 0xD1, 0x91, 0x51, 0x11, 0xD1, 0x91, 0x59, 0x19, 0xD9, 0x99, 0x59, 0x19, 0xD9, 0x99,
+    0x61, 0x21, 0xE1, 0xA1, 0x61, 0x21, 0xE1, 0xA1, 0x69, 0x29, 0xE9, 0xA9, 0x69, 0x29, 0xE9, 0xA9,
+    0x71, 0x31, 0xF1, 0xB1, 0x71, 0x31, 0xF1, 0xB1, 0x79, 0x39, 0xF9, 0xB9, 0x79, 0x39, 0xF9, 0xB9,
+    0x82, 0xC2, 0x02, 0x42, 0x82, 0xC2, 0x02, 0x42, 0x8A, 0xCA, 0x0A, 0x4A, 0x8A, 0xCA, 0x0A, 0x4A,
+    0x92, 0xD2, 0x12, 0x52, 0x92, 0xD2, 0x12, 0x52, 0x9A, 0xDA, 0x1A, 0x5A, 0x9A, 0xDA, 0x1A, 0x5A,
+    0xA2, 0xE2, 0x22, 0x62, 0xA2, 0xE2, 0x22, 0x62, 0xAA, 0xEA, 0x2A, 0x6A, 0xAA, 0xEA, 0x2A, 0x6A,
+    0xB2, 0xF2, 0x32, 0x72, 0xB2, 0xF2, 0x32, 0x72, 0xBA, 0xFA, 0x3A, 0x7A, 0xBA, 0xFA, 0x3A, 0x7A,
+    0xC3, 0x83, 0x43, 0x03, 0xC3, 0x83, 0x43, 0x03, 0xCB, 0x8B, 0x4B, 0x0B, 0xCB, 0x8B, 0x4B, 0x0B,
+    0xD3, 0x93, 0x53, 0x13, 0xD3, 0x93, 0x53, 0x13, 0xDB, 0x9B, 0x5B, 0x1B, 0xDB, 0x9B, 0x5B, 0x1B,
+    0xE3, 0xA3, 0x63, 0x23, 0xE3, 0xA3, 0x63, 0x23, 0xEB, 0xAB, 0x6B, 0x2B, 0xEB, 0xAB, 0x6B, 0x2B,
+    0xF3, 0xB3, 0x73, 0x33, 0xF3, 0xB3, 0x73, 0x33, 0xFB, 0xBB, 0x7B, 0x3B, 0xFB, 0xBB, 0x7B, 0x3B
+};
+
+static const uint8_t M_3[256] = {
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F
+};
+
+static const uint8_t M_4[256] = {
+    0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07,
+    0x08, 0x08, 0x09, 0x09, 0x0A, 0x0A, 0x0B, 0x0B, 0x0C, 0x0C, 0x0D, 0x0D, 0x0E, 0x0E, 0x0F, 0x0F,
+    0x10, 0x10, 0x11, 0x11, 0x12, 0x12, 0x13, 0x13, 0x14, 0x14, 0x15, 0x15, 0x16, 0x16, 0x17, 0x17,
+    0x18, 0x18, 0x19, 0x19, 0x1A, 0x1A, 0x1B, 0x1B, 0x1C, 0x1C, 0x1D, 0x1D, 0x1E, 0x1E, 0x1F, 0x1F,
+    0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07,
+    0x08, 0x08, 0x09, 0x09, 0x0A, 0x0A, 0x0B, 0x0B, 0x0C, 0x0C, 0x0D, 0x0D, 0x0E, 0x0E, 0x0F, 0x0F,
+    0x10, 0x10, 0x11, 0x11, 0x12, 0x12, 0x13, 0x13, 0x14, 0x14, 0x15, 0x15, 0x16, 0x16, 0x17, 0x17,
+    0x18, 0x18, 0x19, 0x19, 0x1A, 0x1A, 0x1B, 0x1B, 0x1C, 0x1C, 0x1D, 0x1D, 0x1E, 0x1E, 0x1F, 0x1F,
+    0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07,
+    0x08, 0x08, 0x09, 0x09, 0x0A, 0x0A, 0x0B, 0x0B, 0x0C, 0x0C, 0x0D, 0x0D, 0x0E, 0x0E, 0x0F, 0x0F,
+    0x10, 0x10, 0x11, 0x11, 0x12, 0x12, 0x13, 0x13, 0x14, 0x14, 0x15, 0x15, 0x16, 0x16, 0x17, 0x17,
+    0x18, 0x18, 0x19, 0x19, 0x1A, 0x1A, 0x1B, 0x1B, 0x1C, 0x1C, 0x1D, 0x1D, 0x1E, 0x1E, 0x1F, 0x1F,
+    0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07,
+    0x08, 0x08, 0x09, 0x09, 0x0A, 0x0A, 0x0B, 0x0B, 0x0C, 0x0C, 0x0D, 0x0D, 0x0E, 0x0E, 0x0F, 0x0F,
+    0x10, 0x10, 0x11, 0x11, 0x12, 0x12, 0x13, 0x13, 0x14, 0x14, 0x15, 0x15, 0x16, 0x16, 0x17, 0x17,
+    0x18, 0x18, 0x19, 0x19, 0x1A, 0x1A, 0x1B, 0x1B, 0x1C, 0x1C, 0x1D, 0x1D, 0x1E, 0x1E, 0x1F, 0x1F
+};
+
+
 static void _multiply_M(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES])
 {
     Y[7] = X[6];
     Y[6] = X[5];
-    Y[5] = X[4] ^ X[5]<<3;
-    Y[4] = X[3] ^ X[4]>>3;
+    Y[5] = X[5]<<3 ^ X[4];
+    Y[4] = X[4]>>3 ^ X[3];
     Y[3] = X[2];
-    Y[2] = X[1] ^ X[6]<<2;
+    Y[2] = X[6]<<2 ^ X[1];
     Y[1] = X[0];
     Y[0] = X[7];
 }
 
-static const uint8_t M1[256] = {
-    0x00, 0x08, 0x10, 0x18, 0x20, 0x28, 0x30, 0x38,
-    0x41, 0x49, 0x51, 0x59, 0x61, 0x69, 0x71, 0x79,
-    0x82, 0x8a, 0x92, 0x9a, 0xa2, 0xaa, 0xb2, 0xba,
-    0xc3, 0xcb, 0xd3, 0xdb, 0xe3, 0xeb, 0xf3, 0xfb,
-    0x04, 0x0c, 0x14, 0x1c, 0x24, 0x2c, 0x34, 0x3c,
-    0x45, 0x4d, 0x55, 0x5d, 0x65, 0x6d, 0x75, 0x7d,
-    0x86, 0x8e, 0x96, 0x9e, 0xa6, 0xae, 0xb6, 0xbe,
-    0xc7, 0xcf, 0xd7, 0xdf, 0xe7, 0xef, 0xf7, 0xff,
-    0x08, 0x00, 0x18, 0x10, 0x28, 0x20, 0x38, 0x30,
-    0x49, 0x41, 0x59, 0x51, 0x69, 0x61, 0x79, 0x71,
-    0x8a, 0x82, 0x9a, 0x92, 0xaa, 0xa2, 0xba, 0xb2,
-    0xcb, 0xc3, 0xdb, 0xd3, 0xeb, 0xe3, 0xfb, 0xf3,
-    0x0c, 0x04, 0x1c, 0x14, 0x2c, 0x24, 0x3c, 0x34,
-    0x4d, 0x45, 0x5d, 0x55, 0x6d, 0x65, 0x7d, 0x75,
-    0x8e, 0x86, 0x9e, 0x96, 0xae, 0xa6, 0xbe, 0xb6,
-    0xcf, 0xc7, 0xdf, 0xd7, 0xef, 0xe7, 0xff, 0xf7,
-    0x10, 0x18, 0x00, 0x08, 0x30, 0x38, 0x20, 0x28,
-    0x51, 0x59, 0x41, 0x49, 0x71, 0x79, 0x61, 0x69,
-    0x92, 0x9a, 0x82, 0x8a, 0xb2, 0xba, 0xa2, 0xaa,
-    0xd3, 0xdb, 0xc3, 0xcb, 0xf3, 0xfb, 0xe3, 0xeb,
-    0x14, 0x1c, 0x04, 0x0c, 0x34, 0x3c, 0x24, 0x2c,
-    0x55, 0x5d, 0x45, 0x4d, 0x75, 0x7d, 0x65, 0x6d,
-    0x96, 0x9e, 0x86, 0x8e, 0xb6, 0xbe, 0xa6, 0xae,
-    0xd7, 0xdf, 0xc7, 0xcf, 0xf7, 0xff, 0xe7, 0xef,
-    0x18, 0x10, 0x08, 0x00, 0x38, 0x30, 0x28, 0x20,
-    0x59, 0x51, 0x49, 0x41, 0x79, 0x71, 0x69, 0x61,
-    0x9a, 0x92, 0x8a, 0x82, 0xba, 0xb2, 0xaa, 0xa2,
-    0xdb, 0xd3, 0xcb, 0xc3, 0xfb, 0xf3, 0xeb, 0xe3,
-    0x1c, 0x14, 0x0c, 0x04, 0x3c, 0x34, 0x2c, 0x24,
-    0x5d, 0x55, 0x4d, 0x45, 0x7d, 0x75, 0x6d, 0x65,
-    0x9e, 0x96, 0x8e, 0x86, 0xbe, 0xb6, 0xae, 0xa6,
-    0xdf, 0xd7, 0xcf, 0xc7, 0xff, 0xf7, 0xef, 0xe7
-};
-
-static const uint8_t M2[256] = {
-    0x00, 0x40, 0x80, 0xc0, 0x00, 0x40, 0x80, 0xc0,
-    0x08, 0x48, 0x88, 0xc8, 0x08, 0x48, 0x88, 0xc8,
-    0x10, 0x50, 0x90, 0xd0, 0x10, 0x50, 0x90, 0xd0,
-    0x18, 0x58, 0x98, 0xd8, 0x18, 0x58, 0x98, 0xd8,
-    0x20, 0x60, 0xa0, 0xe0, 0x20, 0x60, 0xa0, 0xe0,
-    0x28, 0x68, 0xa8, 0xe8, 0x28, 0x68, 0xa8, 0xe8,
-    0x30, 0x70, 0xb0, 0xf0, 0x30, 0x70, 0xb0, 0xf0,
-    0x38, 0x78, 0xb8, 0xf8, 0x38, 0x78, 0xb8, 0xf8,
-    0x41, 0x01, 0xc1, 0x81, 0x41, 0x01, 0xc1, 0x81,
-    0x49, 0x09, 0xc9, 0x89, 0x49, 0x09, 0xc9, 0x89,
-    0x51, 0x11, 0xd1, 0x91, 0x51, 0x11, 0xd1, 0x91,
-    0x59, 0x19, 0xd9, 0x99, 0x59, 0x19, 0xd9, 0x99,
-    0x61, 0x21, 0xe1, 0xa1, 0x61, 0x21, 0xe1, 0xa1,
-    0x69, 0x29, 0xe9, 0xa9, 0x69, 0x29, 0xe9, 0xa9,
-    0x71, 0x31, 0xf1, 0xb1, 0x71, 0x31, 0xf1, 0xb1,
-    0x79, 0x39, 0xf9, 0xb9, 0x79, 0x39, 0xf9, 0xb9,
-    0x82, 0xc2, 0x02, 0x42, 0x82, 0xc2, 0x02, 0x42,
-    0x8a, 0xca, 0x0a, 0x4a, 0x8a, 0xca, 0x0a, 0x4a,
-    0x92, 0xd2, 0x12, 0x52, 0x92, 0xd2, 0x12, 0x52,
-    0x9a, 0xda, 0x1a, 0x5a, 0x9a, 0xda, 0x1a, 0x5a,
-    0xa2, 0xe2, 0x22, 0x62, 0xa2, 0xe2, 0x22, 0x62,
-    0xaa, 0xea, 0x2a, 0x6a, 0xaa, 0xea, 0x2a, 0x6a,
-    0xb2, 0xf2, 0x32, 0x72, 0xb2, 0xf2, 0x32, 0x72,
-    0xba, 0xfa, 0x3a, 0x7a, 0xba, 0xfa, 0x3a, 0x7a,
-    0xc3, 0x83, 0x43, 0x03, 0xc3, 0x83, 0x43, 0x03,
-    0xcb, 0x8b, 0x4b, 0x0b, 0xcb, 0x8b, 0x4b, 0x0b,
-    0xd3, 0x93, 0x53, 0x13, 0xd3, 0x93, 0x53, 0x13,
-    0xdb, 0x9b, 0x5b, 0x1b, 0xdb, 0x9b, 0x5b, 0x1b,
-    0xe3, 0xa3, 0x63, 0x23, 0xe3, 0xa3, 0x63, 0x23,
-    0xeb, 0xab, 0x6b, 0x2b, 0xeb, 0xab, 0x6b, 0x2b,
-    0xf3, 0xb3, 0x73, 0x33, 0xf3, 0xb3, 0x73, 0x33,
-    0xfb, 0xbb, 0x7b, 0x3b, 0xfb, 0xbb, 0x7b, 0x3b
-};
-
 static void _multiply_M2(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES])
 {
     Y[7] = X[5];
-    Y[6] = X[4]    ^ X[5]<<3;
-    Y[5] = X[3]    ^ M1[X[4]] ^ X[5]<<6;
-    Y[4] = X[2]    ^ X[3]>>3    ^ X[4]>>6;
+    Y[6] = X[5]<<3 ^ X[4];
+    Y[5] = X[5]<<6 ^ M_1[X[4]] ^ X[3];
+    Y[4] = X[4]>>6 ^ X[3]>>3   ^ X[2];
     Y[3] = X[6]<<2 ^ X[1];
     Y[2] = X[5]<<2 ^ X[0];
     Y[1] = X[7];
@@ -139,94 +146,24 @@ static void _multiply_M2(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES])
 
 static void _multiply_M3(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES])
 {
-    Y[7] = X[5]<<3  ^ X[4];
-    Y[6] = X[5]<<6  ^ M1[X[4]] ^ X[3];
-    Y[5] = M2[X[4]] ^ M1[X[3]] ^ X[2];
-    Y[4] = X[6]<<2  ^ X[3]>>6  ^ X[2]>>3 ^ X[1];
-    Y[3] = X[5]<<2  ^ X[0];
-    Y[2] = X[7]     ^ X[5]<<5  ^ X[4]<<2;
+    Y[7] = X[5]<<3   ^ X[4];
+    Y[6] = X[5]<<6   ^ M_1[X[4]] ^ X[3];
+    Y[5] = M_2[X[4]] ^ M_1[X[3]] ^ X[2];
+    Y[4] = X[6]<<2   ^ X[3]>>6   ^ X[2]>>3 ^ X[1];
+    Y[3] = X[5]<<2   ^ X[0];
+    Y[2] = X[7]      ^ X[5]<<5   ^ X[4]<<2;
     Y[1] = X[6];
     Y[0] = X[5];
 }
 
-static const uint8_t M3[256] = {
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f
-};
-
-static const uint8_t M4[256] = {
-    0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03,
-    0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07,
-    0x08, 0x08, 0x09, 0x09, 0x0a, 0x0a, 0x0b, 0x0b,
-    0x0c, 0x0c, 0x0d, 0x0d, 0x0e, 0x0e, 0x0f, 0x0f,
-    0x10, 0x10, 0x11, 0x11, 0x12, 0x12, 0x13, 0x13,
-    0x14, 0x14, 0x15, 0x15, 0x16, 0x16, 0x17, 0x17,
-    0x18, 0x18, 0x19, 0x19, 0x1a, 0x1a, 0x1b, 0x1b,
-    0x1c, 0x1c, 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f,
-    0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03,
-    0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07,
-    0x08, 0x08, 0x09, 0x09, 0x0a, 0x0a, 0x0b, 0x0b,
-    0x0c, 0x0c, 0x0d, 0x0d, 0x0e, 0x0e, 0x0f, 0x0f,
-    0x10, 0x10, 0x11, 0x11, 0x12, 0x12, 0x13, 0x13,
-    0x14, 0x14, 0x15, 0x15, 0x16, 0x16, 0x17, 0x17,
-    0x18, 0x18, 0x19, 0x19, 0x1a, 0x1a, 0x1b, 0x1b,
-    0x1c, 0x1c, 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f,
-    0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03,
-    0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07,
-    0x08, 0x08, 0x09, 0x09, 0x0a, 0x0a, 0x0b, 0x0b,
-    0x0c, 0x0c, 0x0d, 0x0d, 0x0e, 0x0e, 0x0f, 0x0f,
-    0x10, 0x10, 0x11, 0x11, 0x12, 0x12, 0x13, 0x13,
-    0x14, 0x14, 0x15, 0x15, 0x16, 0x16, 0x17, 0x17,
-    0x18, 0x18, 0x19, 0x19, 0x1a, 0x1a, 0x1b, 0x1b,
-    0x1c, 0x1c, 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f,
-    0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03,
-    0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07,
-    0x08, 0x08, 0x09, 0x09, 0x0a, 0x0a, 0x0b, 0x0b,
-    0x0c, 0x0c, 0x0d, 0x0d, 0x0e, 0x0e, 0x0f, 0x0f,
-    0x10, 0x10, 0x11, 0x11, 0x12, 0x12, 0x13, 0x13,
-    0x14, 0x14, 0x15, 0x15, 0x16, 0x16, 0x17, 0x17,
-    0x18, 0x18, 0x19, 0x19, 0x1a, 0x1a, 0x1b, 0x1b,
-    0x1c, 0x1c, 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f
-};
-
 static void _multiply_MR(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES])
 {
     Y[0] = X[1];
     Y[1] = X[2];
-    Y[2] = X[3] ^ X[4]>>3;
+    Y[2] = X[3]    ^ X[4]>>3;
     Y[3] = X[4];
-    Y[4] = X[5] ^ X[6]<<3;
-    Y[5] = X[6] ^ X[3]<<2;
+    Y[4] = X[5]    ^ X[6]<<3;
+    Y[5] = X[3]<<2 ^ X[6];
     Y[6] = X[7];
     Y[7] = X[0];
 }
@@ -235,7 +172,7 @@ static void _multiply_MR2(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES])
 {
     Y[0] = X[2];
     Y[1] = X[3]    ^ X[4]>>3;
-    Y[2] = X[4]    ^ X[5]>>3 ^ M3[X[6]];
+    Y[2] = X[4]    ^ X[5]>>3 ^ M_3[X[6]];
     Y[3] = X[5]    ^ X[6]<<3;
     Y[4] = X[3]<<2 ^ X[6]    ^ X[7]<<3;
     Y[5] = X[4]<<2 ^ X[7];
@@ -245,12 +182,12 @@ static void _multiply_MR2(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES])
 
 static void _multiply_MR3(const uint8_t X[LANE_BYTES], uint8_t Y[LANE_BYTES])
 {
-    Y[0] = X[3]     ^ X[4]>>3;
-    Y[1] = X[4]     ^ X[5]>>3 ^ M3[X[6]];
-    Y[2] = M4[X[3]] ^ X[5]    ^ M1[X[6]] ^ M3[X[7]];
-    Y[3] = X[3]<<2  ^ X[6]    ^ X[7]<<3;
-    Y[4] = X[0]<<3  ^ X[4]<<2 ^ X[7];
-    Y[5] = X[0]     ^ X[5]<<2 ^ X[6]<<5;
+    Y[0] = X[3]      ^ X[4]>>3;
+    Y[1] = X[4]      ^ X[5]>>3 ^ M_3[X[6]];
+    Y[2] = M_4[X[3]] ^ X[5]    ^ M_1[X[6]] ^ M_3[X[7]];
+    Y[3] = X[3]<<2   ^ X[6]    ^ X[7]<<3;
+    Y[4] = X[0]<<3   ^ X[4]<<2 ^ X[7];
+    Y[5] = X[0]      ^ X[5]<<2 ^ X[6]<<5;
     Y[6] = X[1];
     Y[7] = X[2];
 }