rbnacl-libsodium 0.4.5 → 0.5.0

data/vendor/libsodium/configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.65])
-AC_INIT([libsodium],[0.4.5],
+AC_INIT([libsodium],[0.5.0],
   [https://github.com/jedisct1/libsodium/issues],
   [libsodium],
   [https://github.com/jedisct1/libsodium])
@@ -15,21 +15,21 @@ AC_SUBST(VERSION)
 ISODATE=`date +%Y-%m-%d`
 AC_SUBST(ISODATE)
 
-SODIUM_LIBRARY_VERSION_MAJOR=4
-SODIUM_LIBRARY_VERSION_MINOR=4
-DLL_VERSION=4
-SODIUM_LIBRARY_VERSION=9:0:5
-#                      | | |
-#               +------+ | +---+
-#               |        |     |
-#            current:revision:age
-#               |        |     |
-#               |        |     +- increment if interfaces have been added
-#               |        |        set to zero if interfaces have been removed
-#               |        |        or changed
-#               |        +- increment if source code has changed
-#               |           set to zero if current is incremented
-#               +- increment if interfaces have been added, removed or changed
+SODIUM_LIBRARY_VERSION_MAJOR=5
+SODIUM_LIBRARY_VERSION_MINOR=0
+DLL_VERSION=5
+SODIUM_LIBRARY_VERSION=10:0:0
+#                       | | |
+#                +------+ | +---+
+#                |        |     |
+#             current:revision:age
+#                |        |     |
+#                |        |     +- increment if interfaces have been added
+#                |        |        set to zero if interfaces have been removed
+#                |        |        or changed
+#                |        +- increment if source code has changed
+#                |           set to zero if current is incremented
+#                +- increment if interfaces have been added, removed or changed
 AC_SUBST(SODIUM_LIBRARY_VERSION_MAJOR)
 AC_SUBST(SODIUM_LIBRARY_VERSION_MINOR)
 AC_SUBST(SODIUM_LIBRARY_VERSION)
@@ -119,7 +119,7 @@ AC_SUBST([MAINT])
 
 dnl Checks
 
-PKG_PROG_PKG_CONFIG([0.25])
+PKG_PROG_PKG_CONFIG([0.23])
 AM_CONDITIONAL([HAVE_PKG_CONFIG], [test "x$PKG_CONFIG" != "x"])
 AC_SUBST(HAVE_PKG_CONFIG)
 
@@ -151,7 +151,16 @@ AX_CHECK_COMPILE_FLAG([-fwrapv], [CFLAGS="$CFLAGS -fwrapv"])
 AX_CHECK_COMPILE_FLAG([-fno-strict-aliasing], [CFLAGS="$CFLAGS -fno-strict-aliasing"])
 AX_CHECK_COMPILE_FLAG([-fno-strict-overflow], [CFLAGS="$CFLAGS -fno-strict-overflow"])
 
-LIBTOOL_EXTRA_FLAGS="-version-info $SODIUM_LIBRARY_VERSION"
+LIBTOOL_OLD_FLAGS="$LIBTOOL_EXTRA_FLAGS"
+LIBTOOL_EXTRA_FLAGS="$LIBTOOL_EXTRA_FLAGS -version-info $SODIUM_LIBRARY_VERSION"
+AC_ARG_ENABLE(soname-versions,
+  [AC_HELP_STRING([--enable-soname-versions], [enable soname versions (must be disabled for android) (default: enabled)])],
+    [
+	AS_IF([test "x$enableval" = "xno"], [
+          LIBTOOL_EXTRA_FLAGS="$LIBTOOL_OLD_FLAGS -avoid-version"
+        ])
+    ]
+)
 
 AS_CASE([$host_os],
   [cygwin* | mingw* | pw32* | cegcc*], [
@@ -232,47 +241,40 @@ AC_ARG_VAR([AR], [path to the ar utility])
 AC_CHECK_TOOL([AR], [ar], [ar])
 
 dnl Checks for headers
-AC_CHECK_HEADERS([emmintrin.h], [], [], [
-#pragma GCC target("sse2")
-])
 
-AC_CHECK_HEADERS([tmmintrin.h], [], [], [
-#pragma GCC target("ssse3")
-])
+AS_IF([test "x$EMSCRIPTEN" = "x"],[
 
-AC_CHECK_HEADERS([smmintrin.h], [], [], [
-#pragma GCC target("sse4.1")
-])
-
-AC_CHECK_HEADERS([immintrin.h], [], [], [
-#pragma GCC target("avx")
-])
-
-AC_CHECK_HEADERS([avxintrin.h], [], [], [
-#pragma GCC target("avx")
-])
+  AC_MSG_CHECKING(for MMX instructions set)
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#pragma GCC target("mmx")
+#include <mmintrin.h>
+]], [[ __m64 x = _mm_setzero_si64(); ]])],
+    [AC_MSG_RESULT(yes)
+     AC_DEFINE([HAVE_MMINTRIN_H], [1], [mmx is available])],
+    [AC_MSG_RESULT(no)])
+
+  AC_MSG_CHECKING(for SSE2 instructions set)
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#pragma GCC target("sse2")
+#include <emmintrin.h>
+]], [[ __m128d x = _mm_setzero_pd(); ]])],
+    [AC_MSG_RESULT(yes)
+     AC_DEFINE([HAVE_EMMINTRIN_H], [1], [sse2 is available])],
+    [AC_MSG_RESULT(no)])
 
-AC_CHECK_HEADERS([x86intrin.h], [], [], [
-#pragma GCC target("xop")
-])
+  AC_MSG_CHECKING(for SSE3 instructions set)
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#pragma GCC target("sse3")
+#include <pmmintrin.h>
+]], [[ __m128 x = _mm_addsub_ps(_mm_cvtpd_ps(_mm_setzero_pd()),
+                                _mm_cvtpd_ps(_mm_setzero_pd())); ]])],
+    [AC_MSG_RESULT(yes)
+     AC_DEFINE([HAVE_PMMINTRIN_H], [1], [sse3 is available])],
+    [AC_MSG_RESULT(no)])
 
-AC_CHECK_HEADERS([wmmintrin.h], [], [], [
-#pragma GCC target("aes")
 ])
 
-AC_MSG_CHECKING(for access to floating-point rounding mode)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-  #include <fenv.h>
-  #pragma STDC FENV_ACCESS ON
-]], [[
-  const int previous_rounding_mode = fegetround();
-  fesetround(FE_TONEAREST);
-  fesetround(previous_rounding_mode);
-]])],
-[AC_MSG_RESULT(yes)
- AC_DEFINE([HAVE_FENV_H], [1], [floating-point rounding mode is accessible])
-],
-[AC_MSG_RESULT(no)])
+AC_CHECK_HEADERS([sys/mman.h])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 
@@ -281,7 +283,7 @@ AC_C_BIGENDIAN(
   AC_DEFINE(NATIVE_BIG_ENDIAN, 1, [machine is bigendian]),
   AC_DEFINE(NATIVE_LITTLE_ENDIAN, 1, [machine is littleendian]),
   AC_MSG_ERROR([unknown endianess]),
-  AC_MSG_WARN([universal endianess])
+  AC_MSG_ERROR([universal endianess is not supported - compile separately and use lipo(1)])
 )
 
 AC_MSG_CHECKING(whether __STDC_LIMIT_MACROS is required)
@@ -344,18 +346,21 @@ void fcontract(uint128_t *t) {
 AM_CONDITIONAL([HAVE_TI_MODE], [test $HAVE_TI_MODE_V = 1])
 AC_SUBST(HAVE_TI_MODE_V)
 
-AC_MSG_CHECKING(for cpuid instruction)
 HAVE_CPUID_V=0
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[
-__asm__("movl %ebx,%esi\n"
-        "cpuid\n"
-        "movl %esi,%ebx");
-]])],
-[AC_MSG_RESULT(yes)
- AC_DEFINE([HAVE_CPUID], [1], [cpuid instruction is available])
- HAVE_CPUID_V=1],
-[AC_MSG_RESULT(no)])
-AM_CONDITIONAL([HAVE_CPUID], [test $HAVE_CPUID_V = 1])
+AS_IF([test "$enable_asm" != "no"],[
+  AC_MSG_CHECKING(for cpuid instruction)
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[
+unsigned int cpu_info[4];
+__asm__ __volatile__ ("xchgl %%ebx, %k1; cpuid; xchgl %%ebx, %k1" :
+                      "=a" (cpu_info[0]), "=&r" (cpu_info[1]),
+                      "=c" (cpu_info[2]), "=d" (cpu_info[3]) :
+                      "0" (0U), "2" (0U));
+  ]])],
+  [AC_MSG_RESULT(yes)
+   AC_DEFINE([HAVE_CPUID], [1], [cpuid instruction is available])
+   HAVE_CPUID_V=1],
+  [AC_MSG_RESULT(no)])
+  ])
 AC_SUBST(HAVE_CPUID_V)
 
 AS_CASE([$host_cpu],
@@ -366,12 +371,27 @@ AS_CASE([$host_cpu],
      AC_DEFINE([CPU_ALIGNED_ACCESS_REQUIRED], [1], [data alignment is required])]
 )
 
+AC_MSG_CHECKING(for memset_s)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <string.h>
+]], [[
+char dummy[42];
+(void) memset_s(dummy, (rsize_t) sizeof dummy, 0, (rsize_t) sizeof dummy);
+]])],
+[AC_MSG_RESULT(yes)
+ AC_DEFINE([HAVE_MEMSET_S], [1], [memset_s is available])],
+[AC_MSG_RESULT(no)])
+
 dnl Checks for functions and headers
 
 AC_CHECK_FUNC(clock_gettime, , [AC_CHECK_LIB(rt, clock_gettime)])
 AC_CHECK_FUNC(fegetenv, , [AC_CHECK_LIB(m, fegetenv)])
 
-AC_CHECK_FUNCS([SecureZeroMemory arc4random arc4random_buf])
+AS_IF([test "x$EMSCRIPTEN" = "x"],[
+  AC_CHECK_FUNCS([arc4random arc4random_buf])
+])
+AC_CHECK_FUNCS([mlock VirtualLock])
+AC_CHECK_FUNCS([SecureZeroMemory explicit_bzero posix_memalign])
 
 AC_SUBST([LIBTOOL_EXTRA_FLAGS])
 
@@ -392,13 +412,12 @@ AS_IF([test "x$PKG_CONFIG" != "x"], [
   AC_CONFIG_FILES([libsodium.pc])
 ])
 AC_CONFIG_FILES([Makefile
+                 dist-build/Makefile
                  msvc-scripts/Makefile
                  src/Makefile
                  src/libsodium/Makefile
                  src/libsodium/include/Makefile
                  src/libsodium/include/sodium/version.h
-                 src/libsodium/include/sodium/crypto_scalarmult_curve25519.h
-                 src/libsodium/include/sodium/crypto_stream_salsa20.h
                  test/default/Makefile
                  test/Makefile
                  ])

data/vendor/libsodium/dist-build/Makefile.am

@@ -0,0 +1,10 @@
+
+EXTRA_DIST = \
+	android-build.sh \
+	android-arm.sh \
+	android-x86.sh \
+	android-mips.sh \
+	emscripten.sh \
+	ios.sh \
+	msys2-win32.sh \
+	msys2-win64.sh

data/vendor/libsodium/dist-build/android-arm.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+export CFLAGS="-Os -mthumb -marm -march=armv6"
+TARGET_ARCH=arm HOST_COMPILER=arm-linux-androideabi "$(dirname "$0")/android-build.sh"

data/vendor/libsodium/dist-build/android-armv7.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+export CFLAGS="-Os -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -marm -march=armv7-a"
+TARGET_ARCH=armv7 HOST_COMPILER=arm-linux-androideabi "$(dirname "$0")/android-build.sh"

data/vendor/libsodium/dist-build/android-build.sh

@@ -0,0 +1,37 @@
+#!/bin/sh
+
+if [ -z "$ANDROID_NDK_HOME" ]; then
+    echo "You should probably set ANDROID_NDK_HOME to the directory containing"
+    echo "the Android NDK"
+    exit
+fi
+
+if [ ! -f ./configure ]; then
+	echo "Can't find ./configure. Wrong directory or haven't run autogen.sh?"
+	exit 1
+fi
+
+if [ "x$TARGET_ARCH" = 'x' ] || [ "x$HOST_COMPILER" = 'x' ]; then
+    echo "You shouldn't use android-build.sh directly, use android-[arch].sh instead"
+    exit 1
+fi
+
+export MAKE_TOOLCHAIN="${ANDROID_NDK_HOME}/build/tools/make-standalone-toolchain.sh"
+
+export PREFIX="$(pwd)/libsodium-android-${TARGET_ARCH}"
+export TOOLCHAIN_DIR="$(pwd)/android-toolchain-${TARGET_ARCH}"
+export PATH="${PATH}:${TOOLCHAIN_DIR}/bin"
+
+# Clean up before build
+rm -rf "${TOOLCHAIN_DIR}" "${PREFIX}"
+
+$MAKE_TOOLCHAIN --platform="${NDK_PLATFORM:-android-14}" \
+                --arch="$TARGET_ARCH" \
+                --install-dir="$TOOLCHAIN_DIR" && \
+./configure --host="${HOST_COMPILER}" \
+            --with-sysroot="${TOOLCHAIN_DIR}/sysroot" \
+            --prefix="${PREFIX}" \
+            --disable-soname-versions && \
+make clean && \
+make -j3 install && \
+echo "libsodium has been installed into $PREFIX"

data/vendor/libsodium/dist-build/android-mips.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+export CFLAGS="-Os"
+TARGET_ARCH=mips HOST_COMPILER=mipsel-linux-android "$(dirname "$0")/android-build.sh"

data/vendor/libsodium/dist-build/android-x86.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+export CFLAGS="-Os"
+TARGET_ARCH=x86 HOST_COMPILER=i686-linux-android "$(dirname "$0")/android-build.sh"

data/vendor/libsodium/dist-build/emscripten.sh

@@ -0,0 +1,13 @@
+#! /bin/sh
+
+export PREFIX="$(pwd)/libsodium-js"
+export EXPORTED_FUNCTIONS='["_sodium_version_string"]'
+export OPTFLAGS="--llvm-lto 3 -Oz"
+export CFLAGS="$OPTFLAGS --pre-js=test/default/pre.js "
+export LDFLAGS="-s EXPORTED_FUNCTIONS=${EXPORTED_FUNCTIONS}"
+
+emconfigure ./configure --disable-shared --prefix="$PREFIX" && \
+emmake make clean &&
+emmake make install &&
+emcc --closure 1 $OPTFLAGS $LDFLAGS \
+  "${PREFIX}/lib/libsodium.a" -o "${PREFIX}/lib/libsodium.js"

data/vendor/libsodium/dist-build/{iphone.sh → ios.sh}

@@ -1,9 +1,9 @@
 #! /bin/sh
 
-export XCODEDIR="/Applications/Xcode.app/Contents/Developer"
+export XCODEDIR=$(xcode-select -p)
 export BASEDIR="${XCODEDIR}/Platforms/iPhoneOS.platform/Developer"
 export PATH="${BASEDIR}/usr/bin:$BASEDIR/usr/sbin:$PATH"
-export SDK="${BASEDIR}/SDKs/iPhoneOS7.0.sdk"
+export SDK="${BASEDIR}/SDKs/iPhoneOS7.1.sdk"
 export CFLAGS="-Oz -mthumb -arch armv7 -isysroot ${SDK}"
 export LDFLAGS="-mthumb -arch armv7 -isysroot ${SDK}"
 export PREFIX="$(pwd)/libsodium-ios"

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

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+export CFLAGS="-O3 -fomit-frame-pointer -m32 -march=pentium2 -mtune=nocona"
+export PREFIX="$(pwd)/libsodium-win32"
+
+./configure --prefix="$PREFIX" --exec-prefix="$PREFIX" \
+            --host=i686-w64-mingw32 && \
+make && \
+make check && \
+make install

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

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+export CFLAGS="-O3 -fomit-frame-pointer -m64 -march=pentium2 -mtune=nocona"
+export PREFIX="$(pwd)/libsodium-win64"
+
+./configure --prefix="$PREFIX" --exec-prefix="$PREFIX" \
+            --host=x86_64-w64-mingw32 && \
+make && \
+make check && \
+make install

data/vendor/libsodium/libsodium.vcxproj

@@ -318,6 +318,7 @@
     <ClInclude Include="src\libsodium\include\sodium\core.h" />
     <ClInclude Include="src\libsodium\include\sodium\crypto_auth.h" />
     <ClInclude Include="src\libsodium\include\sodium\crypto_auth_hmacsha256.h" />
+    <ClInclude Include="src\libsodium\include\sodium\crypto_auth_hmacsha512.h" />
     <ClInclude Include="src\libsodium\include\sodium\crypto_auth_hmacsha512256.h" />
     <ClInclude Include="src\libsodium\include\sodium\crypto_box.h" />
     <ClInclude Include="src\libsodium\include\sodium\crypto_box_curve25519xsalsa20poly1305.h" />
@@ -328,8 +329,6 @@
     <ClInclude Include="src\libsodium\include\sodium\crypto_generichash.h" />
     <ClInclude Include="src\libsodium\include\sodium\crypto_generichash_blake2b.h" />
     <ClInclude Include="src\libsodium\include\sodium\crypto_hash.h" />
-    <ClInclude Include="src\libsodium\include\sodium\crypto_hashblocks_sha256.h" />
-    <ClInclude Include="src\libsodium\include\sodium\crypto_hashblocks_sha512.h" />
     <ClInclude Include="src\libsodium\include\sodium\crypto_hash_sha256.h" />
     <ClInclude Include="src\libsodium\include\sodium\crypto_hash_sha512.h" />
     <ClInclude Include="src\libsodium\include\sodium\crypto_int32.h" />
@@ -337,6 +336,7 @@
     <ClInclude Include="src\libsodium\include\sodium\crypto_onetimeauth.h" />
     <ClInclude Include="src\libsodium\include\sodium\crypto_onetimeauth_poly1305.h" />
     <ClInclude Include="src\libsodium\include\sodium\crypto_onetimeauth_poly1305_donna.h" />
+    <ClInclude Include="src\libsodium\include\sodium\crypto_pwhash_scryptxsalsa208sha256.h" />
     <ClInclude Include="src\libsodium\include\sodium\crypto_scalarmult.h" />
     <ClInclude Include="src\libsodium\include\sodium\crypto_scalarmult_curve25519.h" />
     <ClInclude Include="src\libsodium\include\sodium\crypto_secretbox.h" />
@@ -359,10 +359,12 @@
     <ClInclude Include="src\libsodium\include\sodium\crypto_uint8.h" />
     <ClInclude Include="src\libsodium\include\sodium\crypto_verify_16.h" />
     <ClInclude Include="src\libsodium\include\sodium\crypto_verify_32.h" />
+    <ClInclude Include="src\libsodium\include\sodium\crypto_verify_64.h" />
     <ClInclude Include="src\libsodium\include\sodium\export.h" />
     <ClInclude Include="src\libsodium\include\sodium\randombytes.h" />
     <ClInclude Include="src\libsodium\include\sodium\randombytes_salsa20_random.h" />
     <ClInclude Include="src\libsodium\include\sodium\randombytes_sysrandom.h" />
+    <ClInclude Include="src\libsodium\include\sodium\runtime.h" />
     <ClInclude Include="src\libsodium\include\sodium\utils.h" />
     <ClInclude Include="src\libsodium\include\sodium\version.h" />
   </ItemGroup>
@@ -373,12 +375,16 @@
   <ItemGroup>
     <ClCompile Include="src\libsodium\crypto_auth\crypto_auth.c" />
     <ClCompile Include="src\libsodium\crypto_auth\hmacsha256\auth_hmacsha256_api.c" />
-    <ClCompile Include="src\libsodium\crypto_auth\hmacsha256\ref\hmac_hmacsha256.c" />
-    <ClCompile Include="src\libsodium\crypto_auth\hmacsha256\ref\verify_hmacsha256.c" />
+    <ClCompile Include="src\libsodium\crypto_auth\hmacsha256\cp\hmac_hmacsha256.c" />
+    <ClCompile Include="src\libsodium\crypto_auth\hmacsha256\cp\verify_hmacsha256.c" />
+    <ClCompile Include="src\libsodium\crypto_auth\hmacsha512\auth_hmacsha512_api.c" />
+    <ClCompile Include="src\libsodium\crypto_auth\hmacsha512\cp\hmac_hmacsha512.c" />
+    <ClCompile Include="src\libsodium\crypto_auth\hmacsha512\cp\verify_hmacsha512.c" />
     <ClCompile Include="src\libsodium\crypto_auth\hmacsha512256\auth_hmacsha512256_api.c" />
-    <ClCompile Include="src\libsodium\crypto_auth\hmacsha512256\ref\hmac_hmacsha512256.c" />
-    <ClCompile Include="src\libsodium\crypto_auth\hmacsha512256\ref\verify_hmacsha512256.c" />
+    <ClCompile Include="src\libsodium\crypto_auth\hmacsha512256\cp\hmac_hmacsha512256.c" />
+    <ClCompile Include="src\libsodium\crypto_auth\hmacsha512256\cp\verify_hmacsha512256.c" />
     <ClCompile Include="src\libsodium\crypto_box\crypto_box.c" />
+    <ClCompile Include="src\libsodium\crypto_box\crypto_box_easy.c" />
     <ClCompile Include="src\libsodium\crypto_box\curve25519xsalsa20poly1305\box_curve25519xsalsa20poly1305_api.c" />
     <ClCompile Include="src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\after_curve25519xsalsa20poly1305.c" />
     <ClCompile Include="src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\before_curve25519xsalsa20poly1305.c" />
@@ -396,26 +402,29 @@
     <ClCompile Include="src\libsodium\crypto_generichash\blake2\ref\blake2b-ref.c" />
     <ClCompile Include="src\libsodium\crypto_generichash\blake2\ref\generichash_blake2b.c" />
     <ClCompile Include="src\libsodium\crypto_generichash\crypto_generichash.c" />
-    <ClCompile Include="src\libsodium\crypto_hashblocks\sha256\hashblocks_sha256_api.c" />
-    <ClCompile Include="src\libsodium\crypto_hashblocks\sha256\ref\blocks_sha256.c" />
-    <ClCompile Include="src\libsodium\crypto_hashblocks\sha512\hashblocks_sha512_api.c" />
-    <ClCompile Include="src\libsodium\crypto_hashblocks\sha512\ref\blocks_sha512.c" />
     <ClCompile Include="src\libsodium\crypto_hash\crypto_hash.c" />
     <ClCompile Include="src\libsodium\crypto_hash\sha256\hash_sha256_api.c" />
-    <ClCompile Include="src\libsodium\crypto_hash\sha256\ref\hash_sha256.c" />
+    <ClCompile Include="src\libsodium\crypto_hash\sha256\cp\hash_sha256.c" />
     <ClCompile Include="src\libsodium\crypto_hash\sha512\hash_sha512_api.c" />
-    <ClCompile Include="src\libsodium\crypto_hash\sha512\ref\hash_sha512.c" />
+    <ClCompile Include="src\libsodium\crypto_hash\sha512\cp\hash_sha512.c" />
     <ClCompile Include="src\libsodium\crypto_onetimeauth\crypto_onetimeauth.c" />
     <ClCompile Include="src\libsodium\crypto_onetimeauth\poly1305\donna\auth_poly1305_donna.c" />
     <ClCompile Include="src\libsodium\crypto_onetimeauth\poly1305\donna\verify_poly1305_donna.c" />
     <ClCompile Include="src\libsodium\crypto_onetimeauth\poly1305\onetimeauth_poly1305.c" />
     <ClCompile Include="src\libsodium\crypto_onetimeauth\poly1305\onetimeauth_poly1305_api.c" />
     <ClCompile Include="src\libsodium\crypto_onetimeauth\poly1305\onetimeauth_poly1305_try.c" />
+    <ClCompile Include="src\libsodium\crypto_pwhash\scryptxsalsa208sha256\crypto_scrypt-common.c" />
+    <ClCompile Include="src\libsodium\crypto_pwhash\scryptxsalsa208sha256\nosse\pwhash_scryptxsalsa208sha256_nosse.c" />
+    <ClCompile Include="src\libsodium\crypto_pwhash\scryptxsalsa208sha256\pbkdf2-sha256.c" />
+    <ClCompile Include="src\libsodium\crypto_pwhash\scryptxsalsa208sha256\pwhash_scryptxsalsa208sha256.c" />
+    <ClCompile Include="src\libsodium\crypto_pwhash\scryptxsalsa208sha256\scrypt_platform.c" />
+    <ClCompile Include="src\libsodium\crypto_pwhash\scryptxsalsa208sha256\sse\pwhash_scryptxsalsa208sha256_sse.c" />
     <ClCompile Include="src\libsodium\crypto_scalarmult\crypto_scalarmult.c" />
     <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref\base_curve25519_ref.c" />
     <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\ref\smult_curve25519_ref.c" />
     <ClCompile Include="src\libsodium\crypto_scalarmult\curve25519\scalarmult_curve25519_api.c" />
     <ClCompile Include="src\libsodium\crypto_secretbox\crypto_secretbox.c" />
+    <ClCompile Include="src\libsodium\crypto_secretbox\crypto_secretbox_easy.c" />
     <ClCompile Include="src\libsodium\crypto_secretbox\xsalsa20poly1305\ref\box_xsalsa20poly1305.c" />
     <ClCompile Include="src\libsodium\crypto_secretbox\xsalsa20poly1305\secretbox_xsalsa20poly1305_api.c" />
     <ClCompile Include="src\libsodium\crypto_shorthash\crypto_shorthash.c" />
@@ -494,15 +503,18 @@
     <ClCompile Include="src\libsodium\crypto_verify\16\verify_16_api.c" />
     <ClCompile Include="src\libsodium\crypto_verify\32\ref\verify_32.c" />
     <ClCompile Include="src\libsodium\crypto_verify\32\verify_32_api.c" />
+    <ClCompile Include="src\libsodium\crypto_verify\64\ref\verify_64.c" />
+    <ClCompile Include="src\libsodium\crypto_verify\64\verify_64_api.c" />
     <ClCompile Include="src\libsodium\randombytes\randombytes.c" />
     <ClCompile Include="src\libsodium\randombytes\salsa20\randombytes_salsa20_random.c" />
     <ClCompile Include="src\libsodium\randombytes\sysrandom\randombytes_sysrandom.c" />
     <ClCompile Include="src\libsodium\sodium\compat.c" />
     <ClCompile Include="src\libsodium\sodium\core.c" />
+    <ClCompile Include="src\libsodium\sodium\runtime.c" />
     <ClCompile Include="src\libsodium\sodium\utils.c" />
     <ClCompile Include="src\libsodium\sodium\version.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>