6 files changed, 108 insertions, 84 deletions

diff --git a/src/exhaustive/anomalous.c b/src/exhaustive/anomalous.c
index 7838aa8..93adf7d 100644
--- a/src/exhaustive/anomalous.c
+++ b/src/exhaustive/anomalous.c
@@ -56,10 +56,12 @@ static GEN anomalous_prime(size_t i, unsigned long bits) {
 	GEN lower = divii(subii(int2n(bits - 1), last), D);
 	GEN upper = divii(subii(int2n(bits), last), D);
 
-	GEN lower_bound = gceil(gdiv(
-	    gsub(gsqrt(addis(mulis(lower, 4), 1), BIGDEFAULTPREC*2), gen_1), gen_2));
-	GEN upper_bound = gfloor(gdiv(
-	    gsub(gsqrt(addis(mulis(upper, 4), 1), BIGDEFAULTPREC*2), gen_1), gen_2));
+	GEN lower_bound = gceil(
+	    gdiv(gsub(gsqrt(addis(mulis(lower, 4), 1), BIGDEFAULTPREC * 2), gen_1),
+	         gen_2));
+	GEN upper_bound = gfloor(
+	    gdiv(gsub(gsqrt(addis(mulis(upper, 4), 1), BIGDEFAULTPREC * 2), gen_1),
+	         gen_2));
 
 	GEN range = gtovec0(gen_0, 2);
 	gel(range, 1) = lower_bound;
diff --git a/src/io/cli.c b/src/io/cli.c
index cc2f156..ae27d06 100644
--- a/src/io/cli.c
+++ b/src/io/cli.c
@@ -227,6 +227,8 @@ error_t cli_parse(int key, char *arg, struct argp_state *state) {
 			}
 
 			cfg->bits = strtoul(arg, NULL, 10);
+			cfg->hex_digits =
+			    2 * (cfg->bits / 8 + (cfg->bits % 8 != 0 ? 1 : 0));
 			break;
 		case ARGP_KEY_END:
 			// validate all option states here.
diff --git a/src/io/config.h b/src/io/config.h
index 426661c..42a48be 100644
--- a/src/io/config.h
+++ b/src/io/config.h
@@ -53,6 +53,7 @@ typedef struct {
 	char *verbose_log;
 
 	unsigned long bits;
+	unsigned long hex_digits;
 
 } config_t;
 
diff --git a/src/io/output.c b/src/io/output.c
index 6fe8802..749d008 100644
--- a/src/io/output.c
+++ b/src/io/output.c
@@ -5,7 +5,6 @@
 
 #include "output.h"
 #include <parson/parson.h>
-#include "math/curve.h"
 #include "math/field.h"
 
 FILE *out;
@@ -23,36 +22,99 @@ char *output_malloc(const char *what) {
 
 char *output_scsv(curve_t *curve, const config_t *cfg) {
 	pari_sp ltop = avma;
-	GEN vector = curve_params(curve);
+	char *params[OFFSET_END];
 
-	long len = glength(vector);
-	char *params[len];
-	size_t lengths[len];
-	size_t total = 0;
-	for (long i = 0; i < len; ++i) {
-		params[i] = pari_sprintf("%P#x", gel(vector, i + 1));
-		lengths[i] = strlen(params[i]);
-		total += lengths[i];
+	for (int i = 0; i < OFFSET_END; ++i) {
+		params[i] = NULL;
 	}
 
-	char *result = (char *)malloc(total + len);
-	if (!result) {
-		perror("Couldn't malloc.");
-		exit(1);
+	switch (cfg->field) {
+		case FIELD_PRIME:
+			params[OFFSET_FIELD] =
+			    pari_sprintf("%P0#*x", cfg->hex_digits, curve->field);
+			break;
+		case FIELD_BINARY: {
+			GEN field = field_params(curve->field);
+			params[OFFSET_FIELD] =
+			    pari_sprintf("%P#x,%P#x,%P#x,%P#x", gel(field, 1),
+			                 gel(field, 2), gel(field, 3), gel(field, 4));
+			break;
+		}
+	}
+
+	if (curve->a)
+		params[OFFSET_A] =
+		    pari_sprintf("%P0#*x", cfg->hex_digits, field_elementi(curve->a));
+	if (curve->b)
+		params[OFFSET_B] =
+		    pari_sprintf("%P0#*x", cfg->hex_digits, field_elementi(curve->b));
+
+	if (curve->generators) {
+		char *gens[curve->ngens];
+		size_t len = 0;
+		for (size_t i = 0; i < curve->ngens; ++i) {
+			point_t *generator = curve->generators[i];
+			GEN x = field_elementi(gel(generator->point, 1));
+			GEN y = field_elementi(gel(generator->point, 2));
+			gens[i] = pari_sprintf("%P0#*x,%P0#*x,%P#x,%P#x", cfg->hex_digits,
+			                       x, cfg->hex_digits, y, generator->order,
+			                       generator->cofactor);
+			len += strlen(gens[i]);
+		}
+		size_t lenn = sizeof(char) * (len + curve->ngens);
+		params[OFFSET_GENERATORS] = pari_malloc(lenn);
+		params[OFFSET_GENERATORS][0] = '\0';
+		for (size_t i = 0; i < curve->ngens; ++i) {
+			if (i > 0) strncat(params[OFFSET_GENERATORS], ",", lenn - 1);
+			strncat(params[OFFSET_GENERATORS], gens[i], lenn - 1);
+			pari_free(gens[i]);
+		}
 	}
 
-	size_t offset = 0;
-	for (long i = 0; i < len; ++i) {
-		memcpy(result + offset, params[i], lengths[i]);
-		free(params[i]);
+	if (curve->order)
+		params[OFFSET_ORDER] =
+		    pari_sprintf("%P0#*x", cfg->hex_digits, curve->order);
 
-		offset += lengths[i];
-		if (i != len - 1) {
-			result[offset] = ',';
-			offset++;
+	if (curve->points) {
+		char *points[curve->npoints];
+		size_t len = 0;
+		for (size_t i = 0; i < curve->npoints; ++i) {
+			point_t *point = curve->points[i];
+			GEN x = field_elementi(gel(point->point, 1));
+			GEN y = field_elementi(gel(point->point, 2));
+			points[i] = pari_sprintf("%P0#*x,%P0#*x,%P#x", cfg->hex_digits, x,
+			                         cfg->hex_digits, y, point->order);
+			len += strlen(points[i]);
+		}
+		size_t lenn = sizeof(char) * (len + curve->npoints);
+		params[OFFSET_POINTS] = pari_malloc(lenn);
+		params[OFFSET_POINTS][0] = '\0';
+		for (size_t i = 0; i < curve->npoints; ++i) {
+			if (i > 0) strncat(params[OFFSET_POINTS], ",", lenn - 1);
+			strncat(params[OFFSET_POINTS], points[i], lenn - 1);
+			pari_free(points[i]);
+		}
+	}
+
+	size_t len = 0;
+	size_t count = 0;
+	for (int i = OFFSET_FIELD; i < OFFSET_END; ++i) {
+		if (params[i]) {
+			len += strlen(params[i]);
+			++count;
+		}
+	}
+	size_t lenn = sizeof(char) * (len + count);
+	char *result = pari_malloc(lenn);
+	result[0] = '\0';
+
+	for (int i = OFFSET_FIELD; i < OFFSET_END; ++i) {
+		if (params[i]) {
+			if (i > OFFSET_FIELD) strncat(result, ",", lenn - 1);
+			strncat(result, params[i], lenn - 1);
+			pari_free(params[i]);
 		}
 	}
-	memset(result + offset, 0, 1);
 
 	avma = ltop;
 	return result;
@@ -72,7 +134,7 @@ static JSON_Value *output_jjson(curve_t *curve, const config_t *cfg) {
 
 	switch (cfg->field) {
 		case FIELD_PRIME: {
-			char *prime = pari_sprintf("%P#x", curve->field);
+			char *prime = pari_sprintf("%P0#*x", cfg->hex_digits, curve->field);
 			json_object_dotset_string(root_object, "field.p", prime);
 			pari_free(prime);
 			break;
@@ -98,13 +160,13 @@ static JSON_Value *output_jjson(curve_t *curve, const config_t *cfg) {
 			exit(1);
 	}
 
-	char *a = pari_sprintf("%P#x", field_elementi(curve->a));
+	char *a = pari_sprintf("%P0#*x", cfg->hex_digits, field_elementi(curve->a));
 	json_object_set_string(root_object, "a", a);
 	pari_free(a);
-	char *b = pari_sprintf("%P#x", field_elementi(curve->b));
+	char *b = pari_sprintf("%P0#*x", cfg->hex_digits, field_elementi(curve->b));
 	json_object_set_string(root_object, "b", b);
 	pari_free(b);
-	char *order = pari_sprintf("%P#x", curve->order);
+	char *order = pari_sprintf("%P0#*x", cfg->hex_digits, curve->order);
 	json_object_set_string(root_object, "order", order);
 	pari_free(order);
 	if (curve->ngens) {
@@ -116,11 +178,13 @@ static JSON_Value *output_jjson(curve_t *curve, const config_t *cfg) {
 			JSON_Object *point_object = json_value_get_object(point_value);
 
 			char *x = pari_sprintf(
-			    "%P#x", field_elementi(gel(curve->generators[i]->point, 1)));
+			    "%P0#*x", cfg->hex_digits,
+			    field_elementi(gel(curve->generators[i]->point, 1)));
 			json_object_set_string(point_object, "x", x);
 			pari_free(x);
 			char *y = pari_sprintf(
-			    "%P#x", field_elementi(gel(curve->generators[i]->point, 2)));
+			    "%P0#*x", cfg->hex_digits,
+			    field_elementi(gel(curve->generators[i]->point, 2)));
 			json_object_set_string(point_object, "y", y);
 			pari_free(y);
 			char *p_order = pari_sprintf("%P#x", curve->generators[i]->order);
@@ -147,12 +211,14 @@ static JSON_Value *output_jjson(curve_t *curve, const config_t *cfg) {
 			JSON_Value *point_value = json_value_init_object();
 			JSON_Object *point_object = json_value_get_object(point_value);
 
-			char *x = pari_sprintf(
-			    "%P#x", field_elementi(gel(curve->points[i]->point, 1)));
+			char *x =
+			    pari_sprintf("%P0#*x", cfg->hex_digits,
+			                 field_elementi(gel(curve->points[i]->point, 1)));
 			json_object_set_string(point_object, "x", x);
 			pari_free(x);
-			char *y = pari_sprintf(
-			    "%P#x", field_elementi(gel(curve->points[i]->point, 2)));
+			char *y =
+			    pari_sprintf("%P0#*x", cfg->hex_digits,
+			                 field_elementi(gel(curve->points[i]->point, 2)));
 			json_object_set_string(point_object, "y", y);
 			pari_free(y);
 			char *p_order = pari_sprintf("%P#x", curve->points[i]->order);
diff --git a/src/math/curve.c b/src/math/curve.c
index 00e65f0..633cf27 100644
--- a/src/math/curve.c
+++ b/src/math/curve.c
@@ -168,38 +168,3 @@ int curve_unroll(curve_t *curve, const config_t *cfg, pari_sp from,
 	}
 	return -1;
 }
-
-GEN curve_params(const curve_t *curve) {
-	pari_sp ltop = avma;
-
-	GEN result = field_params(curve->field);
-	if (curve->a) result = gconcat(result, field_elementi(curve->a));
-	if (curve->b) result = gconcat(result, field_elementi(curve->b));
-	if (curve->generators) {
-		for (size_t i = 0; i < curve->ngens; ++i) {
-			GEN x = field_elementi(gel(curve->generators[i]->point, 1));
-			GEN y = field_elementi(gel(curve->generators[i]->point, 2));
-			result = gconcat(result, x);
-			result = gconcat(result, y);
-			result = gconcat(result, curve->generators[i]->order);
-			if (curve->generators[i]->cofactor) {
-				result = gconcat(result, curve->generators[i]->cofactor);
-			}
-		}
-	}
-	if (curve->order) result = gconcat(result, gtovec(curve->order));
-	if (curve->points) {
-		for (size_t i = 0; i < curve->npoints; ++i) {
-			GEN x = field_elementi(gel(curve->points[i]->point, 1));
-			GEN y = field_elementi(gel(curve->points[i]->point, 2));
-			result = gconcat(result, x);
-			result = gconcat(result, y);
-			result = gconcat(result, curve->points[i]->order);
-			if (curve->points[i]->cofactor) {
-				result = gconcat(result, curve->points[i]->cofactor);
-			}
-		}
-	}
-
-	return gerepilecopy(ltop, result);
-}
diff --git a/src/math/curve.h b/src/math/curve.h
index c250040..c8df723 100644
--- a/src/math/curve.h
+++ b/src/math/curve.h
@@ -59,18 +59,6 @@ int curve_seed(curve_t *curve, const config_t *cfg, arg_t *args);
 int curve_unroll(curve_t *curve, const config_t *cfg, pari_sp from, pari_sp to);
 
 /**
- * Serializes curve parameters into a t_VEC:
- * - prime field:
- * 	p,a,b,order,(point.x, point.y, point.order)*
- * - binary field:
- *  e1,e2,e3,a,b,order,(point.x, point.y, point.order)*
- *
- * @param curve to serialize
- * @return a t_VEC of curve parameters
- */
-GEN curve_params(const curve_t *curve);
-
-/**
  * Allocates and zeros out a new curve_t object.
  * @return new curve
  */