From dfade241e764622e2145a07eff89e1a91ddecf90 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 9 Jun 2014 19:29:08 -0700 Subject: [PATCH] Avoid naming a function select() in order to avoid confusion with select(2) --- .../crypto_sign/ed25519/ref10/ge_scalarmult_base.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libsodium/crypto_sign/ed25519/ref10/ge_scalarmult_base.c b/src/libsodium/crypto_sign/ed25519/ref10/ge_scalarmult_base.c index 54d7d6ab..f3490a94 100644 --- a/src/libsodium/crypto_sign/ed25519/ref10/ge_scalarmult_base.c +++ b/src/libsodium/crypto_sign/ed25519/ref10/ge_scalarmult_base.c @@ -37,7 +37,7 @@ static ge_precomp base[32][8] = { #include "base.h" } ; -static void select(ge_precomp *t,int pos,signed char b) +static void ge_select(ge_precomp *t,int pos,signed char b) { ge_precomp minust; unsigned char bnegative = negative(b); @@ -95,7 +95,7 @@ void ge_scalarmult_base(ge_p3 *h,const unsigned char *a) ge_p3_0(h); for (i = 1;i < 64;i += 2) { - select(&t,i / 2,e[i]); + ge_select(&t,i / 2,e[i]); ge_madd(&r,h,&t); ge_p1p1_to_p3(h,&r); } @@ -105,7 +105,7 @@ void ge_scalarmult_base(ge_p3 *h,const unsigned char *a) ge_p2_dbl(&r,&s); ge_p1p1_to_p3(h,&r); for (i = 0;i < 64;i += 2) { - select(&t,i / 2,e[i]); + ge_select(&t,i / 2,e[i]); ge_madd(&r,h,&t); ge_p1p1_to_p3(h,&r); } }