diff --git a/ChangeLog b/ChangeLog index 9f6b20c3c464f1b2338f8c86119f6dd8cb82630c..3fa7b2e6d1906c606f1e23de46d2b2ffbefdcd02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-08-28 Niels Möller <nisse@lysator.liu.se> + + * eccdata.c (output_curve): Don't output ecc_redc_g. + * ecc-internal.h (struct ecc_curve): Deleted unused field redc_g. + Updated all instances. + 2014-08-27 Niels Möller <nisse@lysator.liu.se> * ecc-modq.c (ecc_modq_inv): Use q_bit_size. diff --git a/ecc-192.c b/ecc-192.c index 8cd4bd0880e5fd10e2b1e928a997f697f8a8c17e..f8ac522ea831474903bb98ea79a482f07711e42f 100644 --- a/ecc-192.c +++ b/ecc-192.c @@ -139,7 +139,6 @@ const struct ecc_curve nettle_secp_192r1 = ecc_b, ecc_q, ecc_g, - ecc_redc_g, NULL, ecc_Bmodp, ecc_Bmodp_shifted, diff --git a/ecc-224.c b/ecc-224.c index bb66acceaa2ae5b29101f51cbc2e04ad54d1feb8..6e48ddd008e384ef96ce69b88470f1bd6c08f7da 100644 --- a/ecc-224.c +++ b/ecc-224.c @@ -83,7 +83,6 @@ const struct ecc_curve nettle_secp_224r1 = ecc_b, ecc_q, ecc_g, - ecc_redc_g, NULL, ecc_Bmodp, ecc_Bmodp_shifted, diff --git a/ecc-25519.c b/ecc-25519.c index a2a814b870841d81f37d26e670949667a8d2af2e..3c004668735400a0e99e8c4e7f809ed2f47790da 100644 --- a/ecc-25519.c +++ b/ecc-25519.c @@ -262,7 +262,6 @@ const struct ecc_curve nettle_curve25519 = ecc_d, /* Use the Edwards curve constant. */ ecc_q, ecc_g, - ecc_redc_g, ecc_edwards, ecc_Bmodp, ecc_Bmodp_shifted, diff --git a/ecc-256.c b/ecc-256.c index 5c7de7799828db21c4131d8f209888faa8396d8d..4de53008e7553491d863984668d68a723989b934 100644 --- a/ecc-256.c +++ b/ecc-256.c @@ -248,7 +248,6 @@ const struct ecc_curve nettle_secp_256r1 = ecc_b, ecc_q, ecc_g, - ecc_redc_g, NULL, ecc_Bmodp, ecc_Bmodp_shifted, diff --git a/ecc-384.c b/ecc-384.c index bd44366dd628af97b48d130dd8417f279e67f5c1..9d89fcb32eeb2cd2c41fa13cc95a33d19f10e708 100644 --- a/ecc-384.c +++ b/ecc-384.c @@ -176,7 +176,6 @@ const struct ecc_curve nettle_secp_384r1 = ecc_b, ecc_q, ecc_g, - ecc_redc_g, NULL, ecc_Bmodp, ecc_Bmodp_shifted, diff --git a/ecc-521.c b/ecc-521.c index 62a33ca55d27d924a8c98018345a35cb505a1eb4..a38a25a7db9cfcbf865e48077b64622a3f55d39c 100644 --- a/ecc-521.c +++ b/ecc-521.c @@ -104,7 +104,6 @@ const struct ecc_curve nettle_secp_521r1 = ecc_b, ecc_q, ecc_g, - ecc_redc_g, NULL, ecc_Bmodp, ecc_Bmodp_shifted, diff --git a/ecc-internal.h b/ecc-internal.h index 214b47a4eb73ccecbfa47210e577d7bce7702548..d7239e5d4006b31093f67315b849634b7b9a21e5 100644 --- a/ecc-internal.h +++ b/ecc-internal.h @@ -133,10 +133,9 @@ struct ecc_curve const mp_limb_t *b; /* Group order. */ const mp_limb_t *q; - /* Generator, x coordinate followed by y (affine coordinates). */ + /* Generator, x coordinate followed by y (affine coordinates). + Currently used only by the test suite. */ const mp_limb_t *g; - /* Generator with coordinates in Montgomery form. */ - const mp_limb_t *redc_g; /* If non-NULL, the constant needed for transformation to the equivalent Edwards curve. */ const mp_limb_t *edwards_root; diff --git a/eccdata.c b/eccdata.c index 9069e61082467bb099788373755bb1f9b9d71737..2fb43650c0501dc92cda11359730724cf9416283 100644 --- a/eccdata.c +++ b/eccdata.c @@ -944,7 +944,6 @@ output_curve (const struct ecc_curve *ecc, unsigned bits_per_limb) output_bignum ("ecc_d", ecc->d, limb_size, bits_per_limb); output_bignum ("ecc_q", ecc->q, limb_size, bits_per_limb); output_point ("ecc_g", ecc, &ecc->g, 0, limb_size, bits_per_limb); - output_point ("ecc_redc_g", ecc, &ecc->g, 1, limb_size, bits_per_limb); bits = output_modulo ("ecc_Bmodp", ecc->p, limb_size, bits_per_limb); printf ("#define ECC_BMODP_SIZE %u\n",