diff options
| author | Werner Koch <wk@gnupg.org> | 2013-09-03 12:01:15 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2013-09-04 11:25:06 +0200 |
| commit | c26be7a337d0bf98193bc58e043209e46d0769bb (patch) | |
| tree | 71f15800908d68666f80fee8c42a7b344f5be178 /cipher/ecc.c | |
| parent | 8698530b2f9ef95542f1dd550961de7af86cc256 (diff) | |
| download | libgcrypt-c26be7a337d0bf98193bc58e043209e46d0769bb.tar.gz | |
Prepare support for non-Weierstrass EC equations.
* src/mpi.h (gcry_mpi_ec_models): New.
* src/ec-context.h (mpi_ec_ctx_s): Add MODEL.
* cipher/ecc-common.h (elliptic_curve_t): Ditto.
* cipher/ecc-curves.c (ecc_domain_parms_t): Ditto.
(domain_parms): Mark als as Weierstrass.
(_gcry_ecc_fill_in_curve): Check model.
(_gcry_ecc_get_curve): Set model to Weierstrass.
* cipher/ecc-misc.c (_gcry_ecc_model2str): New.
* cipher/ecc.c (generate_key, ecc_generate_ext): Print model in the
debug output.
* mpi/ec.c (_gcry_mpi_ec_dup_point): Switch depending on model.
Factor code out to ...
(dup_point_weierstrass): new.
(dup_point_montgomery, dup_point_twistededwards): New stub functions.
(_gcry_mpi_ec_add_points): Switch depending on model. Factor code out
to ...
(add_points_weierstrass): new.
(add_points_montgomery, add_points_twistededwards): New stub
functions.
* tests/Makefile.am (TESTS): Reorder tests.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'cipher/ecc.c')
| -rw-r--r-- | cipher/ecc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cipher/ecc.c b/cipher/ecc.c index 9174f9bc..8a7ca0be 100644 --- a/cipher/ecc.c +++ b/cipher/ecc.c @@ -108,8 +108,8 @@ _gcry_register_pk_ecc_progress (void (*cb) (void *, const char *, -/**************** - * Solve the right side of the equation that defines a curve. +/* + * Solve the right side of the Weierstrass equation. */ static gcry_mpi_t gen_y_2 (gcry_mpi_t x, elliptic_curve_t *base) @@ -158,6 +158,7 @@ generate_key (ECC_secret_key *sk, unsigned int nbits, const char *name, if (DBG_CIPHER) { + log_debug ("ecgen curve model: %s\n", _gcry_ecc_model2str (E.model)); log_mpidump ("ecgen curve p", E.p); log_mpidump ("ecgen curve a", E.a); log_mpidump ("ecgen curve b", E.b); @@ -166,7 +167,7 @@ generate_key (ECC_secret_key *sk, unsigned int nbits, const char *name, log_mpidump ("ecgen curve Gy", E.G.y); log_mpidump ("ecgen curve Gz", E.G.z); if (E.name) - log_debug ("ecgen curve used: %s\n", E.name); + log_debug ("ecgen curve used: %s\n", E.name); } random_level = transient_key ? GCRY_STRONG_RANDOM : GCRY_VERY_STRONG_RANDOM; @@ -696,6 +697,7 @@ ecc_generate_ext (int algo, unsigned int nbits, unsigned long evalue, if (DBG_CIPHER) { + log_debug ("ecgen result model: %s\n", _gcry_ecc_model2str (sk.E.model)); log_mpidump ("ecgen result p", skey[0]); log_mpidump ("ecgen result a", skey[1]); log_mpidump ("ecgen result b", skey[2]); |