aboutsummaryrefslogtreecommitdiff
path: root/src/io/cli.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/io/cli.c')
-rw-r--r--src/io/cli.c318
1 files changed, 178 insertions, 140 deletions
diff --git a/src/io/cli.c b/src/io/cli.c
index a538827..2aa2998 100644
--- a/src/io/cli.c
+++ b/src/io/cli.c
@@ -3,6 +3,7 @@
* Copyright (C) 2017 J08nY
*/
#include "cli.h"
+#include <misc/config.h>
#include <string.h>
#include "exhaustive/ansi.h"
@@ -43,32 +44,34 @@ struct argp_option cli_options[] = {
{"fp", OPT_FP, 0, 0, "Prime field.", 1},
{"f2m", OPT_F2M, 0, 0, "Binary field.", 1},
- {0, 0, 0, 0, "Generation options:", 2},
- {"random", OPT_RANDOM, 0, 0, "Generate a random curve (using Random approach).", 2},
- {"prime", OPT_PRIME, 0, 0, "Generate a curve with prime order.", 2},
- {"cofactor", OPT_COFACTOR, "BOUND", 0, "Generate a curve with cofactor up to BOUND.", 2},
- {"koblitz", OPT_KOBLITZ, "A", OPTION_ARG_OPTIONAL,"Generate a Koblitz curve (a in {0, 1}, b = 1).", 2},
- {"unique", OPT_UNIQUE, 0, 0, "Generate a curve with only one generator.", 2},
+ {0, 0, 0, 0, "Generation methods:", 2},
+ {"order", OPT_ORDER, "ORDER", 0, "Generate a curve with given order (using Complex Multiplication). **NOT IMPLEMENTED**", 2},
{"anomalous", OPT_ANOMALOUS, 0, 0, "Generate an anomalous curve (of trace one, with field order equal to curve order).", 2},
- {"points", OPT_POINTS, "TYPE", 0, "Generate points of given type (random/prime/all/nonprime/none).", 2},
{"ansi", OPT_ANSI, "SEED", OPTION_ARG_OPTIONAL, "Generate a curve from SEED (ANSI X9.62 verifiable procedure).", 2},
{"invalid", OPT_INVALID, 0, 0, "Generate a set of invalid curves, for a given curve (using Invalid curve algorithm).", 2},
- {"order", OPT_ORDER, "ORDER", 0, "Generate a curve with given order (using Complex Multiplication). **NOT IMPLEMENTED**", 2},
- {"count", OPT_COUNT, "COUNT", 0, "Generate multiple curves.", 2},
- {0, 0, 0, 0, "Input/Output options:", 3},
- {"format", OPT_FORMAT, "FORMAT", 0, "Format to output in. One of {csv, json}, default is json.", 3},
- {"input", OPT_INPUT, "FILE", 0, "Input from file.", 3},
- {"output", OPT_OUTPUT, "FILE", 0, "Output into file. Overwrites any existing file!", 3},
- {"append", OPT_APPEND, 0, 0, "Append to output file (don't overwrite).", 3},
- {"verbose", OPT_VERBOSE, "FILE", OPTION_ARG_OPTIONAL, "Verbose logging (to stdout or file).", 3},
+ {0, 0, 0, 0, "Generation options:", 3},
+ {"random", OPT_RANDOM, 0, 0, "Generate a random curve (using Random approach).", 3},
+ {"prime", OPT_PRIME, 0, 0, "Generate a curve with prime order.", 3},
+ {"cofactor", OPT_COFACTOR, "BOUND", 0, "Generate a curve with cofactor up to BOUND.", 3},
+ {"koblitz", OPT_KOBLITZ, "A", OPTION_ARG_OPTIONAL,"Generate a Koblitz curve (a in {0, 1}, b = 1).", 3},
+ {"unique", OPT_UNIQUE, 0, 0, "Generate a curve with only one generator.", 3},
+ {"points", OPT_POINTS, "TYPE", 0, "Generate points of given type (random/prime/all/nonprime/none).", 3},
+ {"count", OPT_COUNT, "COUNT", 0, "Generate multiple curves.", 3},
+
+ {0, 0, 0, 0, "Input/Output options:", 4},
+ {"format", OPT_FORMAT, "FORMAT", 0, "Format to output in. One of {csv, json}, default is json.", 4},
+ {"input", OPT_INPUT, "FILE", 0, "Input from file.", 4},
+ {"output", OPT_OUTPUT, "FILE", 0, "Output into file. Overwrites any existing file!", 4},
+ {"append", OPT_APPEND, 0, 0, "Append to output file (don't overwrite).", 4},
+ {"verbose", OPT_VERBOSE, "FILE", OPTION_ARG_OPTIONAL, "Verbose logging (to stdout or file).", 4},
- {0, 0, 0, 0, "Other:", 4},
- {"data-dir", OPT_DATADIR, "DIR", 0, "Set PARI/GP data directory (containing seadata package).", 4},
- {"memory", OPT_MEMORY, "SIZE", 0, "Use PARI stack of SIZE (can have suffix k/m/g).", 4},
- {"threads", OPT_THREADS, "NUM", 0, "Use NUM threads.", 4},
- {"thread-stack", OPT_TSTACK, "SIZE", 0, "Use PARI stack of SIZE (per thread, can have suffix k/m/g).", 4},
- {"timeout", OPT_TIMEOUT, "TIME", 0, "Timeout computation of a curve parameter after TIME (can have suffix s/m/h/d).", 4},
+ {0, 0, 0, 0, "Other:", 5},
+ {"data-dir", OPT_DATADIR, "DIR", 0, "Set PARI/GP data directory (containing seadata package).", 5},
+ {"memory", OPT_MEMORY, "SIZE", 0, "Use PARI stack of SIZE (can have suffix k/m/g).", 5},
+ {"threads", OPT_THREADS, "NUM", 0, "Use NUM threads.", 5},
+ {"thread-stack", OPT_TSTACK, "SIZE", 0, "Use PARI stack of SIZE (per thread, can have suffix k/m/g).", 5},
+ {"timeout", OPT_TIMEOUT, "TIME", 0, "Timeout computation of a curve parameter after TIME (can have suffix s/m/h/d).", 5},
{0}
};
// clang-format on
@@ -110,63 +113,119 @@ static unsigned long cli_parse_time(const char *str, struct argp_state *state) {
return read;
}
-error_t cli_parse(int key, char *arg, struct argp_state *state) {
- switch (key) {
- case OPT_DATADIR:
- cfg->datadir = arg;
+static void cli_end(struct argp_state *state) {
+ // validate all option states here.
+ // Only one field
+ if (cfg->field == 0 || cfg->field == (FIELD_PRIME | FIELD_BINARY)) {
+ argp_failure(state, 1, 0,
+ "Specify field type, prime or binary, with --fp / "
+ "--f2m (but not both).");
+ }
+ // Only one gen method
+ switch (cfg->method) {
+ case METHOD_DEFAULT:
break;
- case OPT_MEMORY:
- cfg->memory = cli_parse_memory(arg, state);
+ case METHOD_CM:
break;
- case OPT_TSTACK:
- cfg->thread_memory = cli_parse_memory(arg, state);
+ case METHOD_ANOMALOUS:
break;
- case OPT_TIMEOUT:
- cfg->timeout = cli_parse_time(arg, state);
+ case METHOD_SEED:
break;
- case OPT_THREADS:
- if (!strcmp(arg, "auto") || !strcmp(arg, "AUTO")) {
- long nprocs = sysconf(_SC_NPROCESSORS_ONLN);
- if (nprocs > 0) {
- cfg->threads = (unsigned long)nprocs;
- }
- } else {
- cfg->threads = strtoul(arg, NULL, 10);
- if (!cfg->threads) {
- argp_failure(state, 1, 0,
- "Invalid number of threads specified.");
- }
- }
+ case METHOD_INVALID:
break;
- case OPT_COUNT:
- cfg->count = strtoul(arg, NULL, 10);
+ default:
+ printf("%u\n", cfg->method);
+ argp_failure(state, 1, 0,
+ "Only one generation method can be specified.");
break;
- case OPT_FORMAT:
- if (!strcmp(arg, "csv")) {
- cfg->format = FORMAT_CSV;
- } else if (!strcmp(arg, "json")) {
- cfg->format = FORMAT_JSON;
- } else {
- argp_failure(state, 1, 0,
- "Invalid format specified. One of [csv, json] "
- "is valid.");
- }
+ }
+
+ /*
+ // Invalid is not prime or seed by definition.
+ if (cfg->invalid &&
+ (cfg->prime || cfg->seed_algo || cfg->cofactor)) {
+ // not seed, not prime
+ argp_failure(state, 1, 0,
+ "Invalid curve generation can not generate curves "
+ "from seed, exhaustive or prime order.");
+ }
+ if (cfg->cm && (cfg->prime || cfg->seed_algo || cfg->invalid ||
+ cfg->cofactor || cfg->anomalous)) {
+ argp_failure(state, 1, 0,
+ "Fixed order curve generation can not generate "
+ "curves from seed, or invalid curves. Prime order "
+ "also doesn't make sense if the given one isn't "
+ "prime.");
+ }
+ if (cfg->anomalous &&
+ (cfg->binary_field || cfg->cofactor || cfg->seed_algo ||
+ cfg->cm || cfg->invalid || cfg->koblitz)) {
+ argp_failure(
+ state, 1, 0,
+ "Anomalous curve generation can not generate "
+ "binary field curves, curves with a cofactor, from seed "
+ "with fixed order, invalid or Koblitz curves.");
+ }
+
+ */
+ // default values
+ if (!cfg->count) {
+ cfg->count = 1;
+ }
+ if (!cfg->memory) {
+ cfg->memory = 1000000000;
+ }
+ if (!cfg->threads) {
+ cfg->threads = 1;
+ }
+ if (!cfg->thread_memory) {
+ cfg->thread_memory = cfg->bits * 2000000;
+ }
+ if (!cfg->points.type) {
+ cfg->points.type = POINTS_PRIME;
+ }
+}
+
+error_t cli_parse(int key, char *arg, struct argp_state *state) {
+ switch (key) {
+ /* Field options */
+ case OPT_FP:
+ cfg->field |= FIELD_PRIME;
break;
- case OPT_INPUT:
- cfg->input = arg;
+ case OPT_F2M:
+ cfg->field |= FIELD_BINARY;
break;
- case OPT_OUTPUT:
- cfg->output = arg;
+
+ /* Generation method */
+ case OPT_INVALID:
+ cfg->method |= METHOD_INVALID;
break;
- case OPT_APPEND:
- cfg->append = true;
+ case OPT_ORDER:
+ cfg->method |= METHOD_CM;
+ if (arg) {
+ cfg->cm_order = arg;
+ }
break;
- case OPT_VERBOSE:
- cfg->verbose++;
+ case OPT_ANOMALOUS:
+ cfg->method |= METHOD_ANOMALOUS;
+ break;
+ case OPT_ANSI:
+ cfg->method |= METHOD_SEED;
+ cfg->seed_algo = SEED_ANSI;
if (arg) {
- cfg->verbose_log = arg;
+ if (!ansi_seed_valid(arg)) {
+ argp_failure(
+ state, 1, 0,
+ "SEED must be at least 160 bits (40 characters).");
+ }
+ cfg->seed = arg;
}
break;
+
+ /* Generation options */
+ case OPT_COUNT:
+ cfg->count = strtoul(arg, NULL, 10);
+ break;
case OPT_RANDOM:
cfg->random = true;
break;
@@ -177,15 +236,6 @@ error_t cli_parse(int key, char *arg, struct argp_state *state) {
cfg->cofactor = true;
cfg->cofactor_bound = strtol(arg, NULL, 10);
break;
- case OPT_INVALID:
- cfg->invalid = true;
- break;
- case OPT_ORDER:
- cfg->cm = true;
- if (arg) {
- cfg->order = arg;
- }
- break;
case OPT_KOBLITZ:
cfg->koblitz = true;
if (arg) {
@@ -199,9 +249,6 @@ error_t cli_parse(int key, char *arg, struct argp_state *state) {
case OPT_UNIQUE:
cfg->unique = true;
break;
- case OPT_ANOMALOUS:
- cfg->anomalous = true;
- break;
case OPT_POINTS: {
char *num_end;
long amount = strtol(arg, &num_end, 10);
@@ -221,25 +268,64 @@ error_t cli_parse(int key, char *arg, struct argp_state *state) {
}
break;
}
- case OPT_ANSI:
- cfg->seed_algo = SEED_ANSI;
+
+ /* IO options */
+ case OPT_FORMAT:
+ if (!strcmp(arg, "csv")) {
+ cfg->format = FORMAT_CSV;
+ } else if (!strcmp(arg, "json")) {
+ cfg->format = FORMAT_JSON;
+ } else {
+ argp_failure(state, 1, 0,
+ "Invalid format specified. One of [csv, json] "
+ "is valid.");
+ }
+ break;
+ case OPT_INPUT:
+ cfg->input = arg;
+ break;
+ case OPT_OUTPUT:
+ cfg->output = arg;
+ break;
+ case OPT_APPEND:
+ cfg->append = true;
+ break;
+ case OPT_VERBOSE:
+ cfg->verbose++;
if (arg) {
- if (!ansi_seed_valid(arg)) {
- argp_failure(
- state, 1, 0,
- "SEED must be at least 160 bits (40 characters).");
- }
- cfg->seed = arg;
+ cfg->verbose_log = arg;
}
break;
- case OPT_FP:
- cfg->field = FIELD_PRIME;
- cfg->prime_field = true;
+
+ /* Misc options */
+ case OPT_DATADIR:
+ cfg->datadir = arg;
break;
- case OPT_F2M:
- cfg->field = FIELD_BINARY;
- cfg->binary_field = true;
+ case OPT_MEMORY:
+ cfg->memory = cli_parse_memory(arg, state);
break;
+ case OPT_TSTACK:
+ cfg->thread_memory = cli_parse_memory(arg, state);
+ break;
+ case OPT_TIMEOUT:
+ cfg->timeout = cli_parse_time(arg, state);
+ break;
+ case OPT_THREADS:
+ if (!strcmp(arg, "auto") || !strcmp(arg, "AUTO")) {
+ long nprocs = sysconf(_SC_NPROCESSORS_ONLN);
+ if (nprocs > 0) {
+ cfg->threads = (unsigned long)nprocs;
+ }
+ } else {
+ cfg->threads = strtoul(arg, NULL, 10);
+ if (!cfg->threads) {
+ argp_failure(state, 1, 0,
+ "Invalid number of threads specified.");
+ }
+ }
+ break;
+
+ /* Args */
case ARGP_KEY_ARG:
if (state->arg_num >= 1) {
argp_usage(state);
@@ -250,55 +336,7 @@ error_t cli_parse(int key, char *arg, struct argp_state *state) {
2 * (cfg->bits / 8 + (cfg->bits % 8 != 0 ? 1 : 0));
break;
case ARGP_KEY_END:
- // validate all option states here.
- // Only one field
- if (cfg->prime_field == cfg->binary_field) {
- argp_failure(state, 1, 0,
- "Specify field type, prime or binary, with --fp / "
- "--f2m (but not both).");
- }
- // Invalid is not prime or seed by definition.
- if (cfg->invalid &&
- (cfg->prime || cfg->seed_algo || cfg->cofactor)) {
- // not seed, not prime
- argp_failure(state, 1, 0,
- "Invalid curve generation can not generate curves "
- "from seed, exhaustive or prime order.");
- }
- if (cfg->cm && (cfg->prime || cfg->seed_algo || cfg->invalid ||
- cfg->cofactor || cfg->anomalous)) {
- argp_failure(state, 1, 0,
- "Fixed order curve generation can not generate "
- "curves from seed, or invalid curves. Prime order "
- "also doesn't make sense if the given one isn't "
- "prime.");
- }
- if (cfg->anomalous &&
- (cfg->binary_field || cfg->cofactor || cfg->seed_algo ||
- cfg->cm || cfg->invalid || cfg->koblitz)) {
- argp_failure(
- state, 1, 0,
- "Anomalous curve generation can not generate "
- "binary field curves, curves with a cofactor, from seed "
- "with fixed order, invalid or Koblitz curves.");
- }
-
- // default values
- if (!cfg->count) {
- cfg->count = 1;
- }
- if (!cfg->memory) {
- cfg->memory = 1000000000;
- }
- if (!cfg->threads) {
- cfg->threads = 1;
- }
- if (!cfg->thread_memory) {
- cfg->thread_memory = cfg->bits * 2000000;
- }
- if (!cfg->points.type) {
- cfg->points.type = POINTS_PRIME;
- }
+ cli_end(state);
break;
case ARGP_KEY_NO_ARGS:
argp_usage(state);
generated by cgit v1.2.3-70-g09d2 (git 2.51.2) at 2025-11-08 20:47:19 +0000