From 2e7b8e1de94deb63de56b2a4b367d1f69b6f984a Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Mon, 6 Nov 2017 11:47:00 +0100
Subject: [PATCH] Still #define the fe & ge types for now

---
 src/libsodium/include/sodium/private/curve25519_ref10.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/libsodium/include/sodium/private/curve25519_ref10.h b/src/libsodium/include/sodium/private/curve25519_ref10.h
index 71dc36bc..7584f025 100644
--- a/src/libsodium/include/sodium/private/curve25519_ref10.h
+++ b/src/libsodium/include/sodium/private/curve25519_ref10.h
@@ -9,6 +9,8 @@
  Here the field is \Z/(2^255-19).
  */
 
+#define fe fe25519
+
 #ifdef HAVE_TI_MODE
 typedef uint64_t fe[5];
 #else
@@ -44,12 +46,14 @@ void fe_scalar_product(fe h, const fe f, uint32_t n);
  ge_precomp (Duif): (y+x,y-x,2dxy)
  */
 
+#define ge_p2 ge25519_p2
 typedef struct {
     fe X;
     fe Y;
     fe Z;
 } ge_p2;
 
+#define ge_p3 ge25519_p3
 typedef struct {
     fe X;
     fe Y;
@@ -57,6 +61,7 @@ typedef struct {
     fe T;
 } ge_p3;
 
+#define ge_p1p1 ge25519_p1p1
 typedef struct {
     fe X;
     fe Y;
@@ -64,12 +69,14 @@ typedef struct {
     fe T;
 } ge_p1p1;
 
+#define ge_precomp ge25519_precomp
 typedef struct {
     fe yplusx;
     fe yminusx;
     fe xy2d;
 } ge_precomp;
 
+#define ge_cached ge25519_cached
 typedef struct {
     fe YplusX;
     fe YminusX;