diff options
| author | J08nY | 2017-02-19 21:36:03 +0100 |
|---|---|---|
| committer | J08nY | 2017-02-19 22:05:28 +0100 |
| commit | 372ea19289328b555a4587363347c34cc5f779c6 (patch) | |
| tree | 99b0a8fe344d3552d4b0d449163157f64dad318f /src/math | |
| parent | 888ca8052e0eb3acbe33dbf180e3af27341002eb (diff) | |
| download | ecgen-372ea19289328b555a4587363347c34cc5f779c6.tar.gz ecgen-372ea19289328b555a4587363347c34cc5f779c6.tar.zst ecgen-372ea19289328b555a4587363347c34cc5f779c6.zip | |
ecgen v0.3: some cleanup and version bump
Diffstat (limited to 'src/math')
| -rw-r--r-- | src/math/curve.c | 26 | ||||
| -rw-r--r-- | src/math/gens.c | 2 | ||||
| -rw-r--r-- | src/math/gens.h | 2 | ||||
| -rw-r--r-- | src/math/point.c | 4 |
4 files changed, 19 insertions, 15 deletions
diff --git a/src/math/curve.c b/src/math/curve.c index 71d1744..b01c795 100644 --- a/src/math/curve.c +++ b/src/math/curve.c @@ -45,16 +45,19 @@ int curve_init(curve_t *curve, config_t *config, arg_t *args) { pari_sp ltop = avma; GEN v = gen_0; switch (typ(curve->field)) { - case t_INT: v = gtovec0(gen_0, 2); + case t_INT: + v = gtovec0(gen_0, 2); gel(v, 1) = curve->a; gel(v, 2) = curve->b; break; - case t_FFELT: v = gtovec0(gen_0, 5); + case t_FFELT: + v = gtovec0(gen_0, 5); gel(v, 1) = gen_1; gel(v, 4) = curve->a; gel(v, 5) = curve->b; break; - default: pari_err_TYPE("curve_init", curve->field); + default: + pari_err_TYPE("curve_init", curve->field); } curve->curve = gerepilecopy(ltop, ellinit(v, curve->field, -1)); @@ -84,9 +87,12 @@ int curve_seed_f2m(curve_t *curve, config_t *config, arg_t *args) { int curve_seed(curve_t *curve, config_t *config, arg_t *args) { switch (typ(curve->field)) { - case t_INT: return curve_seed_fp(curve, config, args); - case t_FFELT: return curve_seed_f2m(curve, config, args); - default: pari_err_TYPE("curve_seed", curve->field); + case t_INT: + return curve_seed_fp(curve, config, args); + case t_FFELT: + return curve_seed_f2m(curve, config, args); + default: + pari_err_TYPE("curve_seed", curve->field); return INT_MIN; /* NOT REACHABLE */ } } @@ -100,8 +106,8 @@ GEN curve_params(curve_t *curve) { if (curve->generators) { for (size_t i = 0; i < curve->ngens; ++i) { GEN point = - gconcat(field_elementi(gel(curve->generators[i]->point, 1)), - field_elementi(gel(curve->generators[i]->point, 2))); + gconcat(field_elementi(gel(curve->generators[i]->point, 1)), + field_elementi(gel(curve->generators[i]->point, 2))); GEN x = field_elementi(gel(point, 1)); GEN y = field_elementi(gel(point, 2)); result = gconcat(result, x); @@ -116,8 +122,8 @@ GEN curve_params(curve_t *curve) { if (curve->points) { for (size_t i = 0; i < curve->npoints; ++i) { GEN point = - gconcat(field_elementi(gel(curve->points[i]->point, 1)), - field_elementi(gel(curve->points[i]->point, 2))); + gconcat(field_elementi(gel(curve->points[i]->point, 1)), + field_elementi(gel(curve->points[i]->point, 2))); GEN x = field_elementi(gel(point, 1)); GEN y = field_elementi(gel(point, 2)); result = gconcat(result, x); diff --git a/src/math/gens.c b/src/math/gens.c index 619eb25..ac81960 100644 --- a/src/math/gens.c +++ b/src/math/gens.c @@ -2,7 +2,6 @@ #include "gens.h" #include "point.h" - int gens_init(curve_t *curve, config_t *config, arg_t *args) { // TODO stack code!!! GEN generators = ellff_get_gens(curve->curve); @@ -20,4 +19,3 @@ int gens_init(curve_t *curve, config_t *config, arg_t *args) { return 1; } - diff --git a/src/math/gens.h b/src/math/gens.h index fc67a23..b3f7774 100644 --- a/src/math/gens.h +++ b/src/math/gens.h @@ -6,4 +6,4 @@ int gens_init(curve_t *curve, config_t *config, arg_t *args); -#endif //ECGEN_GENS_H +#endif // ECGEN_GENS_H diff --git a/src/math/point.c b/src/math/point.c index 514f1b9..d6e8858 100644 --- a/src/math/point.c +++ b/src/math/point.c @@ -91,11 +91,11 @@ int points_random(curve_t *curve, config_t *config, arg_t *args) { } /* - GEN o = utoi(dprimes[i]); + GEN o = utoi(dprimes[i]); GEN mul = ellmul(curve->curve, rand, o); if (gequal0(mul)) { - printf("Success! %lu\n", npoints); + printf("Success! %lu\n", npoints); curve->points[i] = point_new(); gerepileall(btop, 2, &rand, &o); |
