diff --git a/instances.c b/instances.c index cba37ed7..96a199f8 100644 --- a/instances.c +++ b/instances.c @@ -51,9 +51,9 @@ const char* faest_get_param_name(faest_paramid_t paramid) { #define PARAMS(name) \ { \ name##_LAMBDA, name##_TAU, name##_W_GRIND, name##_T_OPEN, name##_ELL, CALC_K(name), \ - CALC_TAU0(name), CALC_TAU1(name), CALC_L(name), name##_Nwd, name##_Ske, name##_R, \ - name##_Senc, name##_Lke, name##_Lenc, name##_C, name##_SIG_SIZE, name##_OWF_INPUT_SIZE, \ - name##_OWF_OUTPUT_SIZE \ + CALC_TAU0(name), CALC_TAU1(name), CALC_L(name), name##_Nwd, name##_Nst, name##_Ske, \ + name##_R, name##_Senc, name##_Lke, name##_Lenc, name##_C, name##_SIG_SIZE, \ + name##_OWF_INPUT_SIZE, name##_OWF_OUTPUT_SIZE \ } #define FAEST_128S_PARAMS PARAMS(FAEST_128S) diff --git a/instances.h b/instances.h index e46bbccf..694ce9fa 100644 --- a/instances.h +++ b/instances.h @@ -54,6 +54,7 @@ typedef struct faest_param_t { // OWF parameters uint16_t Nwd; + uint16_t Nst; uint16_t Ske; uint16_t R; uint16_t Senc; diff --git a/meson.build b/meson.build index f6d5a906..a1042e5d 100644 --- a/meson.build +++ b/meson.build @@ -120,6 +120,7 @@ param_128s.set('PARAM', '128S') param_128s.set('PARAM_L', '128s') param_128s.set('LAMBDA', 128) param_128s.set('Nwd', 4) +param_128s.set('Nst', 4) param_128s.set('Ske', 40) param_128s.set('R', 10) param_128s.set('Senc', 160) @@ -144,6 +145,7 @@ param_128f.set('PARAM', '128F') param_128f.set('PARAM_L', '128f') param_128f.set('LAMBDA', 128) param_128f.set('Nwd', 4) +param_128f.set('Nst', 4) param_128f.set('Ske', 40) param_128f.set('R', 10) param_128f.set('Senc', 160) @@ -168,6 +170,7 @@ param_em_128s.set('PARAM', 'EM_128S') param_em_128s.set('PARAM_L', 'em_128s') param_em_128s.set('LAMBDA', 128) param_em_128s.set('Nwd', 4) +param_em_128s.set('Nst', 4) param_em_128s.set('Ske', 0) param_em_128s.set('R', 10) param_em_128s.set('Senc', 160) @@ -192,6 +195,7 @@ param_em_128f.set('PARAM', 'EM_128F') param_em_128f.set('PARAM_L', 'em_128f') param_em_128f.set('LAMBDA', 128) param_em_128f.set('Nwd', 4) +param_em_128f.set('Nst', 4) param_em_128f.set('Ske', 0) param_em_128f.set('R', 10) param_em_128f.set('Senc', 160) @@ -216,6 +220,7 @@ param_192s.set('PARAM', '192S') param_192s.set('PARAM_L', '192s') param_192s.set('LAMBDA', 192) param_192s.set('Nwd', 6) +param_192s.set('Nst', 4) param_192s.set('Ske', 32) param_192s.set('R', 12) param_192s.set('Senc', 192) @@ -240,6 +245,7 @@ param_192f.set('PARAM', '192F') param_192f.set('PARAM_L', '192f') param_192f.set('LAMBDA', 192) param_192f.set('Nwd', 6) +param_192f.set('Nst', 4) param_192f.set('Ske', 32) param_192f.set('R', 12) param_192f.set('Senc', 192) @@ -264,6 +270,7 @@ param_em_192s.set('PARAM', 'EM_192S') param_em_192s.set('PARAM_L', 'em_192s') param_em_192s.set('LAMBDA', 192) param_em_192s.set('Nwd', 6) +param_em_192s.set('Nst', 6) param_em_192s.set('Ske', 0) param_em_192s.set('R', 12) param_em_192s.set('Senc', 288) @@ -288,6 +295,7 @@ param_em_192f.set('PARAM', 'EM_192F') param_em_192f.set('PARAM_L', 'em_192f') param_em_192f.set('LAMBDA', 192) param_em_192f.set('Nwd', 6) +param_em_128f.set('Nst', 6) param_em_192f.set('Ske', 0) param_em_192f.set('R', 12) param_em_192f.set('Senc', 288) @@ -312,6 +320,7 @@ param_256s.set('PARAM', '256S') param_256s.set('PARAM_L', '256s') param_256s.set('LAMBDA', 256) param_256s.set('Nwd', 8) +param_256s.set('Nst', 4) param_256s.set('Ske', 52) param_256s.set('R', 14) param_256s.set('Senc', 224) @@ -336,6 +345,7 @@ param_256f.set('PARAM', '256F') param_256f.set('PARAM_L', '256f') param_256f.set('LAMBDA', 256) param_256f.set('Nwd', 8) +param_256f.set('Nwd', 4) param_256f.set('Ske', 52) param_256f.set('R', 14) param_256f.set('Senc', 224) @@ -360,6 +370,7 @@ param_em_256s.set('PARAM', 'EM_256S') param_em_256s.set('PARAM_L', 'em_256s') param_em_256s.set('LAMBDA', 256) param_em_256s.set('Nwd', 8) +param_em_256s.set('Nst', 8) param_em_256s.set('Ske', 0) param_em_256s.set('R', 14) param_em_256s.set('Senc', 448) @@ -384,6 +395,7 @@ param_em_256f.set('PARAM', 'EM_256F') param_em_256f.set('PARAM_L', 'em_256f') param_em_256f.set('LAMBDA', 256) param_em_256f.set('Nwd', 8) +param_em_256f.set('Nwd', 4) param_em_256f.set('Ske', 0) param_em_256f.set('R', 14) param_em_256f.set('Senc', 448)