Commit 74dea233 authored by Niels Möller's avatar Niels Möller

Use struct ecc_curve function pointers also in ecdsa_generate_keypair.

parent fe776103
2014-09-17 Niels Möller <nisse@lysator.liu.se> 2014-09-17 Niels Möller <nisse@lysator.liu.se>
* ecdsa-keygen.c (ecdsa_generate_keypair): Use struct ecc_curve
function pointers.
* testsuite/curve25519-dup-test.c: Deleted file. In the way for * testsuite/curve25519-dup-test.c: Deleted file. In the way for
conversion to Edwards coordiante convention, and in the end conversion to Edwards coordiante convention, and in the end
the tests will be done by ecc-dup-test.c. the tests will be done by ecc-dup-test.c.
......
...@@ -48,13 +48,14 @@ ecdsa_generate_keypair (struct ecc_point *pub, ...@@ -48,13 +48,14 @@ ecdsa_generate_keypair (struct ecc_point *pub,
void *random_ctx, nettle_random_func *random) void *random_ctx, nettle_random_func *random)
{ {
TMP_DECL(p, mp_limb_t, 3*ECC_MAX_SIZE + ECC_MUL_G_ITCH (ECC_MAX_SIZE)); TMP_DECL(p, mp_limb_t, 3*ECC_MAX_SIZE + ECC_MUL_G_ITCH (ECC_MAX_SIZE));
mp_size_t itch = 3*pub->ecc->size + ECC_MUL_G_ITCH (pub->ecc->size); const struct ecc_curve *ecc = pub->ecc;
mp_size_t itch = 3*ecc->size + ecc->mul_g_itch;
assert (key->ecc == pub->ecc); assert (key->ecc == ecc);
TMP_ALLOC (p, itch); TMP_ALLOC (p, itch);
ecc_modq_random (key->ecc, key->p, random_ctx, random, p); ecc_modq_random (ecc, key->p, random_ctx, random, p);
ecc_mul_g (pub->ecc, p, key->p, p + 3*pub->ecc->size); ecc->mul_g (ecc, p, key->p, p + 3*ecc->size);
ecc_j_to_a (pub->ecc, 0, pub->p, p, p + 3*pub->ecc->size); ecc->h_to_a (ecc, 0, pub->p, p, p + 3*ecc->size);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment