We can include either 64 or 32 bits versions of curve25519-donna.

diff --git a/src/libcryptobox/curve25519/curve25519-donna-c64.c b/src/libcryptobox/curve25519/curve25519-donna-c64.c
index a3a78fcdbfae5311e24dfb03d34a13830535a495..2d5b19b18084039a61d1cfdc256f91d4690d00e4 100644 (file)
--- a/src/libcryptobox/curve25519/curve25519-donna-c64.c
+++ b/src/libcryptobox/curve25519/curve25519-donna-c64.c
@@ -477,7 +477,7 @@ static void crecip (felem out, const felem z)
        /* 2^255 - 21 */fmul (out, t0, a);
 }
 
-int scalarmult_donna64 (u8 *mypublic, const u8 *secret, const u8 *basepoint)
+int scalarmult_donna (u8 *mypublic, const u8 *secret, const u8 *basepoint)
 {
        limb bp[5], x[5], z[5], zmone[5];
        unsigned char e[32];

diff --git a/src/libcryptobox/curve25519/curve25519-donna.c b/src/libcryptobox/curve25519/curve25519-donna.c
index 55d1d1730d30033ce2d6543e4e0da22d55fea333..0de4b73b029854aeb5dce363c8790e32f6518e38 100644 (file)
--- a/src/libcryptobox/curve25519/curve25519-donna.c
+++ b/src/libcryptobox/curve25519/curve25519-donna.c
@@ -891,7 +891,7 @@ static void crecip (limb *out, const limb *z)
        /* 2^255 - 21 */fmul (out, t1, z11);
 }
 
-int scalarmult_donna32 (u8 *mypublic, const u8 *secret, const u8 *basepoint)
+int scalarmult_donna (u8 *mypublic, const u8 *secret, const u8 *basepoint)
 {
        limb bp[10], x[10], z[11], zmone[10];
        unsigned char e[32];

diff --git a/src/libcryptobox/curve25519/curve25519.c b/src/libcryptobox/curve25519/curve25519.c
index df795a855c7a362c21e4b68f1e74044480aa9798..030c8853707f7737cbd7eda2ee865d6eb23479aa 100644 (file)
--- a/src/libcryptobox/curve25519/curve25519.c
+++ b/src/libcryptobox/curve25519/curve25519.c
@@ -56,16 +56,12 @@ CURVE25519_DECLARE(avx);
 CURVE25519_DECLARE(ref);
 #define CURVE25519_REF CURVE25519_IMPL(0, "ref", ref)
 
-#if !defined(__LP64__)
-CURVE25519_DECLARE(donna32);
-#define CURVE25519_GENERIC CURVE25519_IMPL(0, "donna32", donna32)
-#else
-CURVE25519_DECLARE(donna64);
-#define CURVE25519_GENERIC CURVE25519_IMPL(0, "donna64", donna64)
-#endif
+CURVE25519_DECLARE(donna);
+#define CURVE25519_DONNA CURVE25519_IMPL(0, "donna", donna)
+
 
 static const curve25519_impl_t curve25519_list[] = {
-               CURVE25519_GENERIC,
+               CURVE25519_DONNA,
 #if defined(CURVE25519_AVX)
                CURVE25519_AVX,
 #endif