diff options
| author | Niels Möller <nisse@lysator.liu.se> | 2014-08-18 22:18:54 +0200 |
|---|---|---|
| committer | Niels Möller <nisse@lysator.liu.se> | 2014-08-18 22:18:54 +0200 |
| commit | 6c8d40f7134bf4069a4ef56c16fa21095fe6f577 (patch) | |
| tree | 542ac6e381669e4a0ffca66ddb5a9d0ebda26f50 | |
| parent | d55f928a1f6b20e9923041d7323404c3cbc221f0 (diff) | |
| download | nettle-6c8d40f7134bf4069a4ef56c16fa21095fe6f577.tar.gz | |
Renamed curve25519_base -> curve25519_mul_g.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | curve25519-mul-g.c (renamed from curve25519-base.c) | 4 | ||||
| -rw-r--r-- | curve25519.h | 6 | ||||
| -rw-r--r-- | testsuite/curve25519-dh-test.c | 4 |
5 files changed, 13 insertions, 8 deletions
@@ -1,5 +1,10 @@ 2014-08-18 Niels Möller <nisse@lysator.liu.se> + * curve25519-mul-g.c (curve25519_mul_g): Renamed file and + function, updated callers. + * curve25519-base.c (curve25519_base): ... old names. + * Makefile.in (hogweed_SOURCES): Updated for rename. + * eccdata.c (output_curve): Compute constants needed for Shanks-Tonelli. * ecc-25519.c (ecc_modp_powm_2kp1, ecc_25519_sqrt): New functions. diff --git a/Makefile.in b/Makefile.in index 31ca91fd..87400e67 100644 --- a/Makefile.in +++ b/Makefile.in @@ -174,7 +174,7 @@ hogweed_SOURCES = sexp.c sexp-format.c \ ecc-point.c ecc-scalar.c ecc-point-mul.c ecc-point-mul-g.c \ ecc-ecdsa-sign.c ecdsa-sign.c \ ecc-ecdsa-verify.c ecdsa-verify.c ecdsa-keygen.c \ - curve25519-base.c \ + curve25519-mul-g.c \ $(OPT_HOGWEED_SOURCES) HEADERS = aes.h arcfour.h arctwo.h asn1.h blowfish.h \ diff --git a/curve25519-base.c b/curve25519-mul-g.c index b188d205..f98bee3d 100644 --- a/curve25519-base.c +++ b/curve25519-mul-g.c @@ -1,4 +1,4 @@ -/* curve25519-base.c +/* curve25519-mul-g.c Copyright (C) 2014 Niels Möller @@ -42,7 +42,7 @@ /* Intended to be compatible with NaCl's crypto_scalarmult_base. */ void -curve25519_base (uint8_t *r, const uint8_t *n) +curve25519_mul_g (uint8_t *r, const uint8_t *n) { uint8_t t[CURVE25519_SIZE]; mp_limb_t *scratch; diff --git a/curve25519.h b/curve25519.h index 66a5c80f..03cb151d 100644 --- a/curve25519.h +++ b/curve25519.h @@ -39,11 +39,11 @@ extern "C" { #endif /* Name mangling */ -#define curve25519_base nettle_curve25519_base +#define curve25519_mul_g nettle_curve25519_mul_g #define CURVE25519_SIZE 32 void -curve25519_base (uint8_t *q, const uint8_t *n); - +curve25519_mul_g (uint8_t *q, const uint8_t *n); + #endif /* NETTLE_CURVE25519_H */ diff --git a/testsuite/curve25519-dh-test.c b/testsuite/curve25519-dh-test.c index 374d36a9..779736b6 100644 --- a/testsuite/curve25519-dh-test.c +++ b/testsuite/curve25519-dh-test.c @@ -165,10 +165,10 @@ static void test_g (const uint8_t *s, const uint8_t *r) { uint8_t p[CURVE25519_SIZE]; - curve25519_base (p, s); + curve25519_mul_g (p, s); if (!MEMEQ (CURVE25519_SIZE, p, r)) { - printf ("curve25519_base failure:\ns = "); + printf ("curve25519_mul_g failure:\ns = "); print_hex (CURVE25519_SIZE, s); printf ("\np = "); print_hex (CURVE25519_SIZE, p); |