diff options
| -rw-r--r-- | traces/traces-ae.patch | 18 | ||||
| -rw-r--r-- | traces/traces-tbc.patch | 30 |
2 files changed, 24 insertions, 24 deletions
diff --git a/traces/traces-ae.patch b/traces/traces-ae.patch index 8aecdf6..476c457 100644 --- a/traces/traces-ae.patch +++ b/traces/traces-ae.patch @@ -1,7 +1,7 @@ -diff --git a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ae-common.h b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ae-common.h +diff --git a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/ae-common.h b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/ae-common.h index 561854e..397dac0 100644 ---- a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ae-common.h -+++ b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ae-common.h +--- a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/ae-common.h ++++ b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/ae-common.h @@ -1,3 +1,5 @@ +#include "debug.h" + @@ -54,10 +54,10 @@ index 561854e..397dac0 100644 } } -diff --git a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/lilliput-ae-i.c b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/lilliput-ae-i.c +diff --git a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-i.c b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-i.c index b1758c9..5cbb3f4 100644 ---- a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/lilliput-ae-i.c -+++ b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/lilliput-ae-i.c +--- a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-i.c ++++ b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-i.c @@ -1,3 +1,5 @@ +#include "debug.h" + @@ -188,10 +188,10 @@ index b1758c9..5cbb3f4 100644 } -diff --git a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/lilliput-ae-ii.c b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/lilliput-ae-ii.c +diff --git a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-ii.c b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-ii.c index 26885e5..88f9ae0 100644 ---- a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/lilliput-ae-ii.c -+++ b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/lilliput-ae-ii.c +--- a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-ii.c ++++ b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/lilliput-ae-ii.c @@ -1,3 +1,5 @@ +#include "debug.h" + diff --git a/traces/traces-tbc.patch b/traces/traces-tbc.patch index 524ae06..9f8b9af 100644 --- a/traces/traces-tbc.patch +++ b/traces/traces-tbc.patch @@ -1,14 +1,14 @@ -diff --git a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/cipher.c b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/cipher.c -index bb2d46a..028d4e2 100644 ---- a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/cipher.c -+++ b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/cipher.c +diff --git a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/cipher.c b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/cipher.c +index e5ccd15..0749f8c 100644 +--- a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/cipher.c ++++ b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/cipher.c @@ -1,3 +1,5 @@ +#include "debug.h" + #include <stdint.h> #include <string.h> -@@ -72,40 +74,61 @@ static void _compute_round_tweakeys( +@@ -52,40 +54,61 @@ static void _compute_round_tweakeys( uint8_t RTK[ROUNDS][ROUND_TWEAKEY_BYTES] ) { @@ -70,7 +70,7 @@ index bb2d46a..028d4e2 100644 X[15] ^= X[1]; X[15] ^= X[2]; X[15] ^= X[3]; -@@ -120,6 +143,8 @@ static void _linear_layer(uint8_t X[BLOCK_BYTES]) +@@ -100,6 +123,8 @@ static void _linear_layer(uint8_t X[BLOCK_BYTES]) X[11] ^= X[7]; X[10] ^= X[7]; X[9] ^= X[7]; @@ -79,7 +79,7 @@ index bb2d46a..028d4e2 100644 } static void _permutation_layer(uint8_t X[BLOCK_BYTES], permutation p) -@@ -129,6 +154,8 @@ static void _permutation_layer(uint8_t X[BLOCK_BYTES], permutation p) +@@ -109,6 +134,8 @@ static void _permutation_layer(uint8_t X[BLOCK_BYTES], permutation p) return; } @@ -88,7 +88,7 @@ index bb2d46a..028d4e2 100644 uint8_t X_old[BLOCK_BYTES]; memcpy(X_old, X, BLOCK_BYTES); -@@ -138,6 +165,8 @@ static void _permutation_layer(uint8_t X[BLOCK_BYTES], permutation p) +@@ -118,6 +145,8 @@ static void _permutation_layer(uint8_t X[BLOCK_BYTES], permutation p) { X[pi[j]] = X_old[j]; } @@ -97,7 +97,7 @@ index bb2d46a..028d4e2 100644 } static void _one_round_egfn(uint8_t X[BLOCK_BYTES], const uint8_t RTK[ROUND_TWEAKEY_BYTES], permutation p) -@@ -161,11 +190,15 @@ void lilliput_tbc_encrypt( +@@ -141,11 +170,15 @@ void lilliput_tbc_encrypt( uint8_t RTK[ROUNDS][ROUND_TWEAKEY_BYTES]; _compute_round_tweakeys(key, tweak, RTK); @@ -113,10 +113,10 @@ index bb2d46a..028d4e2 100644 _one_round_egfn(X, RTK[ROUNDS-1], PERMUTATION_NONE); memcpy(ciphertext, X, BLOCK_BYTES); -diff --git a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/tweakey.c b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/tweakey.c -index 8f2f7dd..3b81cff 100644 ---- a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/tweakey.c -+++ b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/tweakey.c +diff --git a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/tweakey.c b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/tweakey.c +index 54b3036..77d2d58 100644 +--- a/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/tweakey.c ++++ b/SOUMISSION_NIST/REFERENCE_IMPLEMENTATION/src/ref/tweakey.c @@ -1,3 +1,5 @@ +#include "debug.h" + @@ -140,7 +140,7 @@ index 8f2f7dd..3b81cff 100644 } round_tweakey[0] ^= round_constant; -@@ -152,6 +160,10 @@ static const matrix_multiplication ALPHAS[6] = { +@@ -110,6 +118,10 @@ static const matrix_multiplication ALPHAS[6] = { _multiply_MR3 }; @@ -151,7 +151,7 @@ index 8f2f7dd..3b81cff 100644 void tweakey_state_update(uint8_t TK[TWEAKEY_BYTES]) { -@@ -165,5 +177,9 @@ void tweakey_state_update(uint8_t TK[TWEAKEY_BYTES]) +@@ -123,5 +135,9 @@ void tweakey_state_update(uint8_t TK[TWEAKEY_BYTES]) memcpy(TKj_old, TKj, LANE_BYTES); ALPHAS[j-1](TKj_old, TKj); |