diff options
Diffstat (limited to 'src/misc')
| -rw-r--r-- | src/misc/config.h | 14 | ||||
| -rw-r--r-- | src/misc/types.h | 8 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/misc/config.h b/src/misc/config.h index 7b9a9dc..5069881 100644 --- a/src/misc/config.h +++ b/src/misc/config.h @@ -14,17 +14,25 @@ enum field_e { FIELD_PRIME, FIELD_BINARY }; enum format_e { FORMAT_JSON, FORMAT_CSV }; enum points_e { + POINTS_NONE = 0, POINTS_PRIME, POINTS_RANDOM, POINTS_ALL, - POINTS_NONPRIME, - POINTS_NONE + POINTS_NONPRIME }; struct points_s { enum points_e type; size_t amount; }; +typedef enum { + SEED_NONE = 0, + SEED_ANSI, + SEED_BRAINPOOL, + SEED_BRAINPOOL_RFC, + SEED_FIPS +} seed_e; + typedef struct { enum field_e field; bool binary_field; @@ -41,7 +49,7 @@ typedef struct { long koblitz_value; bool cofactor; long cofactor_bound; - bool ansi; + seed_e seed_algo; char *seed; bool unique; struct points_s points; diff --git a/src/misc/types.h b/src/misc/types.h index ff2caed..5b1fd17 100644 --- a/src/misc/types.h +++ b/src/misc/types.h @@ -24,12 +24,6 @@ typedef struct { size_t allocated; } bits_t; -enum seed_e { - SEED_ANSI, - SEED_BRAINPOOL, - SEED_BRAINPOOL_RFC, - SEED_FIPS -}; /** * @brief * @param seed @@ -41,7 +35,7 @@ enum seed_e { typedef struct { bits_t *seed; unsigned char *hash20; - enum seed_e type; + seed_e type; union { struct { GEN t; |