From f5a43f62e28e11cf34be24f6ffdb9478cc55c44c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se> Date: Thu, 28 Aug 2014 08:09:02 +0200 Subject: [PATCH] Deleted unused constant redc_g. --- ChangeLog | 6 ++++++ ecc-192.c | 1 - ecc-224.c | 1 - ecc-25519.c | 1 - ecc-256.c | 1 - ecc-384.c | 1 - ecc-521.c | 1 - ecc-internal.h | 5 ++--- eccdata.c | 1 - 9 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f6b20c3..3fa7b2e6 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 8cd4bd08..f8ac522e 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 bb66acce..6e48ddd0 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 a2a814b8..3c004668 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 5c7de779..4de53008 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 bd44366d..9d89fcb3 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 62a33ca5..a38a25a7 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 214b47a4..d7239e5d 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 9069e610..2fb43650 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", -- GitLab