rbnacl-libsodium 1.0.7 → 1.0.8

data/vendor/libsodium/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libsodium 1.0.7.
+# Generated by GNU Autoconf 2.69 for libsodium 1.0.8.
 #
 # Report bugs to <https://github.com/jedisct1/libsodium/issues>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libsodium'
 PACKAGE_TARNAME='libsodium'
-PACKAGE_VERSION='1.0.7'
-PACKAGE_STRING='libsodium 1.0.7'
+PACKAGE_VERSION='1.0.8'
+PACKAGE_STRING='libsodium 1.0.8'
 PACKAGE_BUGREPORT='https://github.com/jedisct1/libsodium/issues'
 PACKAGE_URL='https://github.com/jedisct1/libsodium'
 
@@ -1372,7 +1372,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libsodium 1.0.7 to adapt to many kinds of systems.
+\`configure' configures libsodium 1.0.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1442,7 +1442,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libsodium 1.0.7:";;
+     short | recursive ) echo "Configuration of libsodium 1.0.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1577,7 +1577,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libsodium configure 1.0.7
+libsodium configure 1.0.8
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1946,7 +1946,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libsodium $as_me 1.0.7, which was
+It was created by libsodium $as_me 1.0.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2882,7 +2882,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libsodium'
- VERSION='1.0.7'
+ VERSION='1.0.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3178,9 +3178,9 @@ ISODATE=`date +%Y-%m-%d`
 
 
 SODIUM_LIBRARY_VERSION_MAJOR=9
-SODIUM_LIBRARY_VERSION_MINOR=0
+SODIUM_LIBRARY_VERSION_MINOR=1
 DLL_VERSION=8
-SODIUM_LIBRARY_VERSION=18:0:0
+SODIUM_LIBRARY_VERSION=18:1:0
 #                       | | |
 #                +------+ | +---+
 #                |        |     |
@@ -3363,8 +3363,8 @@ if test "${enable_opt+set}" = set; then :
   enableval=$enable_opt;
   if test "x$enableval" = "xyes"; then :
 
-    CFLAGS="$CFLAGS -flto -march=native"
-    LDFLAGS="$LDFLAGS -flto -march=native"
+    CFLAGS="$CFLAGS -march=native -save-temps"
+    LDFLAGS="$LDFLAGS -march=native"
 fi
 
 fi
@@ -16953,7 +16953,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libsodium $as_me 1.0.7, which was
+This file was extended by libsodium $as_me 1.0.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17011,7 +17011,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libsodium config.status 1.0.7
+libsodium config.status 1.0.8
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

data/vendor/libsodium/configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.65])
-AC_INIT([libsodium],[1.0.7],
+AC_INIT([libsodium],[1.0.8],
   [https://github.com/jedisct1/libsodium/issues],
   [libsodium],
   [https://github.com/jedisct1/libsodium])
@@ -17,9 +17,9 @@ ISODATE=`date +%Y-%m-%d`
 AC_SUBST(ISODATE)
 
 SODIUM_LIBRARY_VERSION_MAJOR=9
-SODIUM_LIBRARY_VERSION_MINOR=0
+SODIUM_LIBRARY_VERSION_MINOR=1
 DLL_VERSION=8
-SODIUM_LIBRARY_VERSION=18:0:0
+SODIUM_LIBRARY_VERSION=18:1:0
 #                       | | |
 #                +------+ | +---+
 #                |        |     |
@@ -139,8 +139,8 @@ AC_ARG_ENABLE(opt,
 [AS_HELP_STRING(--enable-opt,Optimize for the native CPU - The resulting library will be faster but not portable)],
 [
   AS_IF([test "x$enableval" = "xyes"], [
-    CFLAGS="$CFLAGS -flto -march=native"
-    LDFLAGS="$LDFLAGS -flto -march=native"])
+    CFLAGS="$CFLAGS -march=native -save-temps"
+    LDFLAGS="$LDFLAGS -march=native"])
 ])
 
 AC_SUBST([MAINT])

data/vendor/libsodium/dist-build/msys2-win32.sh

@@ -3,8 +3,9 @@
 export CFLAGS="-O3 -fomit-frame-pointer -m32 -march=pentium2 -mtune=nocona"
 export PREFIX="$(pwd)/libsodium-win32"
 
-./configure --enable-minimal \
-            --prefix="$PREFIX" --exec-prefix="$PREFIX" \
+make distclean > /dev/null
+
+./configure --prefix="$PREFIX" --exec-prefix="$PREFIX" \
             --host=i686-w64-mingw32 && \
 make && \
 make check && \

data/vendor/libsodium/dist-build/msys2-win64.sh

@@ -3,8 +3,9 @@
 export CFLAGS="-O3 -fomit-frame-pointer -m64 -mtune=nocona"
 export PREFIX="$(pwd)/libsodium-win64"
 
-./configure --enable-minimal \
-            --prefix="$PREFIX" --exec-prefix="$PREFIX" \
+make distclean > /dev/null
+
+./configure --prefix="$PREFIX" --exec-prefix="$PREFIX" \
             --host=x86_64-w64-mingw32 && \
 make && \
 make check && \

data/vendor/libsodium/examples/sign.c

@@ -45,6 +45,8 @@ sign(void)
     printf("Signing message with %s...\n", crypto_sign_primitive());
     crypto_sign(message_signed, &message_signed_len, message, message_len, sk);
 
+    sodium_memzero(sk, sizeof sk); /* wipe sensitive data */
+
     printf("Signed message:");
     print_hex(message_signed, message_signed_len);
     printf("A %u bytes signature was prepended to the message\n",
@@ -64,8 +66,6 @@ sign(void)
     if (ret == 0)
         printf("Message: %s\n", message);
 
-    sodium_memzero(sk, sizeof sk); /* wipe sensitive data */
-
     return ret;
 }
 

data/vendor/libsodium/examples/utils.h

@@ -56,7 +56,9 @@ prompt_input(const char *prompt, char *input, const size_t max_input_len,
         printf("\nEnter %s (%zu bytes) > ", prompt, max_input_len);
     }
     fflush(stdout);
-    fgets(input_tmp, sizeof input_tmp, stdin);
+    if (fgets(input_tmp, sizeof input_tmp, stdin) == NULL) {
+        input_tmp[0] = '\0';
+    }
     actual_input_len = strlen(input_tmp);
 
     /* trim \n */

data/vendor/libsodium/libsodium.vcxproj

@@ -315,10 +315,14 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="src\libsodium\crypto_core\curve25519\ref10\base.h" />
+    <ClInclude Include="src\libsodium\crypto_core\curve25519\ref10\base2.h" />
+    <ClInclude Include="src\libsodium\crypto_core\curve25519\ref10\curve25519_ref10.h" />
     <ClInclude Include="src\libsodium\crypto_generichash\blake2\ref\blake2b-load-sse2.h" />
     <ClInclude Include="src\libsodium\crypto_generichash\blake2\ref\blake2b-load-sse41.h" />
     <ClInclude Include="src\libsodium\crypto_generichash\blake2\ref\blake2b-round.h" />
     <ClInclude Include="src\libsodium\crypto_onetimeauth\poly1305\onetimeauth_poly1305.h" />
+    <ClInclude Include="src\libsodium\crypto_scalarmult\curve25519\ref10\x25519_ref10.h" />
     <ClInclude Include="src\libsodium\include\sodium.h" />
     <ClInclude Include="src\libsodium\include\sodium\core.h" />
     <ClInclude Include="src\libsodium\include\sodium\crypto_aead_aes256gcm.h" />
@@ -395,6 +399,7 @@
     <ClCompile Include="src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\before_curve25519xsalsa20poly1305.c" />
     <ClCompile Include="src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\box_curve25519xsalsa20poly1305.c" />
     <ClCompile Include="src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\keypair_curve25519xsalsa20poly1305.c" />
+    <ClCompile Include="src\libsodium\crypto_core\curve25519\ref10\curve25519_ref10.c" />
     <ClCompile Include="src\libsodium\crypto_core\hsalsa20\core_hsalsa20_api.c" />
     <ClCompile Include="src\libsodium\crypto_core\hsalsa20\ref2\core_hsalsa20.c" />
     <ClCompile Include="src\libsodium\crypto_core\salsa2012\core_salsa2012_api.c" />
@@ -426,19 +431,7 @@
     <ClCompile Include="src\libsodium\crypto_pwhash\scryptsalsa208sha256\sse\pwhash_scryptsalsa208sha256_sse.c" />
     <ClCompile Include="src\libsodium\crypto_scalarmult\crypto_scalarmult.c" />
     <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\donna_c64\curve25519_donna_c64.c" />
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\curve25519_ref10.c" />
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_0_curve25519_ref10.c" />
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_1_curve25519_ref10.c" />
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_add_curve25519_ref10.c" />
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_copy_curve25519_ref10.c" />
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_cswap_curve25519_ref10.c" />
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_frombytes_curve25519_ref10.c" />
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_invert_curve25519_ref10.c" />
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_mul121666_curve25519_ref10.c" />
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_mul_curve25519_ref10.c" />
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_sq_curve25519_ref10.c" />
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_sub_curve25519_ref10.c" />
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_tobytes_curve25519_ref10.c" />
+    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\x25519_ref10.c" />
     <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\sandy2x\curve25519_sandy2x.c" />
     <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\sandy2x\fe51_invert.c" />
     <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\sandy2x\fe_frombytes_sandy2x.c" />
@@ -451,45 +444,9 @@
     <ClCompile Include="src\libsodium\crypto_shorthash\siphash24\ref\shorthash_siphash24.c" />
     <ClCompile Include="src\libsodium\crypto_shorthash\siphash24\shorthash_siphash24_api.c" />
     <ClCompile Include="src\libsodium\crypto_sign\crypto_sign.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_0.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_1.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_add.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_cmov.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_copy.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_frombytes.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_invert.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_isnegative.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_isnonzero.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_mul.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_neg.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_pow22523.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_sq.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_sq2.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_sub.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_tobytes.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_add.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_double_scalarmult.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_frombytes.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_madd.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_msub.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_p1p1_to_p2.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_p1p1_to_p3.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_p2_0.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_p2_dbl.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_p3_0.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_p3_dbl.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_p3_tobytes.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_p3_to_cached.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_p3_to_p2.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_precomp_0.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_scalarmult_base.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_sub.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_tobytes.c" />
     <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\keypair.c" />
     <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\obsolete.c" />
     <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\open.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\sc_muladd.c" />
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\sc_reduce.c" />
     <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\sign.c" />
     <ClCompile Include="src\libsodium\crypto_sign\ed25519\sign_ed25519_api.c" />
     <ClCompile Include="src\libsodium\crypto_stream\aes128ctr\portable\afternm_aes128ctr.c" />
@@ -529,10 +486,7 @@
     <ClCompile Include="src\libsodium\sodium\utils.c" />
     <ClCompile Include="src\libsodium\sodium\version.c" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="src\libsodium\crypto_scalarmult\curve25519\sandy2x\sandy2x.S" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

data/vendor/libsodium/libsodium.vcxproj.filters

@@ -189,6 +189,18 @@
     <ClInclude Include="src\libsodium\crypto_onetimeauth\poly1305\onetimeauth_poly1305.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\libsodium\crypto_core\curve25519\ref10\base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\libsodium\crypto_core\curve25519\ref10\base2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\libsodium\crypto_core\curve25519\ref10\curve25519_ref10.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\libsodium\crypto_scalarmult\curve25519\ref10\x25519_ref10.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\libsodium\crypto_core\hsalsa20\ref2\core_hsalsa20.c">
@@ -314,120 +326,12 @@
     <ClCompile Include="src\libsodium\crypto_sign\crypto_sign.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_0.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_1.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_add.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_cmov.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_copy.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_frombytes.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_invert.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_isnegative.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_isnonzero.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_mul.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_neg.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_pow22523.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_sq.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_sq2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_sub.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\fe_tobytes.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_add.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_double_scalarmult.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_frombytes.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_madd.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_msub.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_p1p1_to_p2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_p1p1_to_p3.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_p2_0.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_p2_dbl.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_p3_0.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_p3_dbl.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_p3_to_cached.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_p3_to_p2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_p3_tobytes.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_precomp_0.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_scalarmult_base.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_sub.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\ge_tobytes.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\keypair.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\open.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\sc_muladd.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\sc_reduce.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\sign.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -572,42 +476,6 @@
     <ClCompile Include="src\libsodium\crypto_stream\chacha20\ref\stream_chacha20_ref.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_0_curve25519_ref10.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_1_curve25519_ref10.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_add_curve25519_ref10.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_copy_curve25519_ref10.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_cswap_curve25519_ref10.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_frombytes_curve25519_ref10.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_invert_curve25519_ref10.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_mul_curve25519_ref10.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_mul121666_curve25519_ref10.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_sq_curve25519_ref10.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_sub_curve25519_ref10.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\fe_tobytes_curve25519_ref10.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\before_curve25519xsalsa20poly1305.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -632,9 +500,6 @@
     <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\donna_c64\curve25519_donna_c64.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\curve25519_ref10.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\sandy2x\curve25519_sandy2x.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -650,10 +515,11 @@
     <ClCompile Include="src\libsodium\crypto_sign\ed25519\ref10\obsolete.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="src\libsodium\crypto_scalarmult\curve25519\sandy2x\sandy2x.S">
+    <ClCompile Include="src\libsodium\crypto_core\curve25519\ref10\curve25519_ref10.c">
       <Filter>Source Files</Filter>
-    </None>
+    </ClCompile>
+    <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref10\x25519_ref10.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
-</Project>
+</Project>