Renamed curve25519_base -> curve25519_mul_g.

diff --git a/ChangeLog b/ChangeLog
index 12e048893d186ac8215e66dd28a9f80cb73f888e..b488d7e537336b24a00e76687c49c9c77693c601 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 31ca91fd34124f7d3ad34c1383136da46b043ecb..87400e679648f5e5368411e800c3a0ff27919cde 100644 (file)
--- 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
similarity index 96%
rename from curve25519-base.c
rename to curve25519-mul-g.c
index b188d205940f7d935d33de92527af90f568cfd66..f98bee3d4198c755f33d12612ec109160b6b8558 100644 (file)
--- 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 66a5c80fdaa4ce998c2b377dd82d3da3432d1d6a..03cb151d7a541875a95f17b00eba95d8150b598e 100644 (file)
--- 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 374d36a93f27a0a2b939354f80c4eb5d163be1ef..779736b6c609441fbb8bd274c834235b953b4404 100644 (file)
--- 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);