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.c140
1 files changed, 83 insertions, 57 deletions
diff --git a/src/io/cli.c b/src/io/cli.c
index 374b949..efebfbc 100644
--- a/src/io/cli.c
+++ b/src/io/cli.c
@@ -6,19 +6,20 @@
#include <string.h>
char doc[] =
- "ecgen, tool for generating Elliptic curve domain parameters.\v(C) 2017 "
- "Eastern Seaboard Phishing Authority";
+ "ecgen, tool for generating Elliptic curve domain parameters.\v(C) 2017 "
+ "Eastern Seaboard Phishing Authority";
char args_doc[] = "bits";
enum opt_keys {
OPT_DATADIR = 'd',
OPT_COUNT = 'c',
OPT_PRIME = 'p',
+ OPT_COFACTOR = 'k',
OPT_RANDOM = 'r',
OPT_SEED = 's',
OPT_INVALID = 'i',
OPT_ORDER = 'n',
- OPT_KOBLITZ = 'k',
+ OPT_KOBLITZ = 'K',
OPT_UNIQUE = 'u',
OPT_FORMAT = 't',
OPT_OUTPUT = 'o',
@@ -32,27 +33,28 @@ enum opt_keys {
// clang-format off
struct argp_option options[] = {
- {0, 0, 0, 0, "Field specification:", 1},
- {"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.", 2},
- {"prime", OPT_PRIME, 0, 0, "Generate a curve with prime order.", 2},
- {"seed", OPT_SEED, "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).", 2},
- {"order", OPT_ORDER, "ORDER", 0, "Generate a curve with given order (using Complex Multiplication).", 2},
- {"koblitz", OPT_KOBLITZ, 0, 0, "Generate a Koblitz curve (a = 0).", 2},
- {"unique", OPT_UNIQUE, 0, 0, "Generate a curve with only one generator.", 2},
- {"points", OPT_POINTS, "TYPE", 0, "Generate points of given type (random/prime).", 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, "Other:", 4},
- {"data-dir", OPT_DATADIR, "DIR", 0, "PARI/GP data directory (containing seadata package).", 4},
+ {0, 0, 0, 0, "Field specification:", 1},
+ {"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},
+ {"seed", OPT_SEED, "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).", 2},
+ {"koblitz", OPT_KOBLITZ, 0, 0, "Generate a Koblitz curve (a = 0).", 2},
+ {"unique", OPT_UNIQUE, 0, 0, "Generate a curve with only one generator.", 2},
+ {"points", OPT_POINTS, "TYPE", 0, "Generate points of given type (random/prime).", 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, "Other:", 4},
+ {"data-dir", OPT_DATADIR, "DIR", 0, "PARI/GP data directory (containing seadata package).", 4},
{0}
};
// clang-format on
@@ -61,7 +63,8 @@ error_t cli_parse(int key, char *arg, struct argp_state *state) {
struct config_t *cfg = state->input;
switch (key) {
- case OPT_DATADIR: cfg->datadir = arg;
+ case OPT_DATADIR:
+ cfg->datadir = arg;
break;
case OPT_COUNT:
if (arg) {
@@ -76,40 +79,55 @@ error_t cli_parse(int key, char *arg, struct argp_state *state) {
cfg->format = FORMAT_JSON;
} else {
argp_failure(state, 1, 0,
- "Invalid format specified. One of [csv, json] "
- "is valid.");
+ "Invalid format specified. One of [csv, json] "
+ "is valid.");
}
} else {
argp_failure(
- state, 1, 0,
- "You have to specify a format with the format option.");
+ state, 1, 0,
+ "You have to specify a format with the format option.");
}
break;
- case OPT_INPUT: cfg->input = arg;
+ case OPT_INPUT:
+ cfg->input = arg;
break;
- case OPT_OUTPUT: cfg->output = arg;
+ case OPT_OUTPUT:
+ cfg->output = arg;
break;
- case OPT_APPEND: cfg->append = true;
+ case OPT_APPEND:
+ cfg->append = true;
break;
- case OPT_VERBOSE: cfg->verbose++;
+ case OPT_VERBOSE:
+ cfg->verbose++;
if (arg) {
cfg->debug = arg;
}
break;
- case OPT_RANDOM: cfg->random = true;
+ case OPT_RANDOM:
+ cfg->random = true;
break;
- case OPT_PRIME: cfg->prime = true;
+ case OPT_PRIME:
+ cfg->prime = true;
break;
- case OPT_INVALID: cfg->invalid = true;
+ case OPT_COFACTOR:
+ cfg->cofactor = true;
+ if (arg) {
+ cfg->cofactor_bound = strtol(arg, NULL, 10);
+ }
+ case OPT_INVALID:
+ cfg->invalid = true;
break;
- case OPT_ORDER: cfg->cm = true;
+ case OPT_ORDER:
+ cfg->cm = true;
if (arg) {
cfg->order = arg;
}
break;
- case OPT_KOBLITZ: cfg->koblitz = true;
+ case OPT_KOBLITZ:
+ cfg->koblitz = true;
break;
- case OPT_UNIQUE: cfg->unique = true;
+ case OPT_UNIQUE:
+ cfg->unique = true;
break;
case OPT_POINTS:
if (arg) {
@@ -123,24 +141,28 @@ error_t cli_parse(int key, char *arg, struct argp_state *state) {
argp_failure(state, 1, 0, "Unknow point type");
}
} else {
- argp_failure(state, 1, 0, "You have to specify what points you want.");
+ argp_failure(state, 1, 0,
+ "You have to specify what points you want.");
}
break;
- case OPT_SEED: cfg->from_seed = true;
+ case OPT_SEED:
+ cfg->from_seed = true;
if (arg) {
// ANSI X9.62 specifies seed as at least 160 bits in length.
if (strlen(arg) < 20) {
argp_failure(
- state, 1, 0,
- "SEED must be at least 160 bits (20 characters).");
+ state, 1, 0,
+ "SEED must be at least 160 bits (20 characters).");
}
cfg->seed = arg;
}
break;
- case OPT_FP: cfg->field = FIELD_PRIME;
+ case OPT_FP:
+ cfg->field = FIELD_PRIME;
cfg->prime_field = true;
break;
- case OPT_F2M: cfg->field = FIELD_BINARY;
+ case OPT_F2M:
+ cfg->field = FIELD_BINARY;
cfg->binary_field = true;
break;
case ARGP_KEY_ARG:
@@ -155,31 +177,35 @@ error_t cli_parse(int key, char *arg, struct argp_state *state) {
// 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).");
+ "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->from_seed)) {
+ if (cfg->invalid &&
+ (cfg->prime || cfg->from_seed || cfg->cofactor)) {
// not seed, not prime
argp_failure(state, 1, 0,
- "Invalid curve generation can not generate curves "
- "from seed, exhaustive or prime order.");
+ "Invalid curve generation can not generate curves "
+ "from seed, exhaustive or prime order.");
}
- if (cfg->cm && (cfg->prime || cfg->from_seed || cfg->invalid)) {
+ if (cfg->cm && (cfg->prime || cfg->from_seed || cfg->invalid ||
+ cfg->cofactor)) {
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.");
+ "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.");
}
// default values
if (!cfg->count) {
cfg->count = 1;
}
break;
- case ARGP_KEY_NO_ARGS: argp_usage(state);
+ case ARGP_KEY_NO_ARGS:
+ argp_usage(state);
break;
- default: return ARGP_ERR_UNKNOWN;
+ default:
+ return ARGP_ERR_UNKNOWN;
}
return 0;
}
generated by cgit v1.2.3-70-g09d2 (git 2.51.2) at 2025-11-08 18:23:37 +0000