aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/exhaustive/ansi.c4
-rw-r--r--src/exhaustive/exhaustive.c5
-rw-r--r--src/gen/equation.c4
-rw-r--r--src/gen/field.c2
-rw-r--r--src/gen/gp.c120
-rw-r--r--src/gen/gp.h19
-rw-r--r--src/misc/types.h6
7 files changed, 151 insertions, 9 deletions
diff --git a/src/exhaustive/ansi.c b/src/exhaustive/ansi.c
index 51d20e5..d18ea02 100644
--- a/src/exhaustive/ansi.c
+++ b/src/exhaustive/ansi.c
@@ -183,9 +183,9 @@ static GENERATOR(ansi_gen_equation_f2m) {
GENERATOR(ansi_gen_equation) {
switch (cfg->field) {
case FIELD_PRIME:
- return ansi_gen_equation_fp(curve, cfg, args);
+ return ansi_gen_equation_fp(curve, cfg, args, state);
case FIELD_BINARY:
- return ansi_gen_equation_f2m(curve, cfg, args);
+ return ansi_gen_equation_f2m(curve, cfg, args, state);
default:
pari_err_BUG("Field not prime or binary?");
return INT_MIN; /* NOT REACHABLE */
diff --git a/src/exhaustive/exhaustive.c b/src/exhaustive/exhaustive.c
index 623396e..30d2c47 100644
--- a/src/exhaustive/exhaustive.c
+++ b/src/exhaustive/exhaustive.c
@@ -230,14 +230,15 @@ int exhaustive_gen_retry(curve_t *curve, const config_t *cfg,
arg_t *arg = argss ? argss[state] : NULL;
- int diff = generators[state](curve, cfg, arg);
+ int diff = generators[state](curve, cfg, arg, (offset_e)state);
int new_state = state + diff;
if (new_state < start_offset) new_state = start_offset;
if (diff > 0 && validators && validators[state]) {
check_t *validator = validators[state];
for (size_t i = 0; i < validator->nchecks; ++i) {
- int new_diff = validator->checks[i](curve, cfg, arg);
+ int new_diff =
+ validator->checks[i](curve, cfg, arg, (offset_e)state);
if (new_diff <= 0) {
diff = new_diff;
break;
diff --git a/src/gen/equation.c b/src/gen/equation.c
index 76d0498..9d85c13 100644
--- a/src/gen/equation.c
+++ b/src/gen/equation.c
@@ -36,7 +36,7 @@ GENERATOR(a_gen_once) {
return 1;
}
- int inp = a_gen_input(curve, cfg, args);
+ int inp = a_gen_input(curve, cfg, args, state);
if (inp > 0) {
a = gclone(curve->a);
curve_a = curve;
@@ -86,7 +86,7 @@ GENERATOR(b_gen_once) {
return 1;
}
- int inp = b_gen_input(curve, cfg, args);
+ int inp = b_gen_input(curve, cfg, args, state);
if (inp > 0) {
b = gclone(curve->b);
curve_b = curve;
diff --git a/src/gen/field.c b/src/gen/field.c
index 9a908cc..898af9e 100644
--- a/src/gen/field.c
+++ b/src/gen/field.c
@@ -104,7 +104,7 @@ GENERATOR(field_gen_once) {
return 1;
}
- int inp = field_gen_input(curve, cfg, args);
+ int inp = field_gen_input(curve, cfg, args, state);
if (inp > 0) {
field = gclone(curve->field);
curve_field = curve;
diff --git a/src/gen/gp.c b/src/gen/gp.c
new file mode 100644
index 0000000..dff7ca1
--- /dev/null
+++ b/src/gen/gp.c
@@ -0,0 +1,120 @@
+/*
+ * ecgen, tool for generating Elliptic curve domain parameters
+ * Copyright (C) 2017 J08nY
+ */
+#include "gp.h"
+#include "exhaustive/arg.h"
+#include "io/output.h"
+#include "point.h"
+#include "seed.h"
+#include "util/bits.h"
+
+static point_t **gp_points(const curve_t *curve, GEN point_vec) {
+ long len = glength(point_vec);
+ point_t **result = points_new((size_t)len);
+
+ for (long i = 1; i <= len; ++i) {
+ point_t *point = point_new();
+ point->point = gel(point_vec, i);
+ point->order = ellorder(curve->curve, point->point, NULL);
+ result[i - 1] = point;
+ }
+ return result;
+}
+
+static point_t **gp_gens(const curve_t *curve, GEN gens_vec) {
+ point_t **result = gp_points(curve, gens_vec);
+
+ long len = glength(gens_vec);
+ for (long i = 1; i <= len; ++i) {
+ point_t *gen = result[i - 1];
+ gen->cofactor = divii(curve->order, gen->order);
+ }
+ return result;
+}
+
+GENERATOR(gp_gen) {
+ HAS_ARG(args);
+ pari_sp ltop = avma;
+ GEN closure = compile_str(args->args);
+ GEN params = zerovec(state - OFFSET_SEED);
+
+ if (state > OFFSET_SEED) {
+ if (curve->seed && curve->seed->seed) {
+ gel(params, 1) = bits_to_bitvec(curve->seed->seed);
+ }
+ }
+
+ if (state > OFFSET_FIELD) {
+ gel(params, 2) = curve->field;
+ }
+
+ if (state > OFFSET_A) {
+ gel(params, 3) = curve->a;
+ }
+
+ if (state > OFFSET_B) {
+ gel(params, 4) = curve->b;
+ }
+
+ if (state > OFFSET_CURVE) {
+ gel(params, 5) = curve->curve;
+ }
+
+ if (state > OFFSET_ORDER) {
+ gel(params, 6) = curve->order;
+ }
+
+ if (state > OFFSET_GENERATORS) {
+ GEN gens = zerovec(curve->ngens);
+ for (size_t i = 0; i < curve->ngens; ++i) {
+ gel(gens, i + 1) = curve->generators[i]->point;
+ }
+ gel(params, 7) = gens;
+ }
+
+ if (state > OFFSET_POINTS) {
+ GEN points = zerovec(curve->npoints);
+ for (size_t i = 0; i < curve->npoints; ++i) {
+ gel(points, i + 1) = curve->points[i]->point;
+ }
+ gel(params, 8) = points;
+ }
+
+ GEN res = call0(closure, zerovec(0));
+ res = call0(res, params);
+
+ res = gerepileupto(ltop, res);
+ switch (state) {
+ case OFFSET_SEED:
+ curve->seed = seed_new();
+ curve->seed->seed = bits_from_bitvec(res);
+ break;
+ case OFFSET_FIELD:
+ curve->field = res;
+ break;
+ case OFFSET_A:
+ curve->a = res;
+ break;
+ case OFFSET_B:
+ curve->b = res;
+ break;
+ case OFFSET_CURVE:
+ curve->curve = res;
+ break;
+ case OFFSET_ORDER:
+ curve->order = res;
+ break;
+ case OFFSET_GENERATORS:
+ curve->ngens = (size_t)glength(res);
+ curve->generators = gp_gens(curve, res);
+ break;
+ case OFFSET_POINTS:
+ curve->npoints = (size_t)glength(res);
+ curve->points = gp_points(curve, res);
+ break;
+ case OFFSET_END:
+ break;
+ }
+ return 1;
+} \ No newline at end of file
diff --git a/src/gen/gp.h b/src/gen/gp.h
new file mode 100644
index 0000000..c0ee1af
--- /dev/null
+++ b/src/gen/gp.h
@@ -0,0 +1,19 @@
+/*
+ * ecgen, tool for generating Elliptic curve domain parameters
+ * Copyright (C) 2017 J08nY
+ */
+#ifndef ECGEN_GP_H
+#define ECGEN_GP_H
+
+#include "misc/types.h"
+
+/**
+ * @brief
+ * @param curve
+ * @param cfg
+ * @param args
+ * @return
+ */
+GENERATOR(gp_gen);
+
+#endif // ECGEN_GP_H
diff --git a/src/misc/types.h b/src/misc/types.h
index 103cf8a..d20ed2b 100644
--- a/src/misc/types.h
+++ b/src/misc/types.h
@@ -116,10 +116,12 @@ typedef struct {
* @param curve A curve_t being generated
* @param cfg An application config
* @param args Current optional generator argument
+ * @param state The current generation state
* @return state diff
*/
-#define GENERATOR(gen_name) \
- int gen_name(curve_t *curve, const config_t *cfg, arg_t *args)
+#define GENERATOR(gen_name) \
+ int gen_name(curve_t *curve, const config_t *cfg, arg_t *args, \
+ offset_e state)
typedef GENERATOR((*gen_f));
generated by cgit v1.2.3-70-g09d2 (git 2.51.2) at 2025-11-08 22:52:08 +0000