[tor-commits] [tor/master] Disambiguate: Avoid defining two static functions both called gettweak()

[nickm at torproject.org]

commit 8c6b528b00a82f6fd027d543ba8257dfa2fc97ef
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Apr 15 12:19:51 2016 -0400

    Disambiguate: Avoid defining two static functions both called gettweak()
---
 src/ext/ed25519/donna/ed25519_tor.c | 9 +++++----
 src/ext/ed25519/ref10/blinding.c    | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/ext/ed25519/donna/ed25519_tor.c b/src/ext/ed25519/donna/ed25519_tor.c
index 52b259d..07f6a0f 100644
--- a/src/ext/ed25519/donna/ed25519_tor.c
+++ b/src/ext/ed25519/donna/ed25519_tor.c
@@ -44,7 +44,8 @@ typedef unsigned char ed25519_signature[64];
 typedef unsigned char ed25519_public_key[32];
 typedef unsigned char ed25519_secret_key[32];
 
-static void gettweak(unsigned char *out, const unsigned char *param);
+static void ed25519_donna_gettweak(unsigned char *out,
+                                   const unsigned char *param);
 
 static int ED25519_FN(ed25519_sign_open) (const unsigned char *m, size_t mlen,
   const ed25519_public_key pk, const ed25519_signature RS);
@@ -242,7 +243,7 @@ ed25519_donna_sign(unsigned char *sig, const unsigned char *m, size_t mlen,
 }
 
 static void
-gettweak(unsigned char *out, const unsigned char *param)
+ed25519_donna_gettweak(unsigned char *out, const unsigned char *param)
 {
   static const char str[] = "Derive temporary signing key";
   ed25519_hash_context ctx;
@@ -266,7 +267,7 @@ ed25519_donna_blind_secret_key(unsigned char *out, const unsigned char *inp,
   ed25519_hash_context ctx;
   bignum256modm ALIGN(16) sk, t;
 
-  gettweak(tweak, param);
+  ed25519_donna_gettweak(tweak, param);
   expand256_modm(t, tweak, 32);
 
   expand256_modm(sk, inp, 32);
@@ -297,7 +298,7 @@ ed25519_donna_blind_public_key(unsigned char *out, const unsigned char *inp,
   ge25519 ALIGN(16) A, Aprime;
   bignum256modm ALIGN(16) t;
 
-  gettweak(tweak, param);
+  ed25519_donna_gettweak(tweak, param);
   expand256_modm(t, tweak, 32);
 
   /* No "ge25519_unpack", negate the public key. */
diff --git a/src/ext/ed25519/ref10/blinding.c b/src/ext/ed25519/ref10/blinding.c
index 4d9a9cb..ee3e866 100644
--- a/src/ext/ed25519/ref10/blinding.c
+++ b/src/ext/ed25519/ref10/blinding.c
@@ -10,7 +10,7 @@
 #include "crypto.h"
 
 static void
-gettweak(unsigned char *out, const unsigned char *param)
+ed25519_ref10_gettweak(unsigned char *out, const unsigned char *param)
 {
   const char str[] = "Derive temporary signing key";
   crypto_hash_sha512_2(out, (const unsigned char*)str, strlen(str), param, 32);
@@ -26,7 +26,7 @@ int ed25519_ref10_blind_secret_key(unsigned char *out,
   const char str[] = "Derive temporary signing key hash input";
   unsigned char tweak[64];
   unsigned char zero[32];
-  gettweak(tweak, param);
+  ed25519_ref10_gettweak(tweak, param);
 
   memset(zero, 0, 32);
   sc_muladd(out, inp, tweak, zero);
@@ -50,7 +50,7 @@ int ed25519_ref10_blind_public_key(unsigned char *out,
   ge_p3 A;
   ge_p2 Aprime;
 
-  gettweak(tweak, param);
+  ed25519_ref10_gettweak(tweak, param);
 
   memset(zero, 0, sizeof(zero));
   /* Not the greatest implementation of all of this.  I wish I had