Move some stuff from general seed_t handling in gen/seed.[ch] to exhaustive/ansi.[ch].

10 files changed, 193 insertions, 190 deletions

diff --git a/src/exhaustive/ansi.c b/src/exhaustive/ansi.c
new file mode 100644
index 0000000..0477227
--- /dev/null
+++ b/src/exhaustive/ansi.c
@@ -0,0 +1,134 @@
+
+#include <io/config.h>
+#include "ansi.h"
+#include "gen/seed.h"
+#include "util/bits.h"
+#include "util/memory.h"
+#include "io/output.h"
+
+
+bool ansi_seed_valid(const char *hex_str) {
+	size_t len = strlen(hex_str);
+	if (len < 40) {
+		return false;
+	}
+	const char *str_start = hex_str;
+	if (hex_str[0] == '0' && (hex_str[1] == 'x' || hex_str[1] == 'X')) {
+		str_start = hex_str + 2;
+	}
+	while (*str_start != 0) {
+		char c = *str_start++;
+		if (!isxdigit(c)) return false;
+	}
+	return true;
+}
+
+static bits_t *seed_stoi(const char *cstr) {
+	const char *seed_str = cstr;
+	const char *prefix = strstr(cstr, "0x");
+	if (prefix != NULL) seed_str = prefix + 2;
+	return bits_from_hex(seed_str);
+}
+
+static void seed_hash(seed_t *seed) {
+	seed->hash20 = try_malloc(20);
+	bits_sha1(seed->seed, seed->hash20);
+}
+
+static void seed_W(seed_t *seed, const config_t *cfg) {
+	pari_sp ltop = avma;
+	GEN t = utoi(cfg->bits);
+	GEN s = floorr(rdivii(subis(t, 1), stoi(160), DEFAULTPREC));
+	GEN h = subii(t, mulis(s, 160));
+	pari_printf("bits = %lu, t = %Pi, s = %Pi, h = %Pi\n", cfg->bits, t, s, h);
+
+	bits_t *c0 = bits_from_raw(seed->hash20, 160);
+	printf("H = %s, len = %lu alloc = %lu\n", bits_to_hex(c0), c0->bitlen,
+		   c0->allocated);
+	bits_shortenz(c0, 160 - itos(h));
+	printf("c0 = %s\n", bits_to_hex(c0));
+
+	bits_t *W0 = bits_copy(c0);
+	SET_BIT(W0->bits, 0, 0);
+
+	long is = itos(s);
+	seed->W = bits_copy(W0);
+	GEN two_g = int2n(seed->seed->bitlen);
+	for (long i = 1; i <= is; ++i) {
+		printf("doing i = %li\n", i);
+		pari_sp btop = avma;
+		GEN inner = bits_to_i(seed->seed);
+		inner = addis(inner, i);
+		inner = modii(inner, two_g);
+
+		bits_t *to_hash = bits_from_i(inner);
+		unsigned char hashout[20];
+		bits_sha1(to_hash, hashout);
+		bits_t *Wi = bits_from_raw(hashout, 160);
+		bits_concatz(seed->W, Wi, NULL);
+		bits_free(&to_hash);
+		bits_free(&Wi);
+		avma = btop;
+	}
+
+	bits_free(&c0);
+	bits_free(&W0);
+	avma = ltop;
+}
+
+GENERATOR(ansi_gen_seed_random) {
+	seed_t *seed = seed_new();
+	seed->seed = bits_from_i(random_int(160));
+	seed_hash(seed);
+	seed_W(seed, cfg);
+	curve->seed = seed;
+	return 1;
+}
+
+GENERATOR(ansi_gen_seed_argument) {
+	seed_t *seed = seed_new();
+	seed->seed = seed_stoi(cfg->seed);
+	seed_hash(seed);
+	seed_W(seed, cfg);
+	curve->seed = seed;
+	return 1;
+}
+
+GENERATOR(ansi_gen_seed_input) {
+	pari_sp ltop = avma;
+
+	GEN str = input_string("seed:");
+	const char *cstr = GSTR(str);
+	if (!ansi_seed_valid(cstr)) {
+		fprintf(err, "SEED must be at least 160 bits(40 hex characters).\n");
+		avma = ltop;
+		return 0;
+	}
+
+	seed_t *seed = seed_new();
+	seed->seed = seed_stoi(cstr);
+	seed_hash(seed);
+	seed_W(seed, cfg);
+	curve->seed = seed;
+	return 1;
+}
+
+static GENERATOR(ansi_gen_equation_fp) {
+	return 0;
+}
+
+static GENERATOR(ansi_gen_equation_f2m) {
+	return 0;
+}
+
+GENERATOR(ansi_gen_equation) {
+	switch (cfg->field) {
+		case FIELD_PRIME:
+			return ansi_gen_equation_fp(curve, cfg, args);
+		case FIELD_BINARY:
+			return ansi_gen_equation_f2m(curve, cfg, args);
+		default:
+			pari_err_BUG("Field not prime or binary?");
+			return INT_MIN; /* NOT REACHABLE */
+	}
+}
diff --git a/src/exhaustive/ansi.h b/src/exhaustive/ansi.h
new file mode 100644
index 0000000..8bd39fb
--- /dev/null
+++ b/src/exhaustive/ansi.h
@@ -0,0 +1,45 @@
+
+#ifndef ECGEN_ANSI_H
+#define ECGEN_ANSI_H
+
+#include "gen/types.h"
+
+bool ansi_seed_valid(const char *hex_str);
+
+/**
+ * @brief
+ * @param curve A curve_t being generated
+ * @param cfg An application config
+ * @param args unused
+ * @return state diff
+ */
+GENERATOR(ansi_gen_seed_random);
+
+/**
+ * @brief
+ * @param curve A curve_t being generated
+ * @param cfg An application config
+ * @param args unused
+ * @return state diff
+ */
+GENERATOR(ansi_gen_seed_argument);
+
+/**
+ * @brief
+ * @param curve A curve_t being generated
+ * @param cfg An application config
+ * @param args unused
+ * @return state diff
+ */
+GENERATOR(ansi_gen_seed_input);
+
+/**
+ * @brief
+ * @param curve A curve_t being generated
+ * @param cfg An application config
+ * @param args unused
+ * @return state diff
+ */
+GENERATOR(ansi_gen_equation);
+
+#endif //ECGEN_ANSI_H
diff --git a/src/exhaustive/exhaustive.c b/src/exhaustive/exhaustive.c
index 3553efb..ff30ecb 100644
--- a/src/exhaustive/exhaustive.c
+++ b/src/exhaustive/exhaustive.c
@@ -4,13 +4,13 @@
  */
 #include "exhaustive.h"
 #include "anomalous.h"
+#include "ansi.h"
 #include "gen/curve.h"
 #include "gen/equation.h"
 #include "gen/field.h"
 #include "gen/gens.h"
 #include "gen/order.h"
 #include "gen/point.h"
-#include "gen/seed.h"
 #include "io/output.h"
 #include "util/memory.h"
 
@@ -18,17 +18,17 @@ static void exhaustive_ginit(gen_t *generators, const config_t *cfg) {
 	if (cfg->from_seed) {
 		// setup ANSI X9.62 generators
 		if (cfg->seed) {
-			generators[OFFSET_SEED] = &seed_gen_argument;
+			generators[OFFSET_SEED] = &ansi_gen_seed_argument;
 		} else {
 			if (cfg->random) {
-				generators[OFFSET_SEED] = &seed_gen_random;
+				generators[OFFSET_SEED] = &ansi_gen_seed_random;
 			} else {
-				generators[OFFSET_SEED] = &seed_gen_input;
+				generators[OFFSET_SEED] = &ansi_gen_seed_input;
 			}
 		}
-		generators[OFFSET_A] = &a_gen_seed;
-		generators[OFFSET_B] = &b_gen_seed;
-		generators[OFFSET_CURVE] = &curve_gen_seed;
+		generators[OFFSET_A] = &gen_skip;
+		generators[OFFSET_B] = &ansi_gen_equation;
+		generators[OFFSET_CURVE] = &curve_gen_nonzero;
 	} else {
 		// setup normal generators
 		generators[OFFSET_SEED] = &gen_skip;
diff --git a/src/gen/curve.c b/src/gen/curve.c
index ea5ed95..80483a6 100644
--- a/src/gen/curve.c
+++ b/src/gen/curve.c
@@ -2,6 +2,7 @@
  * ecgen, tool for generating Elliptic curve domain parameters
  * Copyright (C) 2017 J08nY
  */
+#include <io/config.h>
 #include "curve.h"
 #include "point.h"
 #include "seed.h"
@@ -130,29 +131,6 @@ GENERATOR(curve_gen_nonzero) {
 	}
 }
 
-static int curve_gen_seed_fp(curve_t *curve, const config_t *cfg, arg_t *args) {
-	// TODO implement
-	return INT_MIN;
-}
-
-static int curve_gen_seed_f2m(curve_t *curve, const config_t *cfg,
-                              arg_t *args) {
-	// TODO implement
-	return INT_MIN;
-}
-
-GENERATOR(curve_gen_seed) {
-	switch (typ(curve->field)) {
-		case t_INT:
-			return curve_gen_seed_fp(curve, cfg, args);
-		case t_FFELT:
-			return curve_gen_seed_f2m(curve, cfg, args);
-		default:
-			pari_err_TYPE("curve_gen_seed", curve->field);
-			return INT_MIN; /* NOT REACHABLE */
-	}
-}
-
 UNROLL(curve_unroll) {
 	if (curve->curve) {
 		obj_free(curve->curve);
diff --git a/src/gen/curve.h b/src/gen/curve.h
index 2e7651f..384c8ca 100644
--- a/src/gen/curve.h
+++ b/src/gen/curve.h
@@ -35,18 +35,6 @@ GENERATOR(curve_gen_any);
  */
 GENERATOR(curve_gen_nonzero);
 
-/**
- * GENERATOR(gen_t)
- * Creates a curve GEN in curve_t curve from field, a and b. Using the ANSI
- * X9.62 verifiably random algorithm.
- * Succeeds if a curve exists(non-zero discriminant).
- *
- * @param curve A curve_t being generated
- * @param cfg An application config
- * @param args unused
- * @return state diff
- */
-GENERATOR(curve_gen_seed);
 
 /**
  *
diff --git a/src/gen/equation.c b/src/gen/equation.c
index 9524df7..33d41a9 100644
--- a/src/gen/equation.c
+++ b/src/gen/equation.c
@@ -56,10 +56,6 @@ GENERATOR(a_gen_one) {
 	return 1;
 }
 
-GENERATOR(a_gen_seed) {
-	// TODO implement
-	return INT_MIN;
-}
 
 GENERATOR(b_gen_random) {
 	curve->b = genrand(curve->field);
@@ -111,11 +107,6 @@ GENERATOR(b_gen_one) {
 	return 1;
 }
 
-GENERATOR(b_gen_seed) {
-	// TODO implement
-	return INT_MIN;
-}
-
 void equation_quit(void) {
 	if (a && isclone(a)) {
 		gunclone(a);
diff --git a/src/gen/seed.c b/src/gen/seed.c
index 9d0359f..8d6c7cf 100644
--- a/src/gen/seed.c
+++ b/src/gen/seed.c
@@ -4,7 +4,9 @@
  */
 
 #include "seed.h"
+#include <io/config.h>
 #include "io/output.h"
+#include "types.h"
 #include "util/bits.h"
 #include "util/memory.h"
 
@@ -53,103 +55,3 @@ void seed_free(seed_t **seed) {
 	}
 }
 
-bool seed_valid(const char *hex_str) {
-	size_t len = strlen(hex_str);
-	if (len < 40) {
-		return false;
-	}
-	const char *str_start = hex_str;
-	if (hex_str[0] == '0' && (hex_str[1] == 'x' || hex_str[1] == 'X')) {
-		str_start = hex_str + 2;
-	}
-	while (*str_start != 0) {
-		char c = *str_start++;
-		if (!isxdigit(c)) return false;
-	}
-	return true;
-}
-
-static bits_t *seed_stoi(const char *cstr) {
-	const char *seed_str = cstr;
-	const char *prefix = strstr(cstr, "0x");
-	if (prefix != NULL) seed_str = prefix + 2;
-	return bits_from_hex(seed_str);
-}
-
-static void seed_hash(seed_t *seed) {
-	seed->hash20 = try_malloc(20);
-	bits_sha1(seed->seed, seed->hash20);
-}
-
-static void seed_W(seed_t *seed, const config_t *cfg) {
-	pari_sp ltop = avma;
-	GEN t = utoi(cfg->bits);
-	GEN s = floorr(rdivii(subis(t, 1), stoi(160), DEFAULTPREC));
-	GEN h = subii(t, mulis(s, 160));
-
-	bits_t *c0 = bits_from_raw(seed->hash20, 160);
-	bits_shortenz(c0, 160 - itos(h));
-
-	bits_t *W0 = bits_copy(c0);
-	SET_BIT(W0->bits, 0, 0);
-
-	long is = itos(s);
-	seed->W = bits_copy(W0);
-	GEN two_g = int2n(seed->seed->bitlen);
-	for (long i = 1; i <= is; ++i) {
-		pari_sp btop = avma;
-		GEN inner = bits_to_i(seed->seed);
-		inner = addis(inner, i);
-		inner = modii(inner, two_g);
-
-		bits_t *to_hash = bits_from_i(inner);
-		unsigned char hashout[20];
-		bits_sha1(to_hash, hashout);
-		bits_t *Wi = bits_from_raw(hashout, 160);
-		bits_concatz(seed->W, Wi, NULL);
-		bits_free(&to_hash);
-		bits_free(&Wi);
-		avma = btop;
-	}
-
-	bits_free(&c0);
-	bits_free(&W0);
-	avma = ltop;
-}
-
-GENERATOR(seed_gen_random) {
-	seed_t *seed = seed_new();
-	seed->seed = bits_from_i(random_int(160));
-	seed_hash(seed);
-	seed_W(seed, cfg);
-	curve->seed = seed;
-	return 1;
-}
-
-GENERATOR(seed_gen_argument) {
-	seed_t *seed = seed_new();
-	seed->seed = seed_stoi(cfg->seed);
-	seed_hash(seed);
-	seed_W(seed, cfg);
-	curve->seed = seed;
-	return 1;
-}
-
-GENERATOR(seed_gen_input) {
-	pari_sp ltop = avma;
-
-	GEN str = input_string("seed:");
-	const char *cstr = GSTR(str);
-	if (!seed_valid(cstr)) {
-		fprintf(err, "SEED must be at least 160 bits(40 hex characters).\n");
-		avma = ltop;
-		return 0;
-	}
-
-	seed_t *seed = seed_new();
-	seed->seed = seed_stoi(cstr);
-	seed_hash(seed);
-	seed_W(seed, cfg);
-	curve->seed = seed;
-	return 1;
-}
diff --git a/src/gen/seed.h b/src/gen/seed.h
index 1cd466d..e6499b8 100644
--- a/src/gen/seed.h
+++ b/src/gen/seed.h
@@ -53,38 +53,5 @@ seed_t *seed_new_clone(const seed_t *src);
  */
 void seed_free(seed_t **seed);
 
-/**
- * @brief
- * @param hex_str
- * @return
- */
-bool seed_valid(const char *hex_str);
-
-/**
- * @brief
- * @param curve A curve_t being generated
- * @param cfg An application config
- * @param args unused
- * @return state diff
- */
-GENERATOR(seed_gen_random);
-
-/**
- * @brief
- * @param curve A curve_t being generated
- * @param cfg An application config
- * @param args unused
- * @return state diff
- */
-GENERATOR(seed_gen_argument);
-
-/**
- * @brief
- * @param curve A curve_t being generated
- * @param cfg An application config
- * @param args unused
- * @return state diff
- */
-GENERATOR(seed_gen_input);
 
 #endif  // ECGEN_SEED_H
diff --git a/src/io/cli.c b/src/io/cli.c
index dbffd89..960c827 100644
--- a/src/io/cli.c
+++ b/src/io/cli.c
@@ -6,7 +6,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "config.h"
-#include "gen/seed.h"
+#include "exhaustive/ansi.h"
 
 char cli_doc[] =
     "ecgen, tool for generating Elliptic curve domain parameters.\v(C) 2017 "
@@ -201,7 +201,7 @@ error_t cli_parse(int key, char *arg, struct argp_state *state) {
 		case OPT_SEED:
 			cfg->from_seed = true;
 			if (arg) {
-				if (!seed_valid(arg)) {
+				if (!ansi_seed_valid(arg)) {
 					argp_failure(
 					    state, 1, 0,
 					    "SEED must be at least 160 bits (40 characters).");
diff --git a/src/util/bits.c b/src/util/bits.c
index ab8180b..1573308 100644
--- a/src/util/bits.c
+++ b/src/util/bits.c
@@ -10,8 +10,7 @@
 bits_t *bits_new(size_t bit_len) {
 	bits_t *result = try_calloc(sizeof(bits_t));
 	size_t byte_len = BYTE_LEN(bit_len);
-	if (byte_len > 0)
-		result->bits = try_calloc(byte_len);
+	if (byte_len > 0) result->bits = try_calloc(byte_len);
 	result->allocated = byte_len;
 	result->bitlen = bit_len;
 	return result;
@@ -83,8 +82,7 @@ bits_t *bits_from_raw(const unsigned char *bits, size_t bit_len) {
 	bits_t *result = try_calloc(sizeof(bits_t));
 	result->bitlen = bit_len;
 	result->allocated = BYTE_LEN(bit_len);
-	if (bit_len > 0)
-		result->bits = try_memdup(bits, result->allocated);
+	if (bit_len > 0) result->bits = try_memdup(bits, result->allocated);
 	return result;
 }