From b81f9cd436f9bac05100f601b1770d7b2dfb3bac Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Wed, 16 Dec 2015 15:46:09 +0100
Subject: [PATCH] Let the x25519 ref10 implementation use the
 core/curve25519/ref code cswap can be a convenient operation to have in core
 later, but it is not required yet.

---
 src/libsodium/Makefile.am                     |  17 +-
 .../curve25519/ref10/curve25519_ref10.h       |   5 -
 .../curve25519/ref10/curve25519_ref10.c       |  90 ------
 .../crypto_scalarmult/curve25519/ref10/fe.h   |  44 ---
 .../curve25519/ref10/fe_0_curve25519_ref10.c  |  23 --
 .../curve25519/ref10/fe_1_curve25519_ref10.c  |  23 --
 .../ref10/fe_add_curve25519_ref10.c           |  62 -----
 .../ref10/fe_copy_curve25519_ref10.c          |  34 ---
 .../ref10/fe_cswap_curve25519_ref10.c         |  78 ------
 .../ref10/fe_frombytes_curve25519_ref10.c     |  74 -----
 .../ref10/fe_invert_curve25519_ref10.c        |  70 -----
 .../ref10/fe_mul121666_curve25519_ref10.c     |  75 -----
 .../ref10/fe_mul_curve25519_ref10.c           | 258 ------------------
 .../curve25519/ref10/fe_sq_curve25519_ref10.c | 154 -----------
 .../ref10/fe_sub_curve25519_ref10.c           |  62 -----
 .../ref10/fe_tobytes_curve25519_ref10.c       | 124 ---------
 .../curve25519/ref10/x25519_ref10.c           | 234 ++++++++++++++++
 .../{curve25519_ref10.h => x25519_ref10.h}    |   0
 .../curve25519/scalarmult_curve25519.c        |   2 +-
 19 files changed, 237 insertions(+), 1192 deletions(-)
 delete mode 100644 src/libsodium/crypto_scalarmult/curve25519/ref10/curve25519_ref10.c
 delete mode 100644 src/libsodium/crypto_scalarmult/curve25519/ref10/fe.h
 delete mode 100644 src/libsodium/crypto_scalarmult/curve25519/ref10/fe_0_curve25519_ref10.c
 delete mode 100644 src/libsodium/crypto_scalarmult/curve25519/ref10/fe_1_curve25519_ref10.c
 delete mode 100644 src/libsodium/crypto_scalarmult/curve25519/ref10/fe_add_curve25519_ref10.c
 delete mode 100644 src/libsodium/crypto_scalarmult/curve25519/ref10/fe_copy_curve25519_ref10.c
 delete mode 100644 src/libsodium/crypto_scalarmult/curve25519/ref10/fe_cswap_curve25519_ref10.c
 delete mode 100644 src/libsodium/crypto_scalarmult/curve25519/ref10/fe_frombytes_curve25519_ref10.c
 delete mode 100644 src/libsodium/crypto_scalarmult/curve25519/ref10/fe_invert_curve25519_ref10.c
 delete mode 100644 src/libsodium/crypto_scalarmult/curve25519/ref10/fe_mul121666_curve25519_ref10.c
 delete mode 100644 src/libsodium/crypto_scalarmult/curve25519/ref10/fe_mul_curve25519_ref10.c
 delete mode 100644 src/libsodium/crypto_scalarmult/curve25519/ref10/fe_sq_curve25519_ref10.c
 delete mode 100644 src/libsodium/crypto_scalarmult/curve25519/ref10/fe_sub_curve25519_ref10.c
 delete mode 100644 src/libsodium/crypto_scalarmult/curve25519/ref10/fe_tobytes_curve25519_ref10.c
 create mode 100644 src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c
 rename src/libsodium/crypto_scalarmult/curve25519/ref10/{curve25519_ref10.h => x25519_ref10.h} (100%)

diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am
index 1973dffb..cf99534e 100644
--- a/src/libsodium/Makefile.am
+++ b/src/libsodium/Makefile.am
@@ -115,21 +115,8 @@ libsodium_la_SOURCES += \
 	crypto_scalarmult/curve25519/donna_c64/curve25519_donna_c64.h
 else
 libsodium_la_SOURCES += \
-	crypto_scalarmult/curve25519/ref10/curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/curve25519_ref10.h \
-	crypto_scalarmult/curve25519/ref10/fe.h \
-	crypto_scalarmult/curve25519/ref10/fe_0_curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/fe_1_curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/fe_add_curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/fe_copy_curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/fe_cswap_curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/fe_frombytes_curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/fe_invert_curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/fe_mul_curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/fe_mul121666_curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/fe_sq_curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/fe_sub_curve25519_ref10.c \
-	crypto_scalarmult/curve25519/ref10/fe_tobytes_curve25519_ref10.c
+	crypto_scalarmult/curve25519/ref10/x25519_ref10.c \
+	crypto_scalarmult/curve25519/ref10/x25519_ref10.h
 endif
 
 noinst_HEADERS = \
diff --git a/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.h b/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.h
index f4adcf31..d774a8a4 100644
--- a/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.h
+++ b/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.h
@@ -21,7 +21,6 @@ Bounds on each t[i] vary depending on context.
 #define fe_isnegative crypto_core_curve25519_ref10_fe_isnegative
 #define fe_0 crypto_core_curve25519_ref10_fe_0
 #define fe_1 crypto_core_curve25519_ref10_fe_1
-#define fe_cswap crypto_core_curve25519_ref10_fe_cswap
 #define fe_cmov crypto_core_curve25519_ref10_fe_cmov
 #define fe_add crypto_core_curve25519_ref10_fe_add
 #define fe_sub crypto_core_curve25519_ref10_fe_sub
@@ -29,7 +28,6 @@ Bounds on each t[i] vary depending on context.
 #define fe_mul crypto_core_curve25519_ref10_fe_mul
 #define fe_sq crypto_core_curve25519_ref10_fe_sq
 #define fe_sq2 crypto_core_curve25519_ref10_fe_sq2
-#define fe_mul121666 crypto_core_curve25519_ref10_fe_mul121666
 #define fe_invert crypto_core_curve25519_ref10_fe_invert
 #define fe_pow22523 crypto_core_curve25519_ref10_fe_pow22523
 
@@ -41,16 +39,13 @@ extern int fe_isnonzero(const fe);
 extern int fe_isnegative(const fe);
 extern void fe_0(fe);
 extern void fe_1(fe);
-extern void fe_cswap(fe,fe,unsigned int);
 extern void fe_cmov(fe,const fe,unsigned int);
-
 extern void fe_add(fe,const fe,const fe);
 extern void fe_sub(fe,const fe,const fe);
 extern void fe_neg(fe,const fe);
 extern void fe_mul(fe,const fe,const fe);
 extern void fe_sq(fe,const fe);
 extern void fe_sq2(fe,const fe);
-extern void fe_mul121666(fe,const fe);
 extern void fe_invert(fe,const fe);
 extern void fe_pow22523(fe,const fe);
 
diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref10/curve25519_ref10.c b/src/libsodium/crypto_scalarmult/curve25519/ref10/curve25519_ref10.c
deleted file mode 100644
index 1055aba2..00000000
--- a/src/libsodium/crypto_scalarmult/curve25519/ref10/curve25519_ref10.c
+++ /dev/null
@@ -1,90 +0,0 @@
-
-#include <stddef.h>
-
-#ifndef HAVE_TI_MODE
-
-#include "utils.h"
-#include "curve25519_ref10.h"
-#include "../scalarmult_curve25519.h"
-#include "fe.h"
-
-static const unsigned char basepoint[32] = {9};
-
-static int
-crypto_scalarmult_curve25519_ref10(unsigned char *q,
-                                   const unsigned char *n,
-                                   const unsigned char *p)
-{
-  unsigned char e[32];
-  unsigned int i;
-  fe x1;
-  fe x2;
-  fe z2;
-  fe x3;
-  fe z3;
-  fe tmp0;
-  fe tmp1;
-  int pos;
-  unsigned int swap;
-  unsigned int b;
-
-  for (i = 0;i < 32;++i) e[i] = n[i];
-  e[0] &= 248;
-  e[31] &= 127;
-  e[31] |= 64;
-  fe_frombytes(x1,p);
-  fe_1(x2);
-  fe_0(z2);
-  fe_copy(x3,x1);
-  fe_1(z3);
-
-  swap = 0;
-  for (pos = 254;pos >= 0;--pos) {
-    b = e[pos / 8] >> (pos & 7);
-    b &= 1;
-    swap ^= b;
-    fe_cswap(x2,x3,swap);
-    fe_cswap(z2,z3,swap);
-    swap = b;
-    fe_sub(tmp0,x3,z3);
-    fe_sub(tmp1,x2,z2);
-    fe_add(x2,x2,z2);
-    fe_add(z2,x3,z3);
-    fe_mul(z3,tmp0,x2);
-    fe_mul(z2,z2,tmp1);
-    fe_sq(tmp0,tmp1);
-    fe_sq(tmp1,x2);
-    fe_add(x3,z3,z2);
-    fe_sub(z2,z3,z2);
-    fe_mul(x2,tmp1,tmp0);
-    fe_sub(tmp1,tmp1,tmp0);
-    fe_sq(z2,z2);
-    fe_mul121666(z3,tmp1);
-    fe_sq(x3,x3);
-    fe_add(tmp0,tmp0,z3);
-    fe_mul(z3,x1,z2);
-    fe_mul(z2,tmp1,tmp0);
-  }
-  fe_cswap(x2,x3,swap);
-  fe_cswap(z2,z3,swap);
-
-  fe_invert(z2,z2);
-  fe_mul(x2,x2,z2);
-  fe_tobytes(q,x2);
-  return 0;
-}
-
-static int
-crypto_scalarmult_curve25519_ref10_base(unsigned char *q,
-                                        const unsigned char *n)
-{
-  return crypto_scalarmult_curve25519_ref10(q,n,basepoint);
-}
-
-struct crypto_scalarmult_curve25519_implementation
-crypto_scalarmult_curve25519_ref10_implementation = {
-        SODIUM_C99(.mult = ) crypto_scalarmult_curve25519_ref10,
-        SODIUM_C99(.mult_base = ) crypto_scalarmult_curve25519_ref10_base
-};
-
-#endif
diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe.h b/src/libsodium/crypto_scalarmult/curve25519/ref10/fe.h
deleted file mode 100644
index 9d8e2fce..00000000
--- a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef FE_H
-#define FE_H
-
-#include "crypto_int32.h"
-
-typedef crypto_int32 fe[10];
-
-/*
-fe means field element.
-Here the field is \Z/(2^255-19).
-An element t, entries t[0]...t[9], represents the integer
-t[0]+2^26 t[1]+2^51 t[2]+2^77 t[3]+2^102 t[4]+...+2^230 t[9].
-Bounds on each t[i] vary depending on context.
-*/
-
-#define fe_frombytes crypto_scalarmult_curve25519_ref10_fe_frombytes
-#define fe_tobytes crypto_scalarmult_curve25519_ref10_fe_tobytes
-#define fe_copy crypto_scalarmult_curve25519_ref10_fe_copy
-#define fe_0 crypto_scalarmult_curve25519_ref10_fe_0
-#define fe_1 crypto_scalarmult_curve25519_ref10_fe_1
-#define fe_cswap crypto_scalarmult_curve25519_ref10_fe_cswap
-#define fe_add crypto_scalarmult_curve25519_ref10_fe_add
-#define fe_sub crypto_scalarmult_curve25519_ref10_fe_sub
-#define fe_mul crypto_scalarmult_curve25519_ref10_fe_mul
-#define fe_sq crypto_scalarmult_curve25519_ref10_fe_sq
-#define fe_mul121666 crypto_scalarmult_curve25519_ref10_fe_mul121666
-#define fe_invert crypto_scalarmult_curve25519_ref10_fe_invert
-
-extern void fe_frombytes(fe,const unsigned char *);
-extern void fe_tobytes(unsigned char *,const fe);
-
-extern void fe_copy(fe,const fe);
-extern void fe_0(fe);
-extern void fe_1(fe);
-extern void fe_cswap(fe,fe,unsigned int);
-
-extern void fe_add(fe,const fe,const fe);
-extern void fe_sub(fe,const fe,const fe);
-extern void fe_mul(fe,const fe,const fe);
-extern void fe_sq(fe,const fe);
-extern void fe_mul121666(fe,const fe);
-extern void fe_invert(fe,const fe);
-
-#endif
diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_0_curve25519_ref10.c b/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_0_curve25519_ref10.c
deleted file mode 100644
index f351eea9..00000000
--- a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_0_curve25519_ref10.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "fe.h"
-
-#ifndef HAVE_TI_MODE
-
-/*
-h = 0
-*/
-
-void fe_0(fe h)
-{
-  h[0] = 0;
-  h[1] = 0;
-  h[2] = 0;
-  h[3] = 0;
-  h[4] = 0;
-  h[5] = 0;
-  h[6] = 0;
-  h[7] = 0;
-  h[8] = 0;
-  h[9] = 0;
-}
-
-#endif
diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_1_curve25519_ref10.c b/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_1_curve25519_ref10.c
deleted file mode 100644
index 3ef13aa6..00000000
--- a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_1_curve25519_ref10.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "fe.h"
-
-#ifndef HAVE_TI_MODE
-
-/*
-h = 1
-*/
-
-void fe_1(fe h)
-{
-  h[0] = 1;
-  h[1] = 0;
-  h[2] = 0;
-  h[3] = 0;
-  h[4] = 0;
-  h[5] = 0;
-  h[6] = 0;
-  h[7] = 0;
-  h[8] = 0;
-  h[9] = 0;
-}
-
-#endif
diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_add_curve25519_ref10.c b/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_add_curve25519_ref10.c
deleted file mode 100644
index 65e7f0dd..00000000
--- a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_add_curve25519_ref10.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include "fe.h"
-#include "crypto_int32.h"
-
-#ifndef HAVE_TI_MODE
-
-/*
-h = f + g
-Can overlap h with f or g.
-
-Preconditions:
-   |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-   |g| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-
-Postconditions:
-   |h| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
-*/
-
-void fe_add(fe h,const fe f,const fe g)
-{
-  crypto_int32 f0 = f[0];
-  crypto_int32 f1 = f[1];
-  crypto_int32 f2 = f[2];
-  crypto_int32 f3 = f[3];
-  crypto_int32 f4 = f[4];
-  crypto_int32 f5 = f[5];
-  crypto_int32 f6 = f[6];
-  crypto_int32 f7 = f[7];
-  crypto_int32 f8 = f[8];
-  crypto_int32 f9 = f[9];
-  crypto_int32 g0 = g[0];
-  crypto_int32 g1 = g[1];
-  crypto_int32 g2 = g[2];
-  crypto_int32 g3 = g[3];
-  crypto_int32 g4 = g[4];
-  crypto_int32 g5 = g[5];
-  crypto_int32 g6 = g[6];
-  crypto_int32 g7 = g[7];
-  crypto_int32 g8 = g[8];
-  crypto_int32 g9 = g[9];
-  crypto_int32 h0 = f0 + g0;
-  crypto_int32 h1 = f1 + g1;
-  crypto_int32 h2 = f2 + g2;
-  crypto_int32 h3 = f3 + g3;
-  crypto_int32 h4 = f4 + g4;
-  crypto_int32 h5 = f5 + g5;
-  crypto_int32 h6 = f6 + g6;
-  crypto_int32 h7 = f7 + g7;
-  crypto_int32 h8 = f8 + g8;
-  crypto_int32 h9 = f9 + g9;
-  h[0] = h0;
-  h[1] = h1;
-  h[2] = h2;
-  h[3] = h3;
-  h[4] = h4;
-  h[5] = h5;
-  h[6] = h6;
-  h[7] = h7;
-  h[8] = h8;
-  h[9] = h9;
-}
-
-#endif
diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_copy_curve25519_ref10.c b/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_copy_curve25519_ref10.c
deleted file mode 100644
index 5eea50f7..00000000
--- a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_copy_curve25519_ref10.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "fe.h"
-#include "crypto_int32.h"
-
-#ifndef HAVE_TI_MODE
-
-/*
-h = f
-*/
-
-void fe_copy(fe h,const fe f)
-{
-  crypto_int32 f0 = f[0];
-  crypto_int32 f1 = f[1];
-  crypto_int32 f2 = f[2];
-  crypto_int32 f3 = f[3];
-  crypto_int32 f4 = f[4];
-  crypto_int32 f5 = f[5];
-  crypto_int32 f6 = f[6];
-  crypto_int32 f7 = f[7];
-  crypto_int32 f8 = f[8];
-  crypto_int32 f9 = f[9];
-  h[0] = f0;
-  h[1] = f1;
-  h[2] = f2;
-  h[3] = f3;
-  h[4] = f4;
-  h[5] = f5;
-  h[6] = f6;
-  h[7] = f7;
-  h[8] = f8;
-  h[9] = f9;
-}
-
-#endif
diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_cswap_curve25519_ref10.c b/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_cswap_curve25519_ref10.c
deleted file mode 100644
index c8c2c78b..00000000
--- a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_cswap_curve25519_ref10.c
+++ /dev/null
@@ -1,78 +0,0 @@
-#include "fe.h"
-#include "crypto_int32.h"
-
-#ifndef HAVE_TI_MODE
-
-/*
-Replace (f,g) with (g,f) if b == 1;
-replace (f,g) with (f,g) if b == 0.
-
-Preconditions: b in {0,1}.
-*/
-
-void fe_cswap(fe f,fe g,unsigned int b)
-{
-  crypto_int32 f0 = f[0];
-  crypto_int32 f1 = f[1];
-  crypto_int32 f2 = f[2];
-  crypto_int32 f3 = f[3];
-  crypto_int32 f4 = f[4];
-  crypto_int32 f5 = f[5];
-  crypto_int32 f6 = f[6];
-  crypto_int32 f7 = f[7];
-  crypto_int32 f8 = f[8];
-  crypto_int32 f9 = f[9];
-  crypto_int32 g0 = g[0];
-  crypto_int32 g1 = g[1];
-  crypto_int32 g2 = g[2];
-  crypto_int32 g3 = g[3];
-  crypto_int32 g4 = g[4];
-  crypto_int32 g5 = g[5];
-  crypto_int32 g6 = g[6];
-  crypto_int32 g7 = g[7];
-  crypto_int32 g8 = g[8];
-  crypto_int32 g9 = g[9];
-  crypto_int32 x0 = f0 ^ g0;
-  crypto_int32 x1 = f1 ^ g1;
-  crypto_int32 x2 = f2 ^ g2;
-  crypto_int32 x3 = f3 ^ g3;
-  crypto_int32 x4 = f4 ^ g4;
-  crypto_int32 x5 = f5 ^ g5;
-  crypto_int32 x6 = f6 ^ g6;
-  crypto_int32 x7 = f7 ^ g7;
-  crypto_int32 x8 = f8 ^ g8;
-  crypto_int32 x9 = f9 ^ g9;
-  b = (unsigned int) (- (int) b);
-  x0 &= b;
-  x1 &= b;
-  x2 &= b;
-  x3 &= b;
-  x4 &= b;
-  x5 &= b;
-  x6 &= b;
-  x7 &= b;
-  x8 &= b;
-  x9 &= b;
-  f[0] = f0 ^ x0;
-  f[1] = f1 ^ x1;
-  f[2] = f2 ^ x2;
-  f[3] = f3 ^ x3;
-  f[4] = f4 ^ x4;
-  f[5] = f5 ^ x5;
-  f[6] = f6 ^ x6;
-  f[7] = f7 ^ x7;
-  f[8] = f8 ^ x8;
-  f[9] = f9 ^ x9;
-  g[0] = g0 ^ x0;
-  g[1] = g1 ^ x1;
-  g[2] = g2 ^ x2;
-  g[3] = g3 ^ x3;
-  g[4] = g4 ^ x4;
-  g[5] = g5 ^ x5;
-  g[6] = g6 ^ x6;
-  g[7] = g7 ^ x7;
-  g[8] = g8 ^ x8;
-  g[9] = g9 ^ x9;
-}
-
-#endif
diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_frombytes_curve25519_ref10.c b/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_frombytes_curve25519_ref10.c
deleted file mode 100644
index 0f66469f..00000000
--- a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_frombytes_curve25519_ref10.c
+++ /dev/null
@@ -1,74 +0,0 @@
-#include "fe.h"
-#include "crypto_int32.h"
-#include "crypto_int64.h"
-#include "crypto_uint64.h"
-
-#ifndef HAVE_TI_MODE
-
-static crypto_uint64 load_3(const unsigned char *in)
-{
-  crypto_uint64 result;
-  result = (crypto_uint64) in[0];
-  result |= ((crypto_uint64) in[1]) << 8;
-  result |= ((crypto_uint64) in[2]) << 16;
-  return result;
-}
-
-static crypto_uint64 load_4(const unsigned char *in)
-{
-  crypto_uint64 result;
-  result = (crypto_uint64) in[0];
-  result |= ((crypto_uint64) in[1]) << 8;
-  result |= ((crypto_uint64) in[2]) << 16;
-  result |= ((crypto_uint64) in[3]) << 24;
-  return result;
-}
-
-void fe_frombytes(fe h,const unsigned char *s)
-{
-  crypto_int64 h0 = load_4(s);
-  crypto_int64 h1 = load_3(s + 4) << 6;
-  crypto_int64 h2 = load_3(s + 7) << 5;
-  crypto_int64 h3 = load_3(s + 10) << 3;
-  crypto_int64 h4 = load_3(s + 13) << 2;
-  crypto_int64 h5 = load_4(s + 16);
-  crypto_int64 h6 = load_3(s + 20) << 7;
-  crypto_int64 h7 = load_3(s + 23) << 5;
-  crypto_int64 h8 = load_3(s + 26) << 4;
-  crypto_int64 h9 = (load_3(s + 29) & 8388607) << 2;
-  crypto_int64 carry0;
-  crypto_int64 carry1;
-  crypto_int64 carry2;
-  crypto_int64 carry3;
-  crypto_int64 carry4;
-  crypto_int64 carry5;
-  crypto_int64 carry6;
-  crypto_int64 carry7;
-  crypto_int64 carry8;
-  crypto_int64 carry9;
-
-  carry9 = (h9 + (crypto_int64) (1L << 24)) >> 25; h0 += carry9 * 19; h9 -= carry9 << 25;
-  carry1 = (h1 + (crypto_int64) (1L << 24)) >> 25; h2 += carry1; h1 -= carry1 << 25;
-  carry3 = (h3 + (crypto_int64) (1L << 24)) >> 25; h4 += carry3; h3 -= carry3 << 25;
-  carry5 = (h5 + (crypto_int64) (1L << 24)) >> 25; h6 += carry5; h5 -= carry5 << 25;
-  carry7 = (h7 + (crypto_int64) (1L << 24)) >> 25; h8 += carry7; h7 -= carry7 << 25;
-
-  carry0 = (h0 + (crypto_int64) (1L << 25)) >> 26; h1 += carry0; h0 -= carry0 << 26;
-  carry2 = (h2 + (crypto_int64) (1L << 25)) >> 26; h3 += carry2; h2 -= carry2 << 26;
-  carry4 = (h4 + (crypto_int64) (1L << 25)) >> 26; h5 += carry4; h4 -= carry4 << 26;
-  carry6 = (h6 + (crypto_int64) (1L << 25)) >> 26; h7 += carry6; h6 -= carry6 << 26;
-  carry8 = (h8 + (crypto_int64) (1L << 25)) >> 26; h9 += carry8; h8 -= carry8 << 26;
-
-  h[0] = (crypto_int32) h0;
-  h[1] = (crypto_int32) h1;
-  h[2] = (crypto_int32) h2;
-  h[3] = (crypto_int32) h3;
-  h[4] = (crypto_int32) h4;
-  h[5] = (crypto_int32) h5;
-  h[6] = (crypto_int32) h6;
-  h[7] = (crypto_int32) h7;
-  h[8] = (crypto_int32) h8;
-  h[9] = (crypto_int32) h9;
-}
-
-#endif
diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_invert_curve25519_ref10.c b/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_invert_curve25519_ref10.c
deleted file mode 100644
index f6d24c49..00000000
--- a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_invert_curve25519_ref10.c
+++ /dev/null
@@ -1,70 +0,0 @@
-#include "fe.h"
-
-#ifndef HAVE_TI_MODE
-
-void fe_invert(fe out,const fe z)
-{
-    fe t0;
-    fe t1;
-    fe t2;
-    fe t3;
-    int i;
-
-    fe_sq(t0, z);
-    for (i = 1; i < 1; ++i) {
-        fe_sq(t0, t0);
-    }
-    fe_sq(t1, t0);
-    for (i = 1; i < 2; ++i) {
-        fe_sq(t1, t1);
-    }
-    fe_mul(t1, z, t1);
-    fe_mul(t0, t0, t1);
-    fe_sq(t2, t0);
-    for (i = 1; i < 1; ++i) {
-        fe_sq(t2, t2);
-    }
-    fe_mul(t1, t1, t2);
-    fe_sq(t2, t1);
-    for (i = 1; i < 5; ++i) {
-        fe_sq(t2, t2);
-    }
-    fe_mul(t1, t2, t1);
-    fe_sq(t2, t1);
-    for (i = 1; i < 10; ++i) {
-        fe_sq(t2, t2);
-    }
-    fe_mul(t2, t2, t1);
-    fe_sq(t3, t2);
-    for (i = 1; i < 20; ++i) {
-        fe_sq(t3, t3);
-    }
-    fe_mul(t2, t3, t2);
-    fe_sq(t2, t2);
-    for (i = 1; i < 10; ++i) {
-        fe_sq(t2, t2);
-    }
-    fe_mul(t1, t2, t1);
-    fe_sq(t2, t1);
-    for (i = 1; i < 50; ++i) {
-        fe_sq(t2, t2);
-    }
-    fe_mul(t2, t2, t1);
-    fe_sq(t3, t2);
-    for (i = 1; i < 100; ++i) {
-        fe_sq(t3, t3);
-    }
-    fe_mul(t2, t3, t2);
-    fe_sq(t2, t2);
-    for (i = 1; i < 50; ++i) {
-        fe_sq(t2, t2);
-    }
-    fe_mul(t1, t2, t1);
-    fe_sq(t1, t1);
-    for (i = 1; i < 5; ++i) {
-        fe_sq(t1, t1);
-    }
-    fe_mul(out, t1, t0);
-}
-
-#endif
diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_mul121666_curve25519_ref10.c b/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_mul121666_curve25519_ref10.c
deleted file mode 100644
index a70208ad..00000000
--- a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_mul121666_curve25519_ref10.c
+++ /dev/null
@@ -1,75 +0,0 @@
-#include "fe.h"
-#include "crypto_int32.h"
-#include "crypto_int64.h"
-
-#ifndef HAVE_TI_MODE
-
-/*
-h = f * 121666
-Can overlap h with f.
-
-Preconditions:
-   |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
-
-Postconditions:
-   |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-*/
-
-void fe_mul121666(fe h,const fe f)
-{
-  crypto_int32 f0 = f[0];
-  crypto_int32 f1 = f[1];
-  crypto_int32 f2 = f[2];
-  crypto_int32 f3 = f[3];
-  crypto_int32 f4 = f[4];
-  crypto_int32 f5 = f[5];
-  crypto_int32 f6 = f[6];
-  crypto_int32 f7 = f[7];
-  crypto_int32 f8 = f[8];
-  crypto_int32 f9 = f[9];
-  crypto_int64 h0 = f0 * (crypto_int64) 121666;
-  crypto_int64 h1 = f1 * (crypto_int64) 121666;
-  crypto_int64 h2 = f2 * (crypto_int64) 121666;
-  crypto_int64 h3 = f3 * (crypto_int64) 121666;
-  crypto_int64 h4 = f4 * (crypto_int64) 121666;
-  crypto_int64 h5 = f5 * (crypto_int64) 121666;
-  crypto_int64 h6 = f6 * (crypto_int64) 121666;
-  crypto_int64 h7 = f7 * (crypto_int64) 121666;
-  crypto_int64 h8 = f8 * (crypto_int64) 121666;
-  crypto_int64 h9 = f9 * (crypto_int64) 121666;
-  crypto_int64 carry0;
-  crypto_int64 carry1;
-  crypto_int64 carry2;
-  crypto_int64 carry3;
-  crypto_int64 carry4;
-  crypto_int64 carry5;
-  crypto_int64 carry6;
-  crypto_int64 carry7;
-  crypto_int64 carry8;
-  crypto_int64 carry9;
-
-  carry9 = (h9 + (crypto_int64) (1<<24)) >> 25; h0 += carry9 * 19; h9 -= carry9 << 25;
-  carry1 = (h1 + (crypto_int64) (1<<24)) >> 25; h2 += carry1; h1 -= carry1 << 25;
-  carry3 = (h3 + (crypto_int64) (1<<24)) >> 25; h4 += carry3; h3 -= carry3 << 25;
-  carry5 = (h5 + (crypto_int64) (1<<24)) >> 25; h6 += carry5; h5 -= carry5 << 25;
-  carry7 = (h7 + (crypto_int64) (1<<24)) >> 25; h8 += carry7; h7 -= carry7 << 25;
-
-  carry0 = (h0 + (crypto_int64) (1<<25)) >> 26; h1 += carry0; h0 -= carry0 << 26;
-  carry2 = (h2 + (crypto_int64) (1<<25)) >> 26; h3 += carry2; h2 -= carry2 << 26;
-  carry4 = (h4 + (crypto_int64) (1<<25)) >> 26; h5 += carry4; h4 -= carry4 << 26;
-  carry6 = (h6 + (crypto_int64) (1<<25)) >> 26; h7 += carry6; h6 -= carry6 << 26;
-  carry8 = (h8 + (crypto_int64) (1<<25)) >> 26; h9 += carry8; h8 -= carry8 << 26;
-
-  h[0] = h0;
-  h[1] = h1;
-  h[2] = h2;
-  h[3] = h3;
-  h[4] = h4;
-  h[5] = h5;
-  h[6] = h6;
-  h[7] = h7;
-  h[8] = h8;
-  h[9] = h9;
-}
-
-#endif
diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_mul_curve25519_ref10.c b/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_mul_curve25519_ref10.c
deleted file mode 100644
index 6856339b..00000000
--- a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_mul_curve25519_ref10.c
+++ /dev/null
@@ -1,258 +0,0 @@
-#include "fe.h"
-#include "crypto_int32.h"
-#include "crypto_int64.h"
-
-#ifndef HAVE_TI_MODE
-
-/*
-h = f * g
-Can overlap h with f or g.
-
-Preconditions:
-   |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
-   |g| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
-
-Postconditions:
-   |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-*/
-
-/*
-Notes on implementation strategy:
-
-Using schoolbook multiplication.
-Karatsuba would save a little in some cost models.
-
-Most multiplications by 2 and 19 are 32-bit precomputations;
-cheaper than 64-bit postcomputations.
-
-There is one remaining multiplication by 19 in the carry chain;
-one *19 precomputation can be merged into this,
-but the resulting data flow is considerably less clean.
-
-There are 12 carries below.
-10 of them are 2-way parallelizable and vectorizable.
-Can get away with 11 carries, but then data flow is much deeper.
-
-With tighter constraints on inputs can squeeze carries into int32.
-*/
-
-void fe_mul(fe h,const fe f,const fe g)
-{
-  crypto_int32 f0 = f[0];
-  crypto_int32 f1 = f[1];
-  crypto_int32 f2 = f[2];
-  crypto_int32 f3 = f[3];
-  crypto_int32 f4 = f[4];
-  crypto_int32 f5 = f[5];
-  crypto_int32 f6 = f[6];
-  crypto_int32 f7 = f[7];
-  crypto_int32 f8 = f[8];
-  crypto_int32 f9 = f[9];
-  crypto_int32 g0 = g[0];
-  crypto_int32 g1 = g[1];
-  crypto_int32 g2 = g[2];
-  crypto_int32 g3 = g[3];
-  crypto_int32 g4 = g[4];
-  crypto_int32 g5 = g[5];
-  crypto_int32 g6 = g[6];
-  crypto_int32 g7 = g[7];
-  crypto_int32 g8 = g[8];
-  crypto_int32 g9 = g[9];
-  crypto_int32 g1_19 = 19 * g1; /* 1.4*2^29 */
-  crypto_int32 g2_19 = 19 * g2; /* 1.4*2^30; still ok */
-  crypto_int32 g3_19 = 19 * g3;
-  crypto_int32 g4_19 = 19 * g4;
-  crypto_int32 g5_19 = 19 * g5;
-  crypto_int32 g6_19 = 19 * g6;
-  crypto_int32 g7_19 = 19 * g7;
-  crypto_int32 g8_19 = 19 * g8;
-  crypto_int32 g9_19 = 19 * g9;
-  crypto_int32 f1_2 = 2 * f1;
-  crypto_int32 f3_2 = 2 * f3;
-  crypto_int32 f5_2 = 2 * f5;
-  crypto_int32 f7_2 = 2 * f7;
-  crypto_int32 f9_2 = 2 * f9;
-  crypto_int64 f0g0    = f0   * (crypto_int64) g0;
-  crypto_int64 f0g1    = f0   * (crypto_int64) g1;
-  crypto_int64 f0g2    = f0   * (crypto_int64) g2;
-  crypto_int64 f0g3    = f0   * (crypto_int64) g3;
-  crypto_int64 f0g4    = f0   * (crypto_int64) g4;
-  crypto_int64 f0g5    = f0   * (crypto_int64) g5;
-  crypto_int64 f0g6    = f0   * (crypto_int64) g6;
-  crypto_int64 f0g7    = f0   * (crypto_int64) g7;
-  crypto_int64 f0g8    = f0   * (crypto_int64) g8;
-  crypto_int64 f0g9    = f0   * (crypto_int64) g9;
-  crypto_int64 f1g0    = f1   * (crypto_int64) g0;
-  crypto_int64 f1g1_2  = f1_2 * (crypto_int64) g1;
-  crypto_int64 f1g2    = f1   * (crypto_int64) g2;
-  crypto_int64 f1g3_2  = f1_2 * (crypto_int64) g3;
-  crypto_int64 f1g4    = f1   * (crypto_int64) g4;
-  crypto_int64 f1g5_2  = f1_2 * (crypto_int64) g5;
-  crypto_int64 f1g6    = f1   * (crypto_int64) g6;
-  crypto_int64 f1g7_2  = f1_2 * (crypto_int64) g7;
-  crypto_int64 f1g8    = f1   * (crypto_int64) g8;
-  crypto_int64 f1g9_38 = f1_2 * (crypto_int64) g9_19;
-  crypto_int64 f2g0    = f2   * (crypto_int64) g0;
-  crypto_int64 f2g1    = f2   * (crypto_int64) g1;
-  crypto_int64 f2g2    = f2   * (crypto_int64) g2;
-  crypto_int64 f2g3    = f2   * (crypto_int64) g3;
-  crypto_int64 f2g4    = f2   * (crypto_int64) g4;
-  crypto_int64 f2g5    = f2   * (crypto_int64) g5;
-  crypto_int64 f2g6    = f2   * (crypto_int64) g6;
-  crypto_int64 f2g7    = f2   * (crypto_int64) g7;
-  crypto_int64 f2g8_19 = f2   * (crypto_int64) g8_19;
-  crypto_int64 f2g9_19 = f2   * (crypto_int64) g9_19;
-  crypto_int64 f3g0    = f3   * (crypto_int64) g0;
-  crypto_int64 f3g1_2  = f3_2 * (crypto_int64) g1;
-  crypto_int64 f3g2    = f3   * (crypto_int64) g2;
-  crypto_int64 f3g3_2  = f3_2 * (crypto_int64) g3;
-  crypto_int64 f3g4    = f3   * (crypto_int64) g4;
-  crypto_int64 f3g5_2  = f3_2 * (crypto_int64) g5;
-  crypto_int64 f3g6    = f3   * (crypto_int64) g6;
-  crypto_int64 f3g7_38 = f3_2 * (crypto_int64) g7_19;
-  crypto_int64 f3g8_19 = f3   * (crypto_int64) g8_19;
-  crypto_int64 f3g9_38 = f3_2 * (crypto_int64) g9_19;
-  crypto_int64 f4g0    = f4   * (crypto_int64) g0;
-  crypto_int64 f4g1    = f4   * (crypto_int64) g1;
-  crypto_int64 f4g2    = f4   * (crypto_int64) g2;
-  crypto_int64 f4g3    = f4   * (crypto_int64) g3;
-  crypto_int64 f4g4    = f4   * (crypto_int64) g4;
-  crypto_int64 f4g5    = f4   * (crypto_int64) g5;
-  crypto_int64 f4g6_19 = f4   * (crypto_int64) g6_19;
-  crypto_int64 f4g7_19 = f4   * (crypto_int64) g7_19;
-  crypto_int64 f4g8_19 = f4   * (crypto_int64) g8_19;
-  crypto_int64 f4g9_19 = f4   * (crypto_int64) g9_19;
-  crypto_int64 f5g0    = f5   * (crypto_int64) g0;
-  crypto_int64 f5g1_2  = f5_2 * (crypto_int64) g1;
-  crypto_int64 f5g2    = f5   * (crypto_int64) g2;
-  crypto_int64 f5g3_2  = f5_2 * (crypto_int64) g3;
-  crypto_int64 f5g4    = f5   * (crypto_int64) g4;
-  crypto_int64 f5g5_38 = f5_2 * (crypto_int64) g5_19;
-  crypto_int64 f5g6_19 = f5   * (crypto_int64) g6_19;
-  crypto_int64 f5g7_38 = f5_2 * (crypto_int64) g7_19;
-  crypto_int64 f5g8_19 = f5   * (crypto_int64) g8_19;
-  crypto_int64 f5g9_38 = f5_2 * (crypto_int64) g9_19;
-  crypto_int64 f6g0    = f6   * (crypto_int64) g0;
-  crypto_int64 f6g1    = f6   * (crypto_int64) g1;
-  crypto_int64 f6g2    = f6   * (crypto_int64) g2;
-  crypto_int64 f6g3    = f6   * (crypto_int64) g3;
-  crypto_int64 f6g4_19 = f6   * (crypto_int64) g4_19;
-  crypto_int64 f6g5_19 = f6   * (crypto_int64) g5_19;
-  crypto_int64 f6g6_19 = f6   * (crypto_int64) g6_19;
-  crypto_int64 f6g7_19 = f6   * (crypto_int64) g7_19;
-  crypto_int64 f6g8_19 = f6   * (crypto_int64) g8_19;
-  crypto_int64 f6g9_19 = f6   * (crypto_int64) g9_19;
-  crypto_int64 f7g0    = f7   * (crypto_int64) g0;
-  crypto_int64 f7g1_2  = f7_2 * (crypto_int64) g1;
-  crypto_int64 f7g2    = f7   * (crypto_int64) g2;
-  crypto_int64 f7g3_38 = f7_2 * (crypto_int64) g3_19;
-  crypto_int64 f7g4_19 = f7   * (crypto_int64) g4_19;
-  crypto_int64 f7g5_38 = f7_2 * (crypto_int64) g5_19;
-  crypto_int64 f7g6_19 = f7   * (crypto_int64) g6_19;
-  crypto_int64 f7g7_38 = f7_2 * (crypto_int64) g7_19;
-  crypto_int64 f7g8_19 = f7   * (crypto_int64) g8_19;
-  crypto_int64 f7g9_38 = f7_2 * (crypto_int64) g9_19;
-  crypto_int64 f8g0    = f8   * (crypto_int64) g0;
-  crypto_int64 f8g1    = f8   * (crypto_int64) g1;
-  crypto_int64 f8g2_19 = f8   * (crypto_int64) g2_19;
-  crypto_int64 f8g3_19 = f8   * (crypto_int64) g3_19;
-  crypto_int64 f8g4_19 = f8   * (crypto_int64) g4_19;
-  crypto_int64 f8g5_19 = f8   * (crypto_int64) g5_19;
-  crypto_int64 f8g6_19 = f8   * (crypto_int64) g6_19;
-  crypto_int64 f8g7_19 = f8   * (crypto_int64) g7_19;
-  crypto_int64 f8g8_19 = f8   * (crypto_int64) g8_19;
-  crypto_int64 f8g9_19 = f8   * (crypto_int64) g9_19;
-  crypto_int64 f9g0    = f9   * (crypto_int64) g0;
-  crypto_int64 f9g1_38 = f9_2 * (crypto_int64) g1_19;
-  crypto_int64 f9g2_19 = f9   * (crypto_int64) g2_19;
-  crypto_int64 f9g3_38 = f9_2 * (crypto_int64) g3_19;
-  crypto_int64 f9g4_19 = f9   * (crypto_int64) g4_19;
-  crypto_int64 f9g5_38 = f9_2 * (crypto_int64) g5_19;
-  crypto_int64 f9g6_19 = f9   * (crypto_int64) g6_19;
-  crypto_int64 f9g7_38 = f9_2 * (crypto_int64) g7_19;
-  crypto_int64 f9g8_19 = f9   * (crypto_int64) g8_19;
-  crypto_int64 f9g9_38 = f9_2 * (crypto_int64) g9_19;
-  crypto_int64 h0 = f0g0+f1g9_38+f2g8_19+f3g7_38+f4g6_19+f5g5_38+f6g4_19+f7g3_38+f8g2_19+f9g1_38;
-  crypto_int64 h1 = f0g1+f1g0   +f2g9_19+f3g8_19+f4g7_19+f5g6_19+f6g5_19+f7g4_19+f8g3_19+f9g2_19;
-  crypto_int64 h2 = f0g2+f1g1_2 +f2g0   +f3g9_38+f4g8_19+f5g7_38+f6g6_19+f7g5_38+f8g4_19+f9g3_38;
-  crypto_int64 h3 = f0g3+f1g2   +f2g1   +f3g0   +f4g9_19+f5g8_19+f6g7_19+f7g6_19+f8g5_19+f9g4_19;
-  crypto_int64 h4 = f0g4+f1g3_2 +f2g2   +f3g1_2 +f4g0   +f5g9_38+f6g8_19+f7g7_38+f8g6_19+f9g5_38;
-  crypto_int64 h5 = f0g5+f1g4   +f2g3   +f3g2   +f4g1   +f5g0   +f6g9_19+f7g8_19+f8g7_19+f9g6_19;
-  crypto_int64 h6 = f0g6+f1g5_2 +f2g4   +f3g3_2 +f4g2   +f5g1_2 +f6g0   +f7g9_38+f8g8_19+f9g7_38;
-  crypto_int64 h7 = f0g7+f1g6   +f2g5   +f3g4   +f4g3   +f5g2   +f6g1   +f7g0   +f8g9_19+f9g8_19;
-  crypto_int64 h8 = f0g8+f1g7_2 +f2g6   +f3g5_2 +f4g4   +f5g3_2 +f6g2   +f7g1_2 +f8g0   +f9g9_38;
-  crypto_int64 h9 = f0g9+f1g8   +f2g7   +f3g6   +f4g5   +f5g4   +f6g3   +f7g2   +f8g1   +f9g0   ;
-  crypto_int64 carry0;
-  crypto_int64 carry1;
-  crypto_int64 carry2;
-  crypto_int64 carry3;
-  crypto_int64 carry4;
-  crypto_int64 carry5;
-  crypto_int64 carry6;
-  crypto_int64 carry7;
-  crypto_int64 carry8;
-  crypto_int64 carry9;
-
-  /*
-  |h0| <= (1.1*1.1*2^52*(1+19+19+19+19)+1.1*1.1*2^50*(38+38+38+38+38))
-    i.e. |h0| <= 1.2*2^59; narrower ranges for h2, h4, h6, h8
-  |h1| <= (1.1*1.1*2^51*(1+1+19+19+19+19+19+19+19+19))
-    i.e. |h1| <= 1.5*2^58; narrower ranges for h3, h5, h7, h9
-  */
-
-  carry0 = (h0 + (crypto_int64) (1L << 25)) >> 26; h1 += carry0; h0 -= carry0 << 26;
-  carry4 = (h4 + (crypto_int64) (1L << 25)) >> 26; h5 += carry4; h4 -= carry4 << 26;
-  /* |h0| <= 2^25 */
-  /* |h4| <= 2^25 */
-  /* |h1| <= 1.51*2^58 */
-  /* |h5| <= 1.51*2^58 */
-
-  carry1 = (h1 + (crypto_int64) (1L << 24)) >> 25; h2 += carry1; h1 -= carry1 << 25;
-  carry5 = (h5 + (crypto_int64) (1L << 24)) >> 25; h6 += carry5; h5 -= carry5 << 25;
-  /* |h1| <= 2^24; from now on fits into int32 */
-  /* |h5| <= 2^24; from now on fits into int32 */
-  /* |h2| <= 1.21*2^59 */
-  /* |h6| <= 1.21*2^59 */
-
-  carry2 = (h2 + (crypto_int64) (1L << 25)) >> 26; h3 += carry2; h2 -= carry2 << 26;
-  carry6 = (h6 + (crypto_int64) (1L << 25)) >> 26; h7 += carry6; h6 -= carry6 << 26;
-  /* |h2| <= 2^25; from now on fits into int32 unchanged */
-  /* |h6| <= 2^25; from now on fits into int32 unchanged */
-  /* |h3| <= 1.51*2^58 */
-  /* |h7| <= 1.51*2^58 */
-
-  carry3 = (h3 + (crypto_int64) (1L << 24)) >> 25; h4 += carry3; h3 -= carry3 << 25;
-  carry7 = (h7 + (crypto_int64) (1L << 24)) >> 25; h8 += carry7; h7 -= carry7 << 25;
-  /* |h3| <= 2^24; from now on fits into int32 unchanged */
-  /* |h7| <= 2^24; from now on fits into int32 unchanged */
-  /* |h4| <= 1.52*2^33 */
-  /* |h8| <= 1.52*2^33 */
-
-  carry4 = (h4 + (crypto_int64) (1L << 25)) >> 26; h5 += carry4; h4 -= carry4 << 26;
-  carry8 = (h8 + (crypto_int64) (1L << 25)) >> 26; h9 += carry8; h8 -= carry8 << 26;
-  /* |h4| <= 2^25; from now on fits into int32 unchanged */
-  /* |h8| <= 2^25; from now on fits into int32 unchanged */
-  /* |h5| <= 1.01*2^24 */
-  /* |h9| <= 1.51*2^58 */
-
-  carry9 = (h9 + (crypto_int64) (1L << 24)) >> 25; h0 += carry9 * 19; h9 -= carry9 << 25;
-  /* |h9| <= 2^24; from now on fits into int32 unchanged */
-  /* |h0| <= 1.8*2^37 */
-
-  carry0 = (h0 + (crypto_int64) (1L << 25)) >> 26; h1 += carry0; h0 -= carry0 << 26;
-  /* |h0| <= 2^25; from now on fits into int32 unchanged */
-  /* |h1| <= 1.01*2^24 */
-
-  h[0] = (crypto_int32) h0;
-  h[1] = (crypto_int32) h1;
-  h[2] = (crypto_int32) h2;
-  h[3] = (crypto_int32) h3;
-  h[4] = (crypto_int32) h4;
-  h[5] = (crypto_int32) h5;
-  h[6] = (crypto_int32) h6;
-  h[7] = (crypto_int32) h7;
-  h[8] = (crypto_int32) h8;
-  h[9] = (crypto_int32) h9;
-}
-
-#endif
diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_sq_curve25519_ref10.c b/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_sq_curve25519_ref10.c
deleted file mode 100644
index ecaa8a77..00000000
--- a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_sq_curve25519_ref10.c
+++ /dev/null
@@ -1,154 +0,0 @@
-#include "fe.h"
-#include "crypto_int32.h"
-#include "crypto_int64.h"
-
-#ifndef HAVE_TI_MODE
-
-/*
-h = f * f
-Can overlap h with f.
-
-Preconditions:
-   |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
-
-Postconditions:
-   |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-*/
-
-/*
-See fe_mul.c for discussion of implementation strategy.
-*/
-
-void fe_sq(fe h,const fe f)
-{
-  crypto_int32 f0 = f[0];
-  crypto_int32 f1 = f[1];
-  crypto_int32 f2 = f[2];
-  crypto_int32 f3 = f[3];
-  crypto_int32 f4 = f[4];
-  crypto_int32 f5 = f[5];
-  crypto_int32 f6 = f[6];
-  crypto_int32 f7 = f[7];
-  crypto_int32 f8 = f[8];
-  crypto_int32 f9 = f[9];
-  crypto_int32 f0_2 = 2 * f0;
-  crypto_int32 f1_2 = 2 * f1;
-  crypto_int32 f2_2 = 2 * f2;
-  crypto_int32 f3_2 = 2 * f3;
-  crypto_int32 f4_2 = 2 * f4;
-  crypto_int32 f5_2 = 2 * f5;
-  crypto_int32 f6_2 = 2 * f6;
-  crypto_int32 f7_2 = 2 * f7;
-  crypto_int32 f5_38 = 38 * f5; /* 1.31*2^30 */
-  crypto_int32 f6_19 = 19 * f6; /* 1.31*2^30 */
-  crypto_int32 f7_38 = 38 * f7; /* 1.31*2^30 */
-  crypto_int32 f8_19 = 19 * f8; /* 1.31*2^30 */
-  crypto_int32 f9_38 = 38 * f9; /* 1.31*2^30 */
-  crypto_int64 f0f0    = f0   * (crypto_int64) f0;
-  crypto_int64 f0f1_2  = f0_2 * (crypto_int64) f1;
-  crypto_int64 f0f2_2  = f0_2 * (crypto_int64) f2;
-  crypto_int64 f0f3_2  = f0_2 * (crypto_int64) f3;
-  crypto_int64 f0f4_2  = f0_2 * (crypto_int64) f4;
-  crypto_int64 f0f5_2  = f0_2 * (crypto_int64) f5;
-  crypto_int64 f0f6_2  = f0_2 * (crypto_int64) f6;
-  crypto_int64 f0f7_2  = f0_2 * (crypto_int64) f7;
-  crypto_int64 f0f8_2  = f0_2 * (crypto_int64) f8;
-  crypto_int64 f0f9_2  = f0_2 * (crypto_int64) f9;
-  crypto_int64 f1f1_2  = f1_2 * (crypto_int64) f1;
-  crypto_int64 f1f2_2  = f1_2 * (crypto_int64) f2;
-  crypto_int64 f1f3_4  = f1_2 * (crypto_int64) f3_2;
-  crypto_int64 f1f4_2  = f1_2 * (crypto_int64) f4;
-  crypto_int64 f1f5_4  = f1_2 * (crypto_int64) f5_2;
-  crypto_int64 f1f6_2  = f1_2 * (crypto_int64) f6;
-  crypto_int64 f1f7_4  = f1_2 * (crypto_int64) f7_2;
-  crypto_int64 f1f8_2  = f1_2 * (crypto_int64) f8;
-  crypto_int64 f1f9_76 = f1_2 * (crypto_int64) f9_38;
-  crypto_int64 f2f2    = f2   * (crypto_int64) f2;
-  crypto_int64 f2f3_2  = f2_2 * (crypto_int64) f3;
-  crypto_int64 f2f4_2  = f2_2 * (crypto_int64) f4;
-  crypto_int64 f2f5_2  = f2_2 * (crypto_int64) f5;
-  crypto_int64 f2f6_2  = f2_2 * (crypto_int64) f6;
-  crypto_int64 f2f7_2  = f2_2 * (crypto_int64) f7;
-  crypto_int64 f2f8_38 = f2_2 * (crypto_int64) f8_19;
-  crypto_int64 f2f9_38 = f2   * (crypto_int64) f9_38;
-  crypto_int64 f3f3_2  = f3_2 * (crypto_int64) f3;
-  crypto_int64 f3f4_2  = f3_2 * (crypto_int64) f4;
-  crypto_int64 f3f5_4  = f3_2 * (crypto_int64) f5_2;
-  crypto_int64 f3f6_2  = f3_2 * (crypto_int64) f6;
-  crypto_int64 f3f7_76 = f3_2 * (crypto_int64) f7_38;
-  crypto_int64 f3f8_38 = f3_2 * (crypto_int64) f8_19;
-  crypto_int64 f3f9_76 = f3_2 * (crypto_int64) f9_38;
-  crypto_int64 f4f4    = f4   * (crypto_int64) f4;
-  crypto_int64 f4f5_2  = f4_2 * (crypto_int64) f5;
-  crypto_int64 f4f6_38 = f4_2 * (crypto_int64) f6_19;
-  crypto_int64 f4f7_38 = f4   * (crypto_int64) f7_38;
-  crypto_int64 f4f8_38 = f4_2 * (crypto_int64) f8_19;
-  crypto_int64 f4f9_38 = f4   * (crypto_int64) f9_38;
-  crypto_int64 f5f5_38 = f5   * (crypto_int64) f5_38;
-  crypto_int64 f5f6_38 = f5_2 * (crypto_int64) f6_19;
-  crypto_int64 f5f7_76 = f5_2 * (crypto_int64) f7_38;
-  crypto_int64 f5f8_38 = f5_2 * (crypto_int64) f8_19;
-  crypto_int64 f5f9_76 = f5_2 * (crypto_int64) f9_38;
-  crypto_int64 f6f6_19 = f6   * (crypto_int64) f6_19;
-  crypto_int64 f6f7_38 = f6   * (crypto_int64) f7_38;
-  crypto_int64 f6f8_38 = f6_2 * (crypto_int64) f8_19;
-  crypto_int64 f6f9_38 = f6   * (crypto_int64) f9_38;
-  crypto_int64 f7f7_38 = f7   * (crypto_int64) f7_38;
-  crypto_int64 f7f8_38 = f7_2 * (crypto_int64) f8_19;
-  crypto_int64 f7f9_76 = f7_2 * (crypto_int64) f9_38;
-  crypto_int64 f8f8_19 = f8   * (crypto_int64) f8_19;
-  crypto_int64 f8f9_38 = f8   * (crypto_int64) f9_38;
-  crypto_int64 f9f9_38 = f9   * (crypto_int64) f9_38;
-  crypto_int64 h0 = f0f0  +f1f9_76+f2f8_38+f3f7_76+f4f6_38+f5f5_38;
-  crypto_int64 h1 = f0f1_2+f2f9_38+f3f8_38+f4f7_38+f5f6_38;
-  crypto_int64 h2 = f0f2_2+f1f1_2 +f3f9_76+f4f8_38+f5f7_76+f6f6_19;
-  crypto_int64 h3 = f0f3_2+f1f2_2 +f4f9_38+f5f8_38+f6f7_38;
-  crypto_int64 h4 = f0f4_2+f1f3_4 +f2f2   +f5f9_76+f6f8_38+f7f7_38;
-  crypto_int64 h5 = f0f5_2+f1f4_2 +f2f3_2 +f6f9_38+f7f8_38;
-  crypto_int64 h6 = f0f6_2+f1f5_4 +f2f4_2 +f3f3_2 +f7f9_76+f8f8_19;
-  crypto_int64 h7 = f0f7_2+f1f6_2 +f2f5_2 +f3f4_2 +f8f9_38;
-  crypto_int64 h8 = f0f8_2+f1f7_4 +f2f6_2 +f3f5_4 +f4f4   +f9f9_38;
-  crypto_int64 h9 = f0f9_2+f1f8_2 +f2f7_2 +f3f6_2 +f4f5_2;
-  crypto_int64 carry0;
-  crypto_int64 carry1;
-  crypto_int64 carry2;
-  crypto_int64 carry3;
-  crypto_int64 carry4;
-  crypto_int64 carry5;
-  crypto_int64 carry6;
-  crypto_int64 carry7;
-  crypto_int64 carry8;
-  crypto_int64 carry9;
-
-  carry0 = (h0 + (crypto_int64) (1L << 25)) >> 26; h1 += carry0; h0 -= carry0 << 26;
-  carry4 = (h4 + (crypto_int64) (1L << 25)) >> 26; h5 += carry4; h4 -= carry4 << 26;
-
-  carry1 = (h1 + (crypto_int64) (1L << 24)) >> 25; h2 += carry1; h1 -= carry1 << 25;
-  carry5 = (h5 + (crypto_int64) (1L << 24)) >> 25; h6 += carry5; h5 -= carry5 << 25;
-
-  carry2 = (h2 + (crypto_int64) (1L << 25)) >> 26; h3 += carry2; h2 -= carry2 << 26;
-  carry6 = (h6 + (crypto_int64) (1L << 25)) >> 26; h7 += carry6; h6 -= carry6 << 26;
-
-  carry3 = (h3 + (crypto_int64) (1L << 24)) >> 25; h4 += carry3; h3 -= carry3 << 25;
-  carry7 = (h7 + (crypto_int64) (1L << 24)) >> 25; h8 += carry7; h7 -= carry7 << 25;
-
-  carry4 = (h4 + (crypto_int64) (1L << 25)) >> 26; h5 += carry4; h4 -= carry4 << 26;
-  carry8 = (h8 + (crypto_int64) (1L << 25)) >> 26; h9 += carry8; h8 -= carry8 << 26;
-
-  carry9 = (h9 + (crypto_int64) (1L << 24)) >> 25; h0 += carry9 * 19; h9 -= carry9 << 25;
-
-  carry0 = (h0 + (crypto_int64) (1L << 25)) >> 26; h1 += carry0; h0 -= carry0 << 26;
-
-  h[0] = (crypto_int32) h0;
-  h[1] = (crypto_int32) h1;
-  h[2] = (crypto_int32) h2;
-  h[3] = (crypto_int32) h3;
-  h[4] = (crypto_int32) h4;
-  h[5] = (crypto_int32) h5;
-  h[6] = (crypto_int32) h6;
-  h[7] = (crypto_int32) h7;
-  h[8] = (crypto_int32) h8;
-  h[9] = (crypto_int32) h9;
-}
-
-#endif
diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_sub_curve25519_ref10.c b/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_sub_curve25519_ref10.c
deleted file mode 100644
index bdc126b0..00000000
--- a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_sub_curve25519_ref10.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include "fe.h"
-#include "crypto_int32.h"
-
-#ifndef HAVE_TI_MODE
-
-/*
-h = f - g
-Can overlap h with f or g.
-
-Preconditions:
-   |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-   |g| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-
-Postconditions:
-   |h| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
-*/
-
-void fe_sub(fe h,const fe f,const fe g)
-{
-  crypto_int32 f0 = f[0];
-  crypto_int32 f1 = f[1];
-  crypto_int32 f2 = f[2];
-  crypto_int32 f3 = f[3];
-  crypto_int32 f4 = f[4];
-  crypto_int32 f5 = f[5];
-  crypto_int32 f6 = f[6];
-  crypto_int32 f7 = f[7];
-  crypto_int32 f8 = f[8];
-  crypto_int32 f9 = f[9];
-  crypto_int32 g0 = g[0];
-  crypto_int32 g1 = g[1];
-  crypto_int32 g2 = g[2];
-  crypto_int32 g3 = g[3];
-  crypto_int32 g4 = g[4];
-  crypto_int32 g5 = g[5];
-  crypto_int32 g6 = g[6];
-  crypto_int32 g7 = g[7];
-  crypto_int32 g8 = g[8];
-  crypto_int32 g9 = g[9];
-  crypto_int32 h0 = f0 - g0;
-  crypto_int32 h1 = f1 - g1;
-  crypto_int32 h2 = f2 - g2;
-  crypto_int32 h3 = f3 - g3;
-  crypto_int32 h4 = f4 - g4;
-  crypto_int32 h5 = f5 - g5;
-  crypto_int32 h6 = f6 - g6;
-  crypto_int32 h7 = f7 - g7;
-  crypto_int32 h8 = f8 - g8;
-  crypto_int32 h9 = f9 - g9;
-  h[0] = h0;
-  h[1] = h1;
-  h[2] = h2;
-  h[3] = h3;
-  h[4] = h4;
-  h[5] = h5;
-  h[6] = h6;
-  h[7] = h7;
-  h[8] = h8;
-  h[9] = h9;
-}
-
-#endif
diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_tobytes_curve25519_ref10.c b/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_tobytes_curve25519_ref10.c
deleted file mode 100644
index 3d84b1ef..00000000
--- a/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_tobytes_curve25519_ref10.c
+++ /dev/null
@@ -1,124 +0,0 @@
-#include "fe.h"
-#include "crypto_int32.h"
-
-#ifndef HAVE_TI_MODE
-
-/*
-Preconditions:
-  |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-
-Write p=2^255-19; q=floor(h/p).
-Basic claim: q = floor(2^(-255)(h + 19 2^(-25)h9 + 2^(-1))).
-
-Proof:
-  Have |h|<=p so |q|<=1 so |19^2 2^(-255) q|<1/4.
-  Also have |h-2^230 h9|<2^230 so |19 2^(-255)(h-2^230 h9)|<1/4.
-
-  Write y=2^(-1)-19^2 2^(-255)q-19 2^(-255)(h-2^230 h9).
-  Then 0<y<1.
-
-  Write r=h-pq.
-  Have 0<=r<=p-1=2^255-20.
-  Thus 0<=r+19(2^-255)r<r+19(2^-255)2^255<=2^255-1.
-
-  Write x=r+19(2^-255)r+y.
-  Then 0<x<2^255 so floor(2^(-255)x) = 0 so floor(q+2^(-255)x) = q.
-
-  Have q+2^(-255)x = 2^(-255)(h + 19 2^(-25) h9 + 2^(-1))
-  so floor(2^(-255)(h + 19 2^(-25) h9 + 2^(-1))) = q.
-*/
-
-void fe_tobytes(unsigned char *s,const fe h)
-{
-  crypto_int32 h0 = h[0];
-  crypto_int32 h1 = h[1];
-  crypto_int32 h2 = h[2];
-  crypto_int32 h3 = h[3];
-  crypto_int32 h4 = h[4];
-  crypto_int32 h5 = h[5];
-  crypto_int32 h6 = h[6];
-  crypto_int32 h7 = h[7];
-  crypto_int32 h8 = h[8];
-  crypto_int32 h9 = h[9];
-  crypto_int32 q;
-  crypto_int32 carry0;
-  crypto_int32 carry1;
-  crypto_int32 carry2;
-  crypto_int32 carry3;
-  crypto_int32 carry4;
-  crypto_int32 carry5;
-  crypto_int32 carry6;
-  crypto_int32 carry7;
-  crypto_int32 carry8;
-  crypto_int32 carry9;
-
-  q = (19 * h9 + (((crypto_int32) 1) << 24)) >> 25;
-  q = (h0 + q) >> 26;
-  q = (h1 + q) >> 25;
-  q = (h2 + q) >> 26;
-  q = (h3 + q) >> 25;
-  q = (h4 + q) >> 26;
-  q = (h5 + q) >> 25;
-  q = (h6 + q) >> 26;
-  q = (h7 + q) >> 25;
-  q = (h8 + q) >> 26;
-  q = (h9 + q) >> 25;
-
-  /* Goal: Output h-(2^255-19)q, which is between 0 and 2^255-20. */
-  h0 += 19 * q;
-  /* Goal: Output h-2^255 q, which is between 0 and 2^255-20. */
-
-  carry0 = h0 >> 26; h1 += carry0; h0 -= carry0 << 26;
-  carry1 = h1 >> 25; h2 += carry1; h1 -= carry1 << 25;
-  carry2 = h2 >> 26; h3 += carry2; h2 -= carry2 << 26;
-  carry3 = h3 >> 25; h4 += carry3; h3 -= carry3 << 25;
-  carry4 = h4 >> 26; h5 += carry4; h4 -= carry4 << 26;
-  carry5 = h5 >> 25; h6 += carry5; h5 -= carry5 << 25;
-  carry6 = h6 >> 26; h7 += carry6; h6 -= carry6 << 26;
-  carry7 = h7 >> 25; h8 += carry7; h7 -= carry7 << 25;
-  carry8 = h8 >> 26; h9 += carry8; h8 -= carry8 << 26;
-  carry9 = h9 >> 25;               h9 -= carry9 << 25;
-                  /* h10 = carry9 */
-
-  /*
-  Goal: Output h0+...+2^255 h10-2^255 q, which is between 0 and 2^255-20.
-  Have h0+...+2^230 h9 between 0 and 2^255-1;
-  evidently 2^255 h10-2^255 q = 0.
-  Goal: Output h0+...+2^230 h9.
-  */
-
-  s[0] = h0 >> 0;
-  s[1] = h0 >> 8;
-  s[2] = h0 >> 16;
-  s[3] = (h0 >> 24) | (h1 << 2);
-  s[4] = h1 >> 6;
-  s[5] = h1 >> 14;
-  s[6] = (h1 >> 22) | (h2 << 3);
-  s[7] = h2 >> 5;
-  s[8] = h2 >> 13;
-  s[9] = (h2 >> 21) | (h3 << 5);
-  s[10] = h3 >> 3;
-  s[11] = h3 >> 11;
-  s[12] = (h3 >> 19) | (h4 << 6);
-  s[13] = h4 >> 2;
-  s[14] = h4 >> 10;
-  s[15] = h4 >> 18;
-  s[16] = h5 >> 0;
-  s[17] = h5 >> 8;
-  s[18] = h5 >> 16;
-  s[19] = (h5 >> 24) | (h6 << 1);
-  s[20] = h6 >> 7;
-  s[21] = h6 >> 15;
-  s[22] = (h6 >> 23) | (h7 << 3);
-  s[23] = h7 >> 5;
-  s[24] = h7 >> 13;
-  s[25] = (h7 >> 21) | (h8 << 4);
-  s[26] = h8 >> 4;
-  s[27] = h8 >> 12;
-  s[28] = (h8 >> 20) | (h9 << 6);
-  s[29] = h9 >> 2;
-  s[30] = h9 >> 10;
-  s[31] = h9 >> 18;
-}
-
-#endif
diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c b/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c
new file mode 100644
index 00000000..c6298533
--- /dev/null
+++ b/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c
@@ -0,0 +1,234 @@
+
+#include <stddef.h>
+
+#ifndef HAVE_TI_MODE
+
+#include "crypto_int32.h"
+#include "crypto_int64.h"
+#include "utils.h"
+#include "x25519_ref10.h"
+#include "../scalarmult_curve25519.h"
+#include "../../../crypto_core/curve25519/ref10/curve25519_ref10.h"
+
+static const unsigned char basepoint[32] = {9};
+
+/*
+Replace (f,g) with (g,f) if b == 1;
+replace (f,g) with (f,g) if b == 0.
+
+Preconditions: b in {0,1}.
+*/
+
+static void
+fe_cswap(fe f,fe g,unsigned int b)
+{
+  crypto_int32 f0 = f[0];
+  crypto_int32 f1 = f[1];
+  crypto_int32 f2 = f[2];
+  crypto_int32 f3 = f[3];
+  crypto_int32 f4 = f[4];
+  crypto_int32 f5 = f[5];
+  crypto_int32 f6 = f[6];
+  crypto_int32 f7 = f[7];
+  crypto_int32 f8 = f[8];
+  crypto_int32 f9 = f[9];
+  crypto_int32 g0 = g[0];
+  crypto_int32 g1 = g[1];
+  crypto_int32 g2 = g[2];
+  crypto_int32 g3 = g[3];
+  crypto_int32 g4 = g[4];
+  crypto_int32 g5 = g[5];
+  crypto_int32 g6 = g[6];
+  crypto_int32 g7 = g[7];
+  crypto_int32 g8 = g[8];
+  crypto_int32 g9 = g[9];
+  crypto_int32 x0 = f0 ^ g0;
+  crypto_int32 x1 = f1 ^ g1;
+  crypto_int32 x2 = f2 ^ g2;
+  crypto_int32 x3 = f3 ^ g3;
+  crypto_int32 x4 = f4 ^ g4;
+  crypto_int32 x5 = f5 ^ g5;
+  crypto_int32 x6 = f6 ^ g6;
+  crypto_int32 x7 = f7 ^ g7;
+  crypto_int32 x8 = f8 ^ g8;
+  crypto_int32 x9 = f9 ^ g9;
+  b = (unsigned int) (- (int) b);
+  x0 &= b;
+  x1 &= b;
+  x2 &= b;
+  x3 &= b;
+  x4 &= b;
+  x5 &= b;
+  x6 &= b;
+  x7 &= b;
+  x8 &= b;
+  x9 &= b;
+  f[0] = f0 ^ x0;
+  f[1] = f1 ^ x1;
+  f[2] = f2 ^ x2;
+  f[3] = f3 ^ x3;
+  f[4] = f4 ^ x4;
+  f[5] = f5 ^ x5;
+  f[6] = f6 ^ x6;
+  f[7] = f7 ^ x7;
+  f[8] = f8 ^ x8;
+  f[9] = f9 ^ x9;
+  g[0] = g0 ^ x0;
+  g[1] = g1 ^ x1;
+  g[2] = g2 ^ x2;
+  g[3] = g3 ^ x3;
+  g[4] = g4 ^ x4;
+  g[5] = g5 ^ x5;
+  g[6] = g6 ^ x6;
+  g[7] = g7 ^ x7;
+  g[8] = g8 ^ x8;
+  g[9] = g9 ^ x9;
+}
+
+/*
+h = f * 121666
+Can overlap h with f.
+
+Preconditions:
+   |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
+
+Postconditions:
+   |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+*/
+
+static void
+fe_mul121666(fe h,const fe f)
+{
+  crypto_int32 f0 = f[0];
+  crypto_int32 f1 = f[1];
+  crypto_int32 f2 = f[2];
+  crypto_int32 f3 = f[3];
+  crypto_int32 f4 = f[4];
+  crypto_int32 f5 = f[5];
+  crypto_int32 f6 = f[6];
+  crypto_int32 f7 = f[7];
+  crypto_int32 f8 = f[8];
+  crypto_int32 f9 = f[9];
+  crypto_int64 h0 = f0 * (crypto_int64) 121666;
+  crypto_int64 h1 = f1 * (crypto_int64) 121666;
+  crypto_int64 h2 = f2 * (crypto_int64) 121666;
+  crypto_int64 h3 = f3 * (crypto_int64) 121666;
+  crypto_int64 h4 = f4 * (crypto_int64) 121666;
+  crypto_int64 h5 = f5 * (crypto_int64) 121666;
+  crypto_int64 h6 = f6 * (crypto_int64) 121666;
+  crypto_int64 h7 = f7 * (crypto_int64) 121666;
+  crypto_int64 h8 = f8 * (crypto_int64) 121666;
+  crypto_int64 h9 = f9 * (crypto_int64) 121666;
+  crypto_int64 carry0;
+  crypto_int64 carry1;
+  crypto_int64 carry2;
+  crypto_int64 carry3;
+  crypto_int64 carry4;
+  crypto_int64 carry5;
+  crypto_int64 carry6;
+  crypto_int64 carry7;
+  crypto_int64 carry8;
+  crypto_int64 carry9;
+
+  carry9 = (h9 + (crypto_int64) (1<<24)) >> 25; h0 += carry9 * 19; h9 -= carry9 << 25;
+  carry1 = (h1 + (crypto_int64) (1<<24)) >> 25; h2 += carry1; h1 -= carry1 << 25;
+  carry3 = (h3 + (crypto_int64) (1<<24)) >> 25; h4 += carry3; h3 -= carry3 << 25;
+  carry5 = (h5 + (crypto_int64) (1<<24)) >> 25; h6 += carry5; h5 -= carry5 << 25;
+  carry7 = (h7 + (crypto_int64) (1<<24)) >> 25; h8 += carry7; h7 -= carry7 << 25;
+
+  carry0 = (h0 + (crypto_int64) (1<<25)) >> 26; h1 += carry0; h0 -= carry0 << 26;
+  carry2 = (h2 + (crypto_int64) (1<<25)) >> 26; h3 += carry2; h2 -= carry2 << 26;
+  carry4 = (h4 + (crypto_int64) (1<<25)) >> 26; h5 += carry4; h4 -= carry4 << 26;
+  carry6 = (h6 + (crypto_int64) (1<<25)) >> 26; h7 += carry6; h6 -= carry6 << 26;
+  carry8 = (h8 + (crypto_int64) (1<<25)) >> 26; h9 += carry8; h8 -= carry8 << 26;
+
+  h[0] = h0;
+  h[1] = h1;
+  h[2] = h2;
+  h[3] = h3;
+  h[4] = h4;
+  h[5] = h5;
+  h[6] = h6;
+  h[7] = h7;
+  h[8] = h8;
+  h[9] = h9;
+}
+
+static int
+crypto_scalarmult_curve25519_ref10(unsigned char *q,
+                                   const unsigned char *n,
+                                   const unsigned char *p)
+{
+  unsigned char e[32];
+  unsigned int i;
+  fe x1;
+  fe x2;
+  fe z2;
+  fe x3;
+  fe z3;
+  fe tmp0;
+  fe tmp1;
+  int pos;
+  unsigned int swap;
+  unsigned int b;
+
+  for (i = 0;i < 32;++i) e[i] = n[i];
+  e[0] &= 248;
+  e[31] &= 127;
+  e[31] |= 64;
+  fe_frombytes(x1,p);
+  fe_1(x2);
+  fe_0(z2);
+  fe_copy(x3,x1);
+  fe_1(z3);
+
+  swap = 0;
+  for (pos = 254;pos >= 0;--pos) {
+    b = e[pos / 8] >> (pos & 7);
+    b &= 1;
+    swap ^= b;
+    fe_cswap(x2,x3,swap);
+    fe_cswap(z2,z3,swap);
+    swap = b;
+    fe_sub(tmp0,x3,z3);
+    fe_sub(tmp1,x2,z2);
+    fe_add(x2,x2,z2);
+    fe_add(z2,x3,z3);
+    fe_mul(z3,tmp0,x2);
+    fe_mul(z2,z2,tmp1);
+    fe_sq(tmp0,tmp1);
+    fe_sq(tmp1,x2);
+    fe_add(x3,z3,z2);
+    fe_sub(z2,z3,z2);
+    fe_mul(x2,tmp1,tmp0);
+    fe_sub(tmp1,tmp1,tmp0);
+    fe_sq(z2,z2);
+    fe_mul121666(z3,tmp1);
+    fe_sq(x3,x3);
+    fe_add(tmp0,tmp0,z3);
+    fe_mul(z3,x1,z2);
+    fe_mul(z2,tmp1,tmp0);
+  }
+  fe_cswap(x2,x3,swap);
+  fe_cswap(z2,z3,swap);
+
+  fe_invert(z2,z2);
+  fe_mul(x2,x2,z2);
+  fe_tobytes(q,x2);
+  return 0;
+}
+
+static int
+crypto_scalarmult_curve25519_ref10_base(unsigned char *q,
+                                        const unsigned char *n)
+{
+  return crypto_scalarmult_curve25519_ref10(q,n,basepoint);
+}
+
+struct crypto_scalarmult_curve25519_implementation
+crypto_scalarmult_curve25519_ref10_implementation = {
+        SODIUM_C99(.mult = ) crypto_scalarmult_curve25519_ref10,
+        SODIUM_C99(.mult_base = ) crypto_scalarmult_curve25519_ref10_base
+};
+
+#endif
diff --git a/src/libsodium/crypto_scalarmult/curve25519/ref10/curve25519_ref10.h b/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.h
similarity index 100%
rename from src/libsodium/crypto_scalarmult/curve25519/ref10/curve25519_ref10.h
rename to src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.h
diff --git a/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.c b/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.c
index e9a44a91..72968ffe 100644
--- a/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.c
+++ b/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.c
@@ -11,7 +11,7 @@
 static const crypto_scalarmult_curve25519_implementation *implementation =
     &crypto_scalarmult_curve25519_donna_c64_implementation;
 #else
-# include "ref10/curve25519_ref10.h"
+# include "ref10/x25519_ref10.h"
 static const crypto_scalarmult_curve25519_implementation *implementation =
     &crypto_scalarmult_curve25519_ref10_implementation;
 #endif