From 4f6e00ed6993080803f7da2b3126b558e24c3e4c Mon Sep 17 00:00:00 2001 From: "John M. Schanck" Date: Wed, 2 Sep 2020 13:37:23 -0400 Subject: [PATCH] NTRU Prime: jump directly to crypto_sort_smallindices --- .../ntrulpr653/clean/crypto_sort_int32.c | 77 +------------------ .../ntrulpr653/clean/crypto_sort_int32.h | 2 +- .../ntrulpr761/clean/crypto_sort_int32.c | 77 +------------------ .../ntrulpr761/clean/crypto_sort_int32.h | 2 +- .../ntrulpr857/clean/crypto_sort_int32.c | 77 +------------------ .../ntrulpr857/clean/crypto_sort_int32.h | 2 +- .../sntrup653/clean/crypto_sort_int32.c | 77 +------------------ .../sntrup653/clean/crypto_sort_int32.h | 2 +- .../sntrup761/clean/crypto_sort_int32.c | 77 +------------------ .../sntrup761/clean/crypto_sort_int32.h | 2 +- .../sntrup857/clean/crypto_sort_int32.c | 77 +------------------ .../sntrup857/clean/crypto_sort_int32.h | 2 +- .../duplicate_consistency/ntrulpr653_avx2.yml | 6 -- .../ntrulpr653_clean.yml | 6 -- .../duplicate_consistency/ntrulpr761_avx2.yml | 5 -- .../ntrulpr761_clean.yml | 5 -- .../duplicate_consistency/ntrulpr857_avx2.yml | 4 - .../ntrulpr857_clean.yml | 4 - test/duplicate_consistency/sntrup653_avx2.yml | 3 - .../duplicate_consistency/sntrup653_clean.yml | 3 - test/duplicate_consistency/sntrup761_avx2.yml | 2 - .../duplicate_consistency/sntrup761_clean.yml | 2 - test/duplicate_consistency/sntrup857_avx2.yml | 1 - .../duplicate_consistency/sntrup857_clean.yml | 1 - 24 files changed, 12 insertions(+), 504 deletions(-) diff --git a/crypto_kem/ntrulpr653/clean/crypto_sort_int32.c b/crypto_kem/ntrulpr653/clean/crypto_sort_int32.c index 275d8e06..cdb63739 100644 --- a/crypto_kem/ntrulpr653/clean/crypto_sort_int32.c +++ b/crypto_kem/ntrulpr653/clean/crypto_sort_int32.c @@ -15,7 +15,7 @@ } while(0) /* assume 2 <= n <= 0x40000000 */ -static void crypto_sort_smallindices(int32 *x, int32 n) { +void PQCLEAN_NTRULPR653_CLEAN_crypto_sort_int32(int32_t *x, long long n) { int32 top, p, q, r, i, j; top = 1; @@ -81,78 +81,3 @@ done: } } } - -void PQCLEAN_NTRULPR653_CLEAN_crypto_sort_int32(void *array, long long n) { - long long top, p, q, r, i, j; - int32 *x = array; - - if (n < 2) { - return; - } - if (n < 0x40000000) { - crypto_sort_smallindices(x, n); - return; - } - top = 1; - while (top < n - top) { - top += top; - } - - for (p = top; p >= 1; p >>= 1) { - i = 0; - while (i + 2 * p <= n) { - for (j = i; j < i + p; ++j) { - int32_MINMAX(x[j], x[j + p]); - } - i += 2 * p; - } - for (j = i; j < n - p; ++j) { - int32_MINMAX(x[j], x[j + p]); - } - - i = 0; - j = 0; - for (q = top; q > p; q >>= 1) { - if (j != i) { - for (;;) { - if (j == n - q) { - goto done; - } - int32 a = x[j + p]; - for (r = q; r > p; r >>= 1) { - int32_MINMAX(a, x[j + r]); - } - x[j + p] = a; - ++j; - if (j == i + p) { - i += 2 * p; - break; - } - } - } - while (i + p <= n - q) { - for (j = i; j < i + p; ++j) { - int32 a = x[j + p]; - for (r = q; r > p; r >>= 1) { - int32_MINMAX(a, x[j + r]); - } - x[j + p] = a; - } - i += 2 * p; - } - /* now i + p > n - q */ - j = i; - while (j < n - q) { - int32 a = x[j + p]; - for (r = q; r > p; r >>= 1) { - int32_MINMAX(a, x[j + r]); - } - x[j + p] = a; - ++j; - } - -done: - ; - } - } -} diff --git a/crypto_kem/ntrulpr653/clean/crypto_sort_int32.h b/crypto_kem/ntrulpr653/clean/crypto_sort_int32.h index 23742139..debd94c5 100644 --- a/crypto_kem/ntrulpr653/clean/crypto_sort_int32.h +++ b/crypto_kem/ntrulpr653/clean/crypto_sort_int32.h @@ -4,5 +4,5 @@ #include #define PQCLEAN_NTRULPR653_CLEAN_crypto_sort_int32_BYTES 4 -void PQCLEAN_NTRULPR653_CLEAN_crypto_sort_int32(void *array, long long n); +void PQCLEAN_NTRULPR653_CLEAN_crypto_sort_int32(int32_t *x, long long n); #endif diff --git a/crypto_kem/ntrulpr761/clean/crypto_sort_int32.c b/crypto_kem/ntrulpr761/clean/crypto_sort_int32.c index e74691c2..f46d6fe5 100644 --- a/crypto_kem/ntrulpr761/clean/crypto_sort_int32.c +++ b/crypto_kem/ntrulpr761/clean/crypto_sort_int32.c @@ -15,7 +15,7 @@ } while(0) /* assume 2 <= n <= 0x40000000 */ -static void crypto_sort_smallindices(int32 *x, int32 n) { +void PQCLEAN_NTRULPR761_CLEAN_crypto_sort_int32(int32_t *x, long long n) { int32 top, p, q, r, i, j; top = 1; @@ -81,78 +81,3 @@ done: } } } - -void PQCLEAN_NTRULPR761_CLEAN_crypto_sort_int32(void *array, long long n) { - long long top, p, q, r, i, j; - int32 *x = array; - - if (n < 2) { - return; - } - if (n < 0x40000000) { - crypto_sort_smallindices(x, n); - return; - } - top = 1; - while (top < n - top) { - top += top; - } - - for (p = top; p >= 1; p >>= 1) { - i = 0; - while (i + 2 * p <= n) { - for (j = i; j < i + p; ++j) { - int32_MINMAX(x[j], x[j + p]); - } - i += 2 * p; - } - for (j = i; j < n - p; ++j) { - int32_MINMAX(x[j], x[j + p]); - } - - i = 0; - j = 0; - for (q = top; q > p; q >>= 1) { - if (j != i) { - for (;;) { - if (j == n - q) { - goto done; - } - int32 a = x[j + p]; - for (r = q; r > p; r >>= 1) { - int32_MINMAX(a, x[j + r]); - } - x[j + p] = a; - ++j; - if (j == i + p) { - i += 2 * p; - break; - } - } - } - while (i + p <= n - q) { - for (j = i; j < i + p; ++j) { - int32 a = x[j + p]; - for (r = q; r > p; r >>= 1) { - int32_MINMAX(a, x[j + r]); - } - x[j + p] = a; - } - i += 2 * p; - } - /* now i + p > n - q */ - j = i; - while (j < n - q) { - int32 a = x[j + p]; - for (r = q; r > p; r >>= 1) { - int32_MINMAX(a, x[j + r]); - } - x[j + p] = a; - ++j; - } - -done: - ; - } - } -} diff --git a/crypto_kem/ntrulpr761/clean/crypto_sort_int32.h b/crypto_kem/ntrulpr761/clean/crypto_sort_int32.h index ace988bb..56fd150d 100644 --- a/crypto_kem/ntrulpr761/clean/crypto_sort_int32.h +++ b/crypto_kem/ntrulpr761/clean/crypto_sort_int32.h @@ -4,5 +4,5 @@ #include #define PQCLEAN_NTRULPR761_CLEAN_crypto_sort_int32_BYTES 4 -void PQCLEAN_NTRULPR761_CLEAN_crypto_sort_int32(void *array, long long n); +void PQCLEAN_NTRULPR761_CLEAN_crypto_sort_int32(int32_t *x, long long n); #endif diff --git a/crypto_kem/ntrulpr857/clean/crypto_sort_int32.c b/crypto_kem/ntrulpr857/clean/crypto_sort_int32.c index 8035057e..5321e8b8 100644 --- a/crypto_kem/ntrulpr857/clean/crypto_sort_int32.c +++ b/crypto_kem/ntrulpr857/clean/crypto_sort_int32.c @@ -15,7 +15,7 @@ } while(0) /* assume 2 <= n <= 0x40000000 */ -static void crypto_sort_smallindices(int32 *x, int32 n) { +void PQCLEAN_NTRULPR857_CLEAN_crypto_sort_int32(int32_t *x, long long n) { int32 top, p, q, r, i, j; top = 1; @@ -81,78 +81,3 @@ done: } } } - -void PQCLEAN_NTRULPR857_CLEAN_crypto_sort_int32(void *array, long long n) { - long long top, p, q, r, i, j; - int32 *x = array; - - if (n < 2) { - return; - } - if (n < 0x40000000) { - crypto_sort_smallindices(x, n); - return; - } - top = 1; - while (top < n - top) { - top += top; - } - - for (p = top; p >= 1; p >>= 1) { - i = 0; - while (i + 2 * p <= n) { - for (j = i; j < i + p; ++j) { - int32_MINMAX(x[j], x[j + p]); - } - i += 2 * p; - } - for (j = i; j < n - p; ++j) { - int32_MINMAX(x[j], x[j + p]); - } - - i = 0; - j = 0; - for (q = top; q > p; q >>= 1) { - if (j != i) { - for (;;) { - if (j == n - q) { - goto done; - } - int32 a = x[j + p]; - for (r = q; r > p; r >>= 1) { - int32_MINMAX(a, x[j + r]); - } - x[j + p] = a; - ++j; - if (j == i + p) { - i += 2 * p; - break; - } - } - } - while (i + p <= n - q) { - for (j = i; j < i + p; ++j) { - int32 a = x[j + p]; - for (r = q; r > p; r >>= 1) { - int32_MINMAX(a, x[j + r]); - } - x[j + p] = a; - } - i += 2 * p; - } - /* now i + p > n - q */ - j = i; - while (j < n - q) { - int32 a = x[j + p]; - for (r = q; r > p; r >>= 1) { - int32_MINMAX(a, x[j + r]); - } - x[j + p] = a; - ++j; - } - -done: - ; - } - } -} diff --git a/crypto_kem/ntrulpr857/clean/crypto_sort_int32.h b/crypto_kem/ntrulpr857/clean/crypto_sort_int32.h index 54f82db7..5d5ce6d5 100644 --- a/crypto_kem/ntrulpr857/clean/crypto_sort_int32.h +++ b/crypto_kem/ntrulpr857/clean/crypto_sort_int32.h @@ -4,5 +4,5 @@ #include #define PQCLEAN_NTRULPR857_CLEAN_crypto_sort_int32_BYTES 4 -void PQCLEAN_NTRULPR857_CLEAN_crypto_sort_int32(void *array, long long n); +void PQCLEAN_NTRULPR857_CLEAN_crypto_sort_int32(int32_t *x, long long n); #endif diff --git a/crypto_kem/sntrup653/clean/crypto_sort_int32.c b/crypto_kem/sntrup653/clean/crypto_sort_int32.c index 9d561f78..04475629 100644 --- a/crypto_kem/sntrup653/clean/crypto_sort_int32.c +++ b/crypto_kem/sntrup653/clean/crypto_sort_int32.c @@ -15,7 +15,7 @@ } while(0) /* assume 2 <= n <= 0x40000000 */ -static void crypto_sort_smallindices(int32 *x, int32 n) { +void PQCLEAN_SNTRUP653_CLEAN_crypto_sort_int32(int32_t *x, long long n) { int32 top, p, q, r, i, j; top = 1; @@ -81,78 +81,3 @@ done: } } } - -void PQCLEAN_SNTRUP653_CLEAN_crypto_sort_int32(void *array, long long n) { - long long top, p, q, r, i, j; - int32 *x = array; - - if (n < 2) { - return; - } - if (n < 0x40000000) { - crypto_sort_smallindices(x, n); - return; - } - top = 1; - while (top < n - top) { - top += top; - } - - for (p = top; p >= 1; p >>= 1) { - i = 0; - while (i + 2 * p <= n) { - for (j = i; j < i + p; ++j) { - int32_MINMAX(x[j], x[j + p]); - } - i += 2 * p; - } - for (j = i; j < n - p; ++j) { - int32_MINMAX(x[j], x[j + p]); - } - - i = 0; - j = 0; - for (q = top; q > p; q >>= 1) { - if (j != i) { - for (;;) { - if (j == n - q) { - goto done; - } - int32 a = x[j + p]; - for (r = q; r > p; r >>= 1) { - int32_MINMAX(a, x[j + r]); - } - x[j + p] = a; - ++j; - if (j == i + p) { - i += 2 * p; - break; - } - } - } - while (i + p <= n - q) { - for (j = i; j < i + p; ++j) { - int32 a = x[j + p]; - for (r = q; r > p; r >>= 1) { - int32_MINMAX(a, x[j + r]); - } - x[j + p] = a; - } - i += 2 * p; - } - /* now i + p > n - q */ - j = i; - while (j < n - q) { - int32 a = x[j + p]; - for (r = q; r > p; r >>= 1) { - int32_MINMAX(a, x[j + r]); - } - x[j + p] = a; - ++j; - } - -done: - ; - } - } -} diff --git a/crypto_kem/sntrup653/clean/crypto_sort_int32.h b/crypto_kem/sntrup653/clean/crypto_sort_int32.h index d91d5179..1d3d27c3 100644 --- a/crypto_kem/sntrup653/clean/crypto_sort_int32.h +++ b/crypto_kem/sntrup653/clean/crypto_sort_int32.h @@ -4,5 +4,5 @@ #include #define PQCLEAN_SNTRUP653_CLEAN_crypto_sort_int32_BYTES 4 -void PQCLEAN_SNTRUP653_CLEAN_crypto_sort_int32(void *array, long long n); +void PQCLEAN_SNTRUP653_CLEAN_crypto_sort_int32(int32_t *x, long long n); #endif diff --git a/crypto_kem/sntrup761/clean/crypto_sort_int32.c b/crypto_kem/sntrup761/clean/crypto_sort_int32.c index f0c3b41d..d6b6f7b8 100644 --- a/crypto_kem/sntrup761/clean/crypto_sort_int32.c +++ b/crypto_kem/sntrup761/clean/crypto_sort_int32.c @@ -15,7 +15,7 @@ } while(0) /* assume 2 <= n <= 0x40000000 */ -static void crypto_sort_smallindices(int32 *x, int32 n) { +void PQCLEAN_SNTRUP761_CLEAN_crypto_sort_int32(int32_t *x, long long n) { int32 top, p, q, r, i, j; top = 1; @@ -81,78 +81,3 @@ done: } } } - -void PQCLEAN_SNTRUP761_CLEAN_crypto_sort_int32(void *array, long long n) { - long long top, p, q, r, i, j; - int32 *x = array; - - if (n < 2) { - return; - } - if (n < 0x40000000) { - crypto_sort_smallindices(x, n); - return; - } - top = 1; - while (top < n - top) { - top += top; - } - - for (p = top; p >= 1; p >>= 1) { - i = 0; - while (i + 2 * p <= n) { - for (j = i; j < i + p; ++j) { - int32_MINMAX(x[j], x[j + p]); - } - i += 2 * p; - } - for (j = i; j < n - p; ++j) { - int32_MINMAX(x[j], x[j + p]); - } - - i = 0; - j = 0; - for (q = top; q > p; q >>= 1) { - if (j != i) { - for (;;) { - if (j == n - q) { - goto done; - } - int32 a = x[j + p]; - for (r = q; r > p; r >>= 1) { - int32_MINMAX(a, x[j + r]); - } - x[j + p] = a; - ++j; - if (j == i + p) { - i += 2 * p; - break; - } - } - } - while (i + p <= n - q) { - for (j = i; j < i + p; ++j) { - int32 a = x[j + p]; - for (r = q; r > p; r >>= 1) { - int32_MINMAX(a, x[j + r]); - } - x[j + p] = a; - } - i += 2 * p; - } - /* now i + p > n - q */ - j = i; - while (j < n - q) { - int32 a = x[j + p]; - for (r = q; r > p; r >>= 1) { - int32_MINMAX(a, x[j + r]); - } - x[j + p] = a; - ++j; - } - -done: - ; - } - } -} diff --git a/crypto_kem/sntrup761/clean/crypto_sort_int32.h b/crypto_kem/sntrup761/clean/crypto_sort_int32.h index c6e32e29..e603a7cc 100644 --- a/crypto_kem/sntrup761/clean/crypto_sort_int32.h +++ b/crypto_kem/sntrup761/clean/crypto_sort_int32.h @@ -4,5 +4,5 @@ #include #define PQCLEAN_SNTRUP761_CLEAN_crypto_sort_int32_BYTES 4 -void PQCLEAN_SNTRUP761_CLEAN_crypto_sort_int32(void *array, long long n); +void PQCLEAN_SNTRUP761_CLEAN_crypto_sort_int32(int32_t *x, long long n); #endif diff --git a/crypto_kem/sntrup857/clean/crypto_sort_int32.c b/crypto_kem/sntrup857/clean/crypto_sort_int32.c index a00ea032..49ce3678 100644 --- a/crypto_kem/sntrup857/clean/crypto_sort_int32.c +++ b/crypto_kem/sntrup857/clean/crypto_sort_int32.c @@ -15,7 +15,7 @@ } while(0) /* assume 2 <= n <= 0x40000000 */ -static void crypto_sort_smallindices(int32 *x, int32 n) { +void PQCLEAN_SNTRUP857_CLEAN_crypto_sort_int32(int32_t *x, long long n) { int32 top, p, q, r, i, j; top = 1; @@ -81,78 +81,3 @@ done: } } } - -void PQCLEAN_SNTRUP857_CLEAN_crypto_sort_int32(void *array, long long n) { - long long top, p, q, r, i, j; - int32 *x = array; - - if (n < 2) { - return; - } - if (n < 0x40000000) { - crypto_sort_smallindices(x, n); - return; - } - top = 1; - while (top < n - top) { - top += top; - } - - for (p = top; p >= 1; p >>= 1) { - i = 0; - while (i + 2 * p <= n) { - for (j = i; j < i + p; ++j) { - int32_MINMAX(x[j], x[j + p]); - } - i += 2 * p; - } - for (j = i; j < n - p; ++j) { - int32_MINMAX(x[j], x[j + p]); - } - - i = 0; - j = 0; - for (q = top; q > p; q >>= 1) { - if (j != i) { - for (;;) { - if (j == n - q) { - goto done; - } - int32 a = x[j + p]; - for (r = q; r > p; r >>= 1) { - int32_MINMAX(a, x[j + r]); - } - x[j + p] = a; - ++j; - if (j == i + p) { - i += 2 * p; - break; - } - } - } - while (i + p <= n - q) { - for (j = i; j < i + p; ++j) { - int32 a = x[j + p]; - for (r = q; r > p; r >>= 1) { - int32_MINMAX(a, x[j + r]); - } - x[j + p] = a; - } - i += 2 * p; - } - /* now i + p > n - q */ - j = i; - while (j < n - q) { - int32 a = x[j + p]; - for (r = q; r > p; r >>= 1) { - int32_MINMAX(a, x[j + r]); - } - x[j + p] = a; - ++j; - } - -done: - ; - } - } -} diff --git a/crypto_kem/sntrup857/clean/crypto_sort_int32.h b/crypto_kem/sntrup857/clean/crypto_sort_int32.h index 5b348538..09271259 100644 --- a/crypto_kem/sntrup857/clean/crypto_sort_int32.h +++ b/crypto_kem/sntrup857/clean/crypto_sort_int32.h @@ -4,5 +4,5 @@ #include #define PQCLEAN_SNTRUP857_CLEAN_crypto_sort_int32_BYTES 4 -void PQCLEAN_SNTRUP857_CLEAN_crypto_sort_int32(void *array, long long n); +void PQCLEAN_SNTRUP857_CLEAN_crypto_sort_int32(int32_t *x, long long n); #endif diff --git a/test/duplicate_consistency/ntrulpr653_avx2.yml b/test/duplicate_consistency/ntrulpr653_avx2.yml index eb52271b..39486aa4 100644 --- a/test/duplicate_consistency/ntrulpr653_avx2.yml +++ b/test/duplicate_consistency/ntrulpr653_avx2.yml @@ -12,7 +12,6 @@ consistency_checks: - crypto_encode_653x1541round.h - crypto_encode_653x3.h - crypto_encode_653xint16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_decode_653xint16.c @@ -54,7 +53,6 @@ consistency_checks: scheme: sntrup761 implementation: clean files: - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_sort_uint32.c @@ -73,7 +71,6 @@ consistency_checks: scheme: sntrup857 implementation: clean files: - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_sort_uint32.c @@ -106,7 +103,6 @@ consistency_checks: - crypto_encode_653x1541round.h - crypto_encode_653x3.h - crypto_encode_653xint16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_verify_1025.h @@ -126,7 +122,6 @@ consistency_checks: - crypto_decode_256x2.h - crypto_encode_256x16.h - crypto_encode_256x2.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_decode_256x16.c @@ -161,7 +156,6 @@ consistency_checks: - crypto_decode_256x2.h - crypto_encode_256x16.h - crypto_encode_256x2.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_decode_256x16.c diff --git a/test/duplicate_consistency/ntrulpr653_clean.yml b/test/duplicate_consistency/ntrulpr653_clean.yml index 76939cd8..462a3bb9 100644 --- a/test/duplicate_consistency/ntrulpr653_clean.yml +++ b/test/duplicate_consistency/ntrulpr653_clean.yml @@ -40,7 +40,6 @@ consistency_checks: - crypto_encode_653x1541round.h - crypto_encode_653x3.h - crypto_encode_653xint16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_decode_653xint16.c @@ -62,7 +61,6 @@ consistency_checks: scheme: sntrup761 implementation: avx2 files: - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_sort_uint32.c @@ -81,7 +79,6 @@ consistency_checks: scheme: sntrup857 implementation: avx2 files: - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_sort_uint32.c @@ -104,7 +101,6 @@ consistency_checks: - crypto_encode_653x1541round.h - crypto_encode_653x3.h - crypto_encode_653xint16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_verify_1025.h @@ -143,7 +139,6 @@ consistency_checks: - crypto_decode_256x2.h - crypto_encode_256x16.h - crypto_encode_256x2.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_decode_256x16.c @@ -178,7 +173,6 @@ consistency_checks: - crypto_decode_256x2.h - crypto_encode_256x16.h - crypto_encode_256x2.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_decode_256x16.c diff --git a/test/duplicate_consistency/ntrulpr761_avx2.yml b/test/duplicate_consistency/ntrulpr761_avx2.yml index ada9b345..551ad24d 100644 --- a/test/duplicate_consistency/ntrulpr761_avx2.yml +++ b/test/duplicate_consistency/ntrulpr761_avx2.yml @@ -3,7 +3,6 @@ consistency_checks: scheme: sntrup653 implementation: clean files: - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_sort_uint32.c @@ -31,7 +30,6 @@ consistency_checks: - crypto_encode_761x1531round.h - crypto_encode_761x3.h - crypto_encode_761xint16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_decode_761xint16.c @@ -73,7 +71,6 @@ consistency_checks: scheme: sntrup857 implementation: clean files: - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_sort_uint32.c @@ -106,7 +103,6 @@ consistency_checks: - crypto_encode_761x1531round.h - crypto_encode_761x3.h - crypto_encode_761xint16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_verify_1167.h @@ -126,7 +122,6 @@ consistency_checks: - crypto_decode_256x2.h - crypto_encode_256x16.h - crypto_encode_256x2.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_decode_256x16.c diff --git a/test/duplicate_consistency/ntrulpr761_clean.yml b/test/duplicate_consistency/ntrulpr761_clean.yml index a57d73b6..40c1e43e 100644 --- a/test/duplicate_consistency/ntrulpr761_clean.yml +++ b/test/duplicate_consistency/ntrulpr761_clean.yml @@ -13,7 +13,6 @@ consistency_checks: scheme: sntrup653 implementation: avx2 files: - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_sort_uint32.c @@ -59,7 +58,6 @@ consistency_checks: - crypto_encode_761x1531round.h - crypto_encode_761x3.h - crypto_encode_761xint16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_decode_761xint16.c @@ -81,7 +79,6 @@ consistency_checks: scheme: sntrup857 implementation: avx2 files: - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_sort_uint32.c @@ -104,7 +101,6 @@ consistency_checks: - crypto_encode_761x1531round.h - crypto_encode_761x3.h - crypto_encode_761xint16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_verify_1167.h @@ -143,7 +139,6 @@ consistency_checks: - crypto_decode_256x2.h - crypto_encode_256x16.h - crypto_encode_256x2.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_decode_256x16.c diff --git a/test/duplicate_consistency/ntrulpr857_avx2.yml b/test/duplicate_consistency/ntrulpr857_avx2.yml index a5944167..d538d871 100644 --- a/test/duplicate_consistency/ntrulpr857_avx2.yml +++ b/test/duplicate_consistency/ntrulpr857_avx2.yml @@ -3,7 +3,6 @@ consistency_checks: scheme: sntrup653 implementation: clean files: - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_sort_uint32.c @@ -22,7 +21,6 @@ consistency_checks: scheme: sntrup761 implementation: clean files: - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_sort_uint32.c @@ -50,7 +48,6 @@ consistency_checks: - crypto_encode_857x1723round.h - crypto_encode_857x3.h - crypto_encode_857xint16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_decode_857xint16.c @@ -106,7 +103,6 @@ consistency_checks: - crypto_encode_857x1723round.h - crypto_encode_857x3.h - crypto_encode_857xint16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_verify_1312.h diff --git a/test/duplicate_consistency/ntrulpr857_clean.yml b/test/duplicate_consistency/ntrulpr857_clean.yml index 25bf22cc..ca9508a0 100644 --- a/test/duplicate_consistency/ntrulpr857_clean.yml +++ b/test/duplicate_consistency/ntrulpr857_clean.yml @@ -13,7 +13,6 @@ consistency_checks: scheme: sntrup653 implementation: avx2 files: - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_sort_uint32.c @@ -32,7 +31,6 @@ consistency_checks: scheme: sntrup761 implementation: avx2 files: - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_sort_uint32.c @@ -78,7 +76,6 @@ consistency_checks: - crypto_encode_857x1723round.h - crypto_encode_857x3.h - crypto_encode_857xint16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_decode_857xint16.c @@ -104,7 +101,6 @@ consistency_checks: - crypto_encode_857x1723round.h - crypto_encode_857x3.h - crypto_encode_857xint16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_verify_1312.h diff --git a/test/duplicate_consistency/sntrup653_avx2.yml b/test/duplicate_consistency/sntrup653_avx2.yml index 71805ef1..19793e9e 100644 --- a/test/duplicate_consistency/sntrup653_avx2.yml +++ b/test/duplicate_consistency/sntrup653_avx2.yml @@ -22,7 +22,6 @@ consistency_checks: - crypto_encode_653xfreeze3.h - crypto_encode_653xint16.h - crypto_encode_int16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_verify_897.h @@ -38,7 +37,6 @@ consistency_checks: implementation: clean files: - crypto_encode_int16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_encode_int16.c @@ -65,7 +63,6 @@ consistency_checks: implementation: clean files: - crypto_encode_int16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_encode_int16.c diff --git a/test/duplicate_consistency/sntrup653_clean.yml b/test/duplicate_consistency/sntrup653_clean.yml index 3d7ad93c..817346c3 100644 --- a/test/duplicate_consistency/sntrup653_clean.yml +++ b/test/duplicate_consistency/sntrup653_clean.yml @@ -22,7 +22,6 @@ consistency_checks: - crypto_encode_653xfreeze3.h - crypto_encode_653xint16.h - crypto_encode_int16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_verify_897.h @@ -51,7 +50,6 @@ consistency_checks: implementation: avx2 files: - crypto_encode_int16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_encode_int16.c @@ -76,7 +74,6 @@ consistency_checks: implementation: avx2 files: - crypto_encode_int16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_encode_int16.c diff --git a/test/duplicate_consistency/sntrup761_avx2.yml b/test/duplicate_consistency/sntrup761_avx2.yml index b06a4201..286e13bb 100644 --- a/test/duplicate_consistency/sntrup761_avx2.yml +++ b/test/duplicate_consistency/sntrup761_avx2.yml @@ -22,7 +22,6 @@ consistency_checks: - crypto_encode_761xfreeze3.h - crypto_encode_761xint16.h - crypto_encode_int16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_verify_1039.h @@ -38,7 +37,6 @@ consistency_checks: implementation: clean files: - crypto_encode_int16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_encode_int16.c diff --git a/test/duplicate_consistency/sntrup761_clean.yml b/test/duplicate_consistency/sntrup761_clean.yml index 50e5216f..28b0f63f 100644 --- a/test/duplicate_consistency/sntrup761_clean.yml +++ b/test/duplicate_consistency/sntrup761_clean.yml @@ -22,7 +22,6 @@ consistency_checks: - crypto_encode_761xfreeze3.h - crypto_encode_761xint16.h - crypto_encode_int16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_verify_1039.h @@ -51,7 +50,6 @@ consistency_checks: implementation: avx2 files: - crypto_encode_int16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_encode_int16.c diff --git a/test/duplicate_consistency/sntrup857_avx2.yml b/test/duplicate_consistency/sntrup857_avx2.yml index 9f4e258c..9dd896f3 100644 --- a/test/duplicate_consistency/sntrup857_avx2.yml +++ b/test/duplicate_consistency/sntrup857_avx2.yml @@ -22,7 +22,6 @@ consistency_checks: - crypto_encode_857xfreeze3.h - crypto_encode_857xint16.h - crypto_encode_int16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_verify_1184.h diff --git a/test/duplicate_consistency/sntrup857_clean.yml b/test/duplicate_consistency/sntrup857_clean.yml index c552355f..1c5a45e6 100644 --- a/test/duplicate_consistency/sntrup857_clean.yml +++ b/test/duplicate_consistency/sntrup857_clean.yml @@ -22,7 +22,6 @@ consistency_checks: - crypto_encode_857xfreeze3.h - crypto_encode_857xint16.h - crypto_encode_int16.h - - crypto_sort_int32.h - crypto_sort_uint32.h - crypto_stream_aes256ctr.h - crypto_verify_1184.h