6 files changed, 34 insertions, 21 deletions

diff --git a/test/src/exhaustive/test_ansi.c b/test/src/exhaustive/test_ansi.c
index 4217a15..09e9e5c 100644
--- a/test/src/exhaustive/test_ansi.c
+++ b/test/src/exhaustive/test_ansi.c
@@ -5,14 +5,13 @@
 
 #include <criterion/criterion.h>
 #include <criterion/parameterized.h>
-#include "misc/types.h"
-#include "math/poly.h"
 #include "exhaustive/ansi.h"
-#include "gen/seed.h"
 #include "gen/field.h"
+#include "gen/seed.h"
+#include "math/poly.h"
 #include "test/default.h"
-#include "test/memory.h"
 #include "test/input.h"
+#include "test/memory.h"
 #include "test/output.h"
 #include "util/bits.h"
 #include "util/memory.h"
@@ -119,6 +118,7 @@ void prime_params_cleanup(struct criterion_test_params *ctp) {
 ParameterizedTestParameters(ansi, test_seed_prime_examples) {
 	static struct prime_params params[7] = {};
 	// Taken from ANSI X9.62 J.5.1 - J.5.3; p. 115 - 117
+	// clang-format off
 	params[0].bits = 192;
 	params[0].p = cr_strdup("fffffffffffffffffffffffffffffffeffffffffffffffff");
 	params[0].seed = cr_strdup("3045AE6FC8422F64ED579528D38120EAE12196D5");
@@ -161,6 +161,7 @@ ParameterizedTestParameters(ansi, test_seed_prime_examples) {
 	params[6].r = cr_strdup("7EFBA1662985BE9403CB055C75D4F7E0CE8D84A9C5114ABCAF3177680104FA0D");
 	params[6].a = cr_strdup("FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC");
 	params[6].b = cr_strdup("5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B");
+	// clang-format on
 
 	size_t nb_params = sizeof(params) / sizeof(struct prime_params);
 	return cr_make_param_array(struct prime_params, params, nb_params, NULL);
@@ -175,12 +176,12 @@ ParameterizedTest(struct prime_params *param, ansi, test_seed_prime_examples) {
 	curve.field = bits_to_i(p);
 
 	int ret = ansi_gen_seed_argument(&curve, &cfg, NULL);
-	cr_assert_eq(ret, 1,);
+	cr_assert_eq(ret, 1, );
 
 	ret = ansi_gen_equation(&curve, &cfg, NULL);
-	cr_assert_eq(ret, 1,);
+	cr_assert_eq(ret, 1, );
 	GEN expected_r = bits_to_i(bits_from_hex(param->r));
-	cr_assert(gequal(curve.seed->ansi.r, expected_r),);
+	cr_assert(gequal(curve.seed->ansi.r, expected_r), );
 
 	bits_free(&p);
 	seed_free(&curve.seed);
@@ -204,6 +205,7 @@ void binary_params_cleanup(struct criterion_test_params *ctp) {
 ParameterizedTestParameters(ansi, test_seed_binary_examples) {
 	static struct binary_params params[10] = {};
 	// Taken from ANSI X9.62 J.4.1, J.4.3, J.4.5 and J.4.8; p. 107 - 113
+	// clang-format off
 	polynomial_t p163 = {163, 9, 3, 2};
 	params[0].bits = 163;
 	params[0].field = p163;
@@ -258,11 +260,14 @@ ParameterizedTestParameters(ansi, test_seed_binary_examples) {
 	params[9].seed = cr_strdup("2B354920B724D696E67687561517585BA1332DC6");
 	params[9].a = cr_strdup("5667676A654B20754F356EA92017D946567C46675556F19556A04616B567D223A5E05656FB549016A96656A557");
 	params[9].b = cr_strdup("2472E2D0197C49363F1FE7F5B6DB075D52B6947D135D8CA445805D39BC345626089687742B6329E70680231988");
+	// clang-format on
 
 	size_t nb_params = sizeof(params) / sizeof(struct binary_params);
-	return cr_make_param_array(struct binary_params, params, nb_params, binary_params_cleanup);
+	return cr_make_param_array(struct binary_params, params, nb_params,
+	                           binary_params_cleanup);
 }
-ParameterizedTest(struct binary_params *param, ansi, test_seed_binary_examples) {
+ParameterizedTest(struct binary_params *param, ansi,
+                  test_seed_binary_examples) {
 	config_t cfg = {};
 	cfg.bits = param->bits;
 	cfg.field = FIELD_BINARY;
@@ -274,12 +279,12 @@ ParameterizedTest(struct binary_params *param, ansi, test_seed_binary_examples)
 	bits_t *b = bits_from_i(expected_b);
 
 	int ret = ansi_gen_seed_argument(&curve, &cfg, NULL);
-	cr_assert_eq(ret, 1,);
+	cr_assert_eq(ret, 1, );
 
 	ret = ansi_gen_equation(&curve, &cfg, NULL);
-	cr_assert_eq(ret, 1,);
+	cr_assert_eq(ret, 1, );
 	GEN curve_b = field_elementi(curve.b);
-	cr_assert(gequal(curve_b, expected_b),);
+	cr_assert(gequal(curve_b, expected_b), );
 
 	bits_free(&b);
 	seed_free(&curve.seed);
diff --git a/test/src/test/default.c b/test/src/test/default.c
index c695fea..8ce6cc9 100644
--- a/test/src/test/default.c
+++ b/test/src/test/default.c
@@ -6,8 +6,6 @@
 #include <criterion/criterion.h>
 #include <pari/pari.h>
 
-
-
 void default_setup(void) {
 	pari_init(1000000, 1000000);
 	// set_mem_funcs(cr_malloc, cr_simple_calloc, cr_realloc, cr_free);
diff --git a/test/src/test/memory.c b/test/src/test/memory.c
index 38c75c2..24a7be0 100644
--- a/test/src/test/memory.c
+++ b/test/src/test/memory.c
@@ -1,7 +1,10 @@
-
-#include <string.h>
-#include <criterion/alloc.h>
+/*
+ * ecgen, tool for generating Elliptic curve domain parameters
+ * Copyright (C) 2017 J08nY
+ */
 #include "memory.h"
+#include <criterion/alloc.h>
+#include <string.h>
 
 char *cr_strdup(const char *str) {
 	size_t len = strlen(str);
diff --git a/test/src/test/memory.h b/test/src/test/memory.h
index d97e3cc..f155789 100644
--- a/test/src/test/memory.h
+++ b/test/src/test/memory.h
@@ -1,4 +1,7 @@
-
+/*
+ * ecgen, tool for generating Elliptic curve domain parameters
+ * Copyright (C) 2017 J08nY
+ */
 #ifndef ECGEN_TEST_MEMORY_H
 #define ECGEN_TEST_MEMORY_H
 
diff --git a/test/src/test/output.c b/test/src/test/output.c
index 66c5809..663db4b 100644
--- a/test/src/test/output.c
+++ b/test/src/test/output.c
@@ -3,8 +3,8 @@
  * Copyright (C) 2017 J08nY
  */
 #include "output.h"
-#include "misc/types.h"
 #include "io/output.h"
+#include "misc/types.h"
 
 FILE *read_out = NULL;
 FILE *read_err = NULL;
diff --git a/test/src/util/test_bits.c b/test/src/util/test_bits.c
index 372541a..752cd59 100644
--- a/test/src/util/test_bits.c
+++ b/test/src/util/test_bits.c
@@ -409,6 +409,7 @@ void sha1_params_cleanup(struct criterion_test_params *ctp) {
 
 ParameterizedTestParameters(bits, test_bits_sha1) {
 	static struct sha1_params params[5] = {};
+	// clang-format off
 	params[0].data = cr_strdup("The quick brown fox jumps over the lazy dog");
 	params[0].hashout = cr_memdup("\x2f\xd4\xe1\xc6\x7a\x2d\x28\xfc\xed\x84\x9e\xe1\xbb\x76\xe7\x39\x1b\x93\xeb\x12", 20);
 	params[1].data = cr_strdup("abc");
@@ -419,13 +420,16 @@ ParameterizedTestParameters(bits, test_bits_sha1) {
 	params[3].hashout = cr_memdup("\x84\x98\x3e\x44\x1c\x3b\xd2\x6e\xba\xae\x4a\xa1\xf9\x51\x29\xe5\xe5\x46\x70\xf1", 20);
 	params[4].data = cr_strdup("abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu");
 	params[4].hashout = cr_memdup("\xa4\x9b\x24\x46\xa0\x2c\x64\x5b\xf4\x19\xf9\x95\xb6\x70\x91\x25\x3a\x04\xa2\x59", 20);
+	// clang-format on
 
 	size_t nb_params = sizeof(params) / sizeof(struct sha1_params);
-	return cr_make_param_array(struct sha1_params, params, nb_params, sha1_params_cleanup);
+	return cr_make_param_array(struct sha1_params, params, nb_params,
+	                           sha1_params_cleanup);
 }
 
 ParameterizedTest(struct sha1_params *param, bits, test_bits_sha1) {
-	bits_t *bits = bits_from_raw((unsigned char *)param->data, strlen(param->data) * 8);
+	bits_t *bits =
+	    bits_from_raw((unsigned char *)param->data, strlen(param->data) * 8);
 	unsigned char hashout[20] = {};
 	bits_sha1(bits, hashout);