diff options
31 files changed, 31 insertions, 31 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a13030d..6d7c624 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ include_directories(lib) find_library(parson parson/libparson.a) find_library(sha1 sha1/libsha1.a) -file(GLOB SRC "src/math/*.c" "src/gen/*.c" "src/cm/*.c" "src/invalid/*.c" "src/io/*.c" "src/exhaustive/*.c" "src/util/*.c") +file(GLOB SRC "src/math/*.c" "src/gen/*.c" "src/cm/*.c" "src/invalid/*.c" "src/io/*.c" "src/exhaustive/*.c" "src/misc/*.c" "src/util/*.c") set(ECGEN_SRC "src/ecgen.c" ${SRC}) set(ECONVERT_SRC "src/econvert.c") diff --git a/src/cm/cm.h b/src/cm/cm.h index 546c0d5..d59db87 100644 --- a/src/cm/cm.h +++ b/src/cm/cm.h @@ -9,7 +9,7 @@ #define ECGEN_CM_H #include "io/cli.h" -#include "io/config.h" +#include "misc/config.h" /** * diff --git a/src/exhaustive/anomalous.h b/src/exhaustive/anomalous.h index ff6c053..cf8c208 100644 --- a/src/exhaustive/anomalous.h +++ b/src/exhaustive/anomalous.h @@ -10,7 +10,7 @@ #include <pari/pari.h> #include "arg.h" -#include "gen/types.h" +#include "misc/types.h" #include "io/cli.h" typedef struct disc_t { diff --git a/src/exhaustive/ansi.c b/src/exhaustive/ansi.c index b407d8e..40fbf41 100644 --- a/src/exhaustive/ansi.c +++ b/src/exhaustive/ansi.c @@ -1,6 +1,6 @@ -#include <io/config.h> -#include <gen/types.h> +#include <misc/config.h> +#include <misc/types.h> #include "ansi.h" #include "gen/seed.h" #include "gen/field.h" diff --git a/src/exhaustive/ansi.h b/src/exhaustive/ansi.h index e395691..74e787e 100644 --- a/src/exhaustive/ansi.h +++ b/src/exhaustive/ansi.h @@ -2,7 +2,7 @@ #ifndef ECGEN_ANSI_H #define ECGEN_ANSI_H -#include "gen/types.h" +#include "misc/types.h" bool ansi_seed_valid(const char *hex_str); diff --git a/src/exhaustive/arg.h b/src/exhaustive/arg.h index 1a4d0ed..415008c 100644 --- a/src/exhaustive/arg.h +++ b/src/exhaustive/arg.h @@ -8,7 +8,7 @@ #ifndef ECGEN_ARG_H #define ECGEN_ARG_H -#include "gen/types.h" +#include "misc/types.h" /** * @brief diff --git a/src/exhaustive/exhaustive.c b/src/exhaustive/exhaustive.c index af4be22..0506409 100644 --- a/src/exhaustive/exhaustive.c +++ b/src/exhaustive/exhaustive.c @@ -2,7 +2,7 @@ * ecgen, tool for generating Elliptic curve domain parameters * Copyright (C) 2017 J08nY */ -#include <io/config.h> +#include <misc/config.h> #include "exhaustive.h" #include "anomalous.h" #include "ansi.h" diff --git a/src/exhaustive/exhaustive.h b/src/exhaustive/exhaustive.h index 3b26d73..446dff2 100644 --- a/src/exhaustive/exhaustive.h +++ b/src/exhaustive/exhaustive.h @@ -8,7 +8,7 @@ #ifndef ECGEN_GENERATORS_H #define ECGEN_GENERATORS_H -#include "gen/types.h" +#include "misc/types.h" /** * diff --git a/src/gen/curve.c b/src/gen/curve.c index 80483a6..3a8d00d 100644 --- a/src/gen/curve.c +++ b/src/gen/curve.c @@ -2,7 +2,7 @@ * ecgen, tool for generating Elliptic curve domain parameters * Copyright (C) 2017 J08nY */ -#include <io/config.h> +#include <misc/config.h> #include "curve.h" #include "point.h" #include "seed.h" diff --git a/src/gen/curve.h b/src/gen/curve.h index 384c8ca..f5e6553 100644 --- a/src/gen/curve.h +++ b/src/gen/curve.h @@ -9,7 +9,7 @@ #define ECGEN_CURVE_H #include <pari/pari.h> -#include "types.h" +#include "misc/types.h" /** * GENERATOR(gen_t) diff --git a/src/gen/equation.h b/src/gen/equation.h index 58e2e6e..665c153 100644 --- a/src/gen/equation.h +++ b/src/gen/equation.h @@ -8,7 +8,7 @@ #ifndef ECGEN_EQUATION_H #define ECGEN_EQUATION_H -#include "types.h" +#include "misc/types.h" /** * GENERATOR(gen_t) diff --git a/src/gen/field.h b/src/gen/field.h index 04af2c6..da31298 100644 --- a/src/gen/field.h +++ b/src/gen/field.h @@ -8,7 +8,7 @@ #ifndef ECGEN_FIELD_H #define ECGEN_FIELD_H -#include "types.h" +#include "misc/types.h" /** * GENERATOR(gen_t) diff --git a/src/gen/gens.h b/src/gen/gens.h index f46efbf..c9e8169 100644 --- a/src/gen/gens.h +++ b/src/gen/gens.h @@ -9,7 +9,7 @@ #ifndef ECGEN_GENS_H #define ECGEN_GENS_H -#include "types.h" +#include "misc/types.h" /** * GENERATOR(gen_t) diff --git a/src/gen/order.h b/src/gen/order.h index da62c4d..e798012 100644 --- a/src/gen/order.h +++ b/src/gen/order.h @@ -8,7 +8,7 @@ #ifndef ECGEN_ORDER_H #define ECGEN_ORDER_H -#include "types.h" +#include "misc/types.h" /** * GENERATOR(gen_t) diff --git a/src/gen/point.h b/src/gen/point.h index c8cae17..fdca6f7 100644 --- a/src/gen/point.h +++ b/src/gen/point.h @@ -8,7 +8,7 @@ #ifndef ECGEN_POINT_H #define ECGEN_POINT_H -#include "types.h" +#include "misc/types.h" /** * diff --git a/src/gen/seed.c b/src/gen/seed.c index a962d03..1653a50 100644 --- a/src/gen/seed.c +++ b/src/gen/seed.c @@ -4,9 +4,9 @@ */ #include "seed.h" -#include <io/config.h> +#include <misc/config.h> #include "io/output.h" -#include "types.h" +#include "misc/types.h" #include "util/bits.h" #include "util/memory.h" diff --git a/src/gen/seed.h b/src/gen/seed.h index e6499b8..c89fc1d 100644 --- a/src/gen/seed.h +++ b/src/gen/seed.h @@ -9,7 +9,7 @@ #define ECGEN_SEED_H #include "io/input.h" -#include "types.h" +#include "misc/types.h" /** * @brief diff --git a/src/invalid/invalid.h b/src/invalid/invalid.h index 035692c..a08c5d8 100644 --- a/src/invalid/invalid.h +++ b/src/invalid/invalid.h @@ -8,7 +8,7 @@ #ifndef ECGEN_INVALID_H #define ECGEN_INVALID_H -#include "io/config.h" +#include "misc/config.h" /** * diff --git a/src/invalid/invalid_thread.h b/src/invalid/invalid_thread.h index bedaf60..0f1b4d0 100644 --- a/src/invalid/invalid_thread.h +++ b/src/invalid/invalid_thread.h @@ -9,7 +9,7 @@ #define ECGEN_INVALID_THREAD_H #include <pthread.h> -#include "gen/types.h" +#include "misc/types.h" typedef enum { STATE_FREE, STATE_GENERATING, STATE_GENERATED } state_e; diff --git a/src/io/cli.c b/src/io/cli.c index 4c6dae2..4545e7f 100644 --- a/src/io/cli.c +++ b/src/io/cli.c @@ -5,7 +5,7 @@ #include "cli.h" #include <string.h> #include <unistd.h> -#include "config.h" +#include "misc/config.h" #include "exhaustive/ansi.h" char cli_doc[] = diff --git a/src/io/input.h b/src/io/input.h index 2759973..eb836e2 100644 --- a/src/io/input.h +++ b/src/io/input.h @@ -8,7 +8,7 @@ #ifndef ECGEN_INPUT_H #define ECGEN_INPUT_H -#include "gen/types.h" +#include "misc/types.h" #include "util/random.h" /** diff --git a/src/io/output.h b/src/io/output.h index 586f4e8..6c241d5 100644 --- a/src/io/output.h +++ b/src/io/output.h @@ -10,7 +10,7 @@ #include <pari/pari.h> #include <stdbool.h> -#include "gen/types.h" +#include "misc/types.h" #ifdef DEBUG diff --git a/src/math/subgroups.h b/src/math/subgroups.h index fee095b..1c11d4c 100644 --- a/src/math/subgroups.h +++ b/src/math/subgroups.h @@ -9,7 +9,7 @@ #define ECGEN_SUBGROUPS_H #include <pari/pari.h> -#include "gen/types.h" +#include "misc/types.h" /** * @brief Enumerates prime subgroup orders of a given curve. diff --git a/src/io/config.h b/src/misc/config.h index 7b9a9dc..7b9a9dc 100644 --- a/src/io/config.h +++ b/src/misc/config.h diff --git a/src/gen/types.c b/src/misc/types.c index 63d5401..63d5401 100644 --- a/src/gen/types.c +++ b/src/misc/types.c diff --git a/src/gen/types.h b/src/misc/types.h index 38d8a64..b75394c 100644 --- a/src/gen/types.h +++ b/src/misc/types.h @@ -10,7 +10,7 @@ #include <limits.h> #include <pari/pari.h> -#include "io/config.h" +#include "misc/config.h" /** * @brief diff --git a/src/util/bits.h b/src/util/bits.h index 8eb533d..3ea0dd2 100644 --- a/src/util/bits.h +++ b/src/util/bits.h @@ -6,7 +6,7 @@ #ifndef ECGEN_BITS_H #define ECGEN_BITS_H -#include "gen/types.h" +#include "misc/types.h" #define BYTE_LEN(bit_len) \ (((bit_len) % 8 == 0) ? (bit_len) / 8 : ((bit_len) / 8) + 1) diff --git a/test/src/exhaustive/test_ansi.c b/test/src/exhaustive/test_ansi.c index 05a6820..4217a15 100644 --- a/test/src/exhaustive/test_ansi.c +++ b/test/src/exhaustive/test_ansi.c @@ -5,7 +5,7 @@ #include <criterion/criterion.h> #include <criterion/parameterized.h> -#include "gen/types.h" +#include "misc/types.h" #include "math/poly.h" #include "exhaustive/ansi.h" #include "gen/seed.h" diff --git a/test/src/io/test_cli.c b/test/src/io/test_cli.c index 1c7a208..e5077ef 100644 --- a/test/src/io/test_cli.c +++ b/test/src/io/test_cli.c @@ -6,7 +6,7 @@ #include <criterion/criterion.h> #include <unistd.h> #include "io/cli.h" -#include "io/config.h" +#include "misc/config.h" #include "test/default.h" static struct argp test_argp = {cli_options, cli_parse, cli_args_doc, diff --git a/test/src/test/output.c b/test/src/test/output.c index 0ecdf43..66c5809 100644 --- a/test/src/test/output.c +++ b/test/src/test/output.c @@ -3,7 +3,7 @@ * Copyright (C) 2017 J08nY */ #include "output.h" -#include "gen/types.h" +#include "misc/types.h" #include "io/output.h" FILE *read_out = NULL; diff --git a/test/src/util/test_bits.c b/test/src/util/test_bits.c index ed88bb3..372541a 100644 --- a/test/src/util/test_bits.c +++ b/test/src/util/test_bits.c @@ -5,7 +5,7 @@ #include <criterion/criterion.h> #include <criterion/parameterized.h> -#include <gen/types.h> +#include <misc/types.h> #include "test/default.h" #include "test/memory.h" #include "util/bits.h" |