rbnacl-libsodium 1.0.3 → 1.0.4

data/vendor/libsodium/configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.65])
-AC_INIT([libsodium],[1.0.3],
+AC_INIT([libsodium],[1.0.4],
   [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=7
-SODIUM_LIBRARY_VERSION_MINOR=5
+SODIUM_LIBRARY_VERSION_MINOR=6
 DLL_VERSION=6
-SODIUM_LIBRARY_VERSION=15:0:2
+SODIUM_LIBRARY_VERSION=16:0:3
 #                       | | |
 #                +------+ | +---+
 #                |        |     |
@@ -143,8 +143,12 @@ AC_PROG_CC_C99
 AM_PROG_AS
 AC_USE_SYSTEM_EXTENSIONS
 
-AX_CHECK_COMPILE_FLAG([-D_FORTIFY_SOURCE=2],
-  [CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"])
+AC_CHECK_DEFINE([__native_client__], [NATIVECLIENT="yes"], [])
+
+AC_CHECK_DEFINE([_FORTIFY_SOURCE], [], [
+  AX_CHECK_COMPILE_FLAG([-D_FORTIFY_SOURCE=2],
+    [CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"])
+])
 
 AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],
   [CFLAGS="$CFLAGS -fvisibility=hidden"])
@@ -177,7 +181,7 @@ 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"], [
+        AS_IF([test "x$enableval" = "xno"], [
           LIBTOOL_EXTRA_FLAGS="$LIBTOOL_OLD_FLAGS -avoid-version"
         ])
     ]
@@ -259,23 +263,36 @@ dnl Checks for headers
 AS_IF([test "x$EMSCRIPTEN" = "x"],[
 
   AC_MSG_CHECKING(for MMX instructions set)
+  oldcflags="$CFLAGS"
+  AX_CHECK_COMPILE_FLAG([-mmmx], [CFLAGS="$CFLAGS -mmmx"])
   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_DEFINE([HAVE_MMINTRIN_H], [1], [mmx is available])
+     AX_CHECK_COMPILE_FLAG([-mmmx], [CFLAGS_MMX="-mmmx"])],
     [AC_MSG_RESULT(no)])
+  CFLAGS="$oldcflags"
 
   AC_MSG_CHECKING(for SSE2 instructions set)
+  oldcflags="$CFLAGS"
+  AX_CHECK_COMPILE_FLAG([-msse2], [CFLAGS="$CFLAGS -msse2"])
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #pragma GCC target("sse2")
+#ifndef __SSE2__
+# define __SSE2__
+#endif
 #include <emmintrin.h>
 ]], [[ __m128d x = _mm_setzero_pd(); ]])],
     [AC_MSG_RESULT(yes)
-     AC_DEFINE([HAVE_EMMINTRIN_H], [1], [sse2 is available])],
+     AC_DEFINE([HAVE_EMMINTRIN_H], [1], [sse2 is available])
+     AX_CHECK_COMPILE_FLAG([-msse2], [CFLAGS_SSE2="-msse2"])],
     [AC_MSG_RESULT(no)])
+  CFLAGS="$oldcflags"
 
+  oldcflags="$CFLAGS"
+  AX_CHECK_COMPILE_FLAG([-msse3], [CFLAGS="$CFLAGS -msse3"])
   AC_MSG_CHECKING(for SSE3 instructions set)
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #pragma GCC target("sse3")
@@ -283,19 +300,65 @@ AS_IF([test "x$EMSCRIPTEN" = "x"],[
 ]], [[ __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_DEFINE([HAVE_PMMINTRIN_H], [1], [sse3 is available])
+     AX_CHECK_COMPILE_FLAG([-msse3], [CFLAGS_SSE3="-msse3"])],
     [AC_MSG_RESULT(no)])
+  CFLAGS="$oldcflags"
 
+  oldcflags="$CFLAGS"
+  AX_CHECK_COMPILE_FLAG([-mssse3], [CFLAGS="$CFLAGS -mssse3"])
   AC_MSG_CHECKING(for SSSE3 instructions set)
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #pragma GCC target("ssse3")
 #include <tmmintrin.h>
 ]], [[ __m64 x = _mm_abs_pi32(_m_from_int(0)); ]])],
     [AC_MSG_RESULT(yes)
-     AC_DEFINE([HAVE_TMMINTRIN_H], [1], [ssse3 is available])],
+     AC_DEFINE([HAVE_TMMINTRIN_H], [1], [ssse3 is available])
+     AX_CHECK_COMPILE_FLAG([-mssse3], [CFLAGS_SSSE3="-mssse3"])],
     [AC_MSG_RESULT(no)])
+  CFLAGS="$oldcflags"
+
+  oldcflags="$CFLAGS"
+  AX_CHECK_COMPILE_FLAG([-msse4.1], [CFLAGS="$CFLAGS -msse4.1"])
+  AC_MSG_CHECKING(for SSE4.1 instructions set)
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#pragma GCC target("sse4.1")
+#include <smmintrin.h>
+]], [[ __m128i x = _mm_minpos_epu16(_mm_setzero_si128()); ]])],
+    [AC_MSG_RESULT(yes)
+     AC_DEFINE([HAVE_SMMINTRIN_H], [1], [sse4.1 is available])
+     AX_CHECK_COMPILE_FLAG([-msse4.1], [CFLAGS_SSE4_1="-msse4.1"])],
+    [AC_MSG_RESULT(no)])
+  CFLAGS="$oldcflags"
+
+  oldcflags="$CFLAGS"
+  AX_CHECK_COMPILE_FLAG([-maes], [CFLAGS="$CFLAGS -maes"])
+  AX_CHECK_COMPILE_FLAG([-mpclmul], [CFLAGS="$CFLAGS -mpclmul"])
+  AC_MSG_CHECKING(for AESNI instructions set and PCLMULQDQ)
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#pragma GCC target("aes")
+#pragma GCC target("pclmul")
+#include <wmmintrin.h>
+]], [[ __m128i x = _mm_aesimc_si128(_mm_setzero_si128());
+       __m128i y = _mm_clmulepi64_si128(_mm_setzero_si128(), _mm_setzero_si128(), 0);]])],
+    [AC_MSG_RESULT(yes)
+     AC_DEFINE([HAVE_WMMINTRIN_H], [1], [aesni is available])
+     AX_CHECK_COMPILE_FLAG([-maes], [CFLAGS_AESNI="-maes"])
+     AX_CHECK_COMPILE_FLAG([-mpclmul], [CFLAGS_PCLMUL="-mpclmul"])
+     ],
+    [AC_MSG_RESULT(no)])
+  CFLAGS="$oldcflags"
+
 ])
 
+AC_SUBST(CFLAGS_MMX)
+AC_SUBST(CFLAGS_SSE2)
+AC_SUBST(CFLAGS_SSE3)
+AC_SUBST(CFLAGS_SSSE3)
+AC_SUBST(CFLAGS_SSE4_1)
+AC_SUBST(CFLAGS_AESNI)
+AC_SUBST(CFLAGS_PCLMUL)
+
 AC_CHECK_HEADERS([sys/mman.h])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -402,13 +465,22 @@ void f(void *x) { __dummy(x); }
  AC_DEFINE([HAVE_WEAK_SYMBOLS], [1], [weak symbols are supported])],
 [AC_MSG_RESULT(no)])
 
+AC_MSG_CHECKING(if data alignment is required)
+aligned_access_required=yes
 AS_CASE([$host_cpu],
   [i*86 | x86_64 | powerpc* | s390*],
-    [AC_MSG_NOTICE([data alignment is not required on this target])],
-  [*],
-    [AC_MSG_NOTICE([data alignment is required on this target])
-     AC_DEFINE([CPU_ALIGNED_ACCESS_REQUIRED], [1], [data alignment is required])]
+    [aligned_access_required=no],
+  [arm*],
+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#ifndef __ARM_FEATURE_UNALIGNED
+# error data alignment is required
+#endif
+      ]], [[]])], [aligned_access_required=no], [])]
 )
+AS_IF([test "x$aligned_access_required" = "xyes"],
+  [AC_MSG_RESULT(yes)
+   AC_DEFINE([CPU_ALIGNED_ACCESS_REQUIRED], [1], [data alignment is required])],
+  [AC_MSG_RESULT(no)])
 
 dnl Checks for functions and headers
 
@@ -416,7 +488,7 @@ AS_IF([test "x$EMSCRIPTEN" = "x"],[
   AC_CHECK_FUNCS([arc4random arc4random_buf])
   AC_CHECK_FUNCS([mmap mlock madvise mprotect explicit_bzero])
 ])
-AC_CHECK_FUNCS([posix_memalign])
+AC_CHECK_FUNCS([posix_memalign getpid])
 
 AC_SUBST([LIBTOOL_EXTRA_FLAGS])
 
@@ -428,6 +500,8 @@ AS_IF([test "x$EMSCRIPTEN" != "x"],[
 AC_SUBST(TEST_LDFLAGS)
 AM_CONDITIONAL([EMSCRIPTEN], [test "x$EMSCRIPTEN" != "x"])
 
+AM_CONDITIONAL([NATIVECLIENT], [test "x$NATIVECLIENT" != "x"])
+
 dnl Libtool.
 
 LT_INIT([dlopen])

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

@@ -3,9 +3,13 @@ EXTRA_DIST = \
 	android-build.sh \
 	android-arm.sh \
 	android-armv7-a.sh \
-	android-x86.sh \
+	android-armv8-a.sh \
 	android-mips32.sh \
+	android-mips64.sh \
+	android-x86.sh \
+	android-x86-64.sh \
 	emscripten.sh \
 	ios.sh \
 	msys2-win32.sh \
-	msys2-win64.sh
+	msys2-win64.sh \
+	nativeclient.sh

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

@@ -90,6 +90,7 @@ host_triplet = @host@
 subdir = dist-build
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
+	$(top_srcdir)/m4/ax_check_define.m4 \
 	$(top_srcdir)/m4/ax_check_link_flag.m4 \
 	$(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -138,6 +139,13 @@ CCASDEPMODE = @CCASDEPMODE@
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CFLAGS_AESNI = @CFLAGS_AESNI@
+CFLAGS_MMX = @CFLAGS_MMX@
+CFLAGS_PCLMUL = @CFLAGS_PCLMUL@
+CFLAGS_SSE2 = @CFLAGS_SSE2@
+CFLAGS_SSE3 = @CFLAGS_SSE3@
+CFLAGS_SSE4_1 = @CFLAGS_SSE4_1@
+CFLAGS_SSSE3 = @CFLAGS_SSSE3@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWFLAGS = @CWFLAGS@
@@ -174,6 +182,7 @@ LIBTOOL_EXTRA_FLAGS = @LIBTOOL_EXTRA_FLAGS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -259,12 +268,16 @@ EXTRA_DIST = \
 	android-build.sh \
 	android-arm.sh \
 	android-armv7-a.sh \
-	android-x86.sh \
+	android-armv8-a.sh \
 	android-mips32.sh \
+	android-mips64.sh \
+	android-x86.sh \
+	android-x86-64.sh \
 	emscripten.sh \
 	ios.sh \
 	msys2-win32.sh \
-	msys2-win64.sh
+	msys2-win64.sh \
+	nativeclient.sh
 
 all: all-am
 

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

@@ -0,0 +1,4 @@
+#!/bin/sh
+export TARGET_ARCH=armv8-a
+export CFLAGS="-Os -march=${TARGET_ARCH}"
+ARCH=arm64 HOST_COMPILER=aarch64-linux-android "$(dirname "$0")/android-build.sh"

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

@@ -24,14 +24,14 @@ export PATH="${PATH}:${TOOLCHAIN_DIR}/bin"
 
 rm -rf "${TOOLCHAIN_DIR}" "${PREFIX}"
 
-bash $MAKE_TOOLCHAIN --platform="${NDK_PLATFORM:-android-21}" \
-                --arch="$ARCH" \
-                --install-dir="$TOOLCHAIN_DIR" && \
-./configure --host="${HOST_COMPILER}" \
-            --with-sysroot="${TOOLCHAIN_DIR}/sysroot" \
-            --prefix="${PREFIX}" \
-            --enable-minimal \
-            --disable-soname-versions && \
+bash $MAKE_TOOLCHAIN --platform="${NDK_PLATFORM:-android-16}" \
+    --arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" && \
+./configure \
+    --disable-soname-versions \
+    --enable-minimal \
+    --host="${HOST_COMPILER}" \
+    --prefix="${PREFIX}" \
+    --with-sysroot="${TOOLCHAIN_DIR}/sysroot" && \
 make clean && \
 make -j3 install && \
-echo "libsodium has been installed into $PREFIX"
+echo "libsodium has been installed into ${PREFIX}"

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

@@ -0,0 +1,4 @@
+#!/bin/sh
+export TARGET_ARCH=mips64r6
+export CFLAGS="-Os -march=${TARGET_ARCH}"
+ARCH=mips64 HOST_COMPILER=mips64el-linux-android "$(dirname "$0")/android-build.sh"

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

@@ -0,0 +1,4 @@
+#!/bin/sh
+export TARGET_ARCH=x86-64
+export CFLAGS="-Os -march=${TARGET_ARCH}"
+ARCH=x86_64 HOST_COMPILER=x86_64-linux-android "$(dirname "$0")/android-build.sh"

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

@@ -2,10 +2,10 @@
 
 export MAKE_FLAGS='-j4'
 export PREFIX="$(pwd)/libsodium-js"
-export EXPORTED_FUNCTIONS='["_crypto_aead_chacha20poly1305_abytes","_crypto_aead_chacha20poly1305_decrypt","_crypto_aead_chacha20poly1305_encrypt","_crypto_aead_chacha20poly1305_keybytes","_crypto_aead_chacha20poly1305_npubbytes","_crypto_aead_chacha20poly1305_nsecbytes","_crypto_auth","_crypto_auth_bytes","_crypto_auth_keybytes","_crypto_auth_verify","_crypto_box_beforenm","_crypto_box_beforenmbytes","_crypto_box_detached","_crypto_box_detached_afternm","_crypto_box_easy","_crypto_box_easy_afternm","_crypto_box_keypair","_crypto_box_macbytes","_crypto_box_noncebytes","_crypto_box_open_detached","_crypto_box_open_detached_afternm","_crypto_box_open_easy","_crypto_box_open_easy_afternm","_crypto_box_publickeybytes","_crypto_box_seal","_crypto_box_seal_open","_crypto_box_sealbytes","_crypto_box_secretkeybytes","_crypto_box_seed_keypair","_crypto_box_seedbytes","_crypto_generichash","_crypto_generichash_bytes","_crypto_generichash_bytes_max","_crypto_generichash_bytes_min","_crypto_generichash_final","_crypto_generichash_init","_crypto_generichash_keybytes","_crypto_generichash_keybytes_max","_crypto_generichash_keybytes_min","_crypto_generichash_statebytes","_crypto_generichash_update","_crypto_hash","_crypto_hash_bytes","_crypto_pwhash_scryptsalsa208sha256","_crypto_pwhash_scryptsalsa208sha256_ll","_crypto_pwhash_scryptsalsa208sha256_memlimit_interactive","_crypto_pwhash_scryptsalsa208sha256_memlimit_sensitive","_crypto_pwhash_scryptsalsa208sha256_opslimit_interactive","_crypto_pwhash_scryptsalsa208sha256_opslimit_sensitive","_crypto_pwhash_scryptsalsa208sha256_saltbytes","_crypto_pwhash_scryptsalsa208sha256_str","_crypto_pwhash_scryptsalsa208sha256_str_verify","_crypto_pwhash_scryptsalsa208sha256_strbytes","_crypto_pwhash_scryptsalsa208sha256_strprefix","_crypto_scalarmult","_crypto_scalarmult_base","_crypto_scalarmult_bytes","_crypto_scalarmult_scalarbytes","_crypto_secretbox_detached","_crypto_secretbox_easy","_crypto_secretbox_keybytes","_crypto_secretbox_macbytes","_crypto_secretbox_noncebytes","_crypto_secretbox_open_detached","_crypto_secretbox_open_easy","_crypto_shorthash","_crypto_shorthash_bytes","_crypto_shorthash_keybytes","_crypto_sign","_crypto_sign_bytes","_crypto_sign_detached","_crypto_sign_ed25519_pk_to_curve25519","_crypto_sign_ed25519_sk_to_curve25519","_crypto_sign_keypair","_crypto_sign_open","_crypto_sign_publickeybytes","_crypto_sign_secretkeybytes","_crypto_sign_seed_keypair","_crypto_sign_seedbytes","_crypto_sign_verify_detached","_randombytes_buf","_randombytes_close","_randombytes_random","_randombytes_set_implementation","_randombytes_stir","_randombytes_uniform","_sodium_bin2hex","_sodium_hex2bin","_sodium_init","_sodium_library_version_major","_sodium_library_version_minor","_sodium_memcmp","_sodium_memzero","_sodium_version_string"]'
+export EXPORTED_FUNCTIONS='["_crypto_auth","_crypto_auth_bytes","_crypto_auth_keybytes","_crypto_auth_verify","_crypto_box_beforenm","_crypto_box_beforenmbytes","_crypto_box_detached","_crypto_box_detached_afternm","_crypto_box_easy","_crypto_box_easy_afternm","_crypto_box_keypair","_crypto_box_macbytes","_crypto_box_noncebytes","_crypto_box_open_detached","_crypto_box_open_detached_afternm","_crypto_box_open_easy","_crypto_box_open_easy_afternm","_crypto_box_publickeybytes","_crypto_box_seal","_crypto_box_seal_open","_crypto_box_sealbytes","_crypto_box_secretkeybytes","_crypto_box_seed_keypair","_crypto_box_seedbytes","_crypto_generichash","_crypto_generichash_bytes","_crypto_generichash_bytes_max","_crypto_generichash_bytes_min","_crypto_generichash_final","_crypto_generichash_init","_crypto_generichash_keybytes","_crypto_generichash_keybytes_max","_crypto_generichash_keybytes_min","_crypto_generichash_statebytes","_crypto_generichash_update","_crypto_hash","_crypto_hash_bytes","_crypto_onetimeauth","_crypto_onetimeauth_bytes","_crypto_onetimeauth_final","_crypto_onetimeauth_init","_crypto_onetimeauth_keybytes","_crypto_onetimeauth_statebytes","_crypto_onetimeauth_update","_crypto_onetimeauth_verify","_crypto_pwhash_scryptsalsa208sha256","_crypto_pwhash_scryptsalsa208sha256_ll","_crypto_pwhash_scryptsalsa208sha256_memlimit_interactive","_crypto_pwhash_scryptsalsa208sha256_memlimit_sensitive","_crypto_pwhash_scryptsalsa208sha256_opslimit_interactive","_crypto_pwhash_scryptsalsa208sha256_opslimit_sensitive","_crypto_pwhash_scryptsalsa208sha256_saltbytes","_crypto_pwhash_scryptsalsa208sha256_str","_crypto_pwhash_scryptsalsa208sha256_str_verify","_crypto_pwhash_scryptsalsa208sha256_strbytes","_crypto_pwhash_scryptsalsa208sha256_strprefix","_crypto_scalarmult","_crypto_scalarmult_base","_crypto_scalarmult_bytes","_crypto_scalarmult_scalarbytes","_crypto_secretbox_detached","_crypto_secretbox_easy","_crypto_secretbox_keybytes","_crypto_secretbox_macbytes","_crypto_secretbox_noncebytes","_crypto_secretbox_open_detached","_crypto_secretbox_open_easy","_crypto_shorthash","_crypto_shorthash_bytes","_crypto_shorthash_keybytes","_crypto_sign","_crypto_sign_bytes","_crypto_sign_detached","_crypto_sign_ed25519_pk_to_curve25519","_crypto_sign_ed25519_sk_to_curve25519","_crypto_sign_keypair","_crypto_sign_open","_crypto_sign_publickeybytes","_crypto_sign_secretkeybytes","_crypto_sign_seed_keypair","_crypto_sign_seedbytes","_crypto_sign_verify_detached","_randombytes_buf","_randombytes_close","_randombytes_random","_randombytes_set_implementation","_randombytes_stir","_randombytes_uniform","_sodium_bin2hex","_sodium_hex2bin","_sodium_init","_sodium_library_version_major","_sodium_library_version_minor","_sodium_memcmp","_sodium_memzero","_sodium_version_string"]'
 export TOTAL_MEMORY=33554432
 export JS_EXPORTS_FLAGS="-s EXPORTED_FUNCTIONS=${EXPORTED_FUNCTIONS}"
-export LDFLAGS="-s TOTAL_MEMORY=${TOTAL_MEMORY} -s RESERVED_FUNCTION_POINTERS=8 -s NO_BROWSER=1"
+export LDFLAGS="-s TOTAL_MEMORY=${TOTAL_MEMORY} -s RESERVED_FUNCTION_POINTERS=8 -s NO_BROWSER=1 -s NO_DYNAMIC_EXECUTION=1 -s RUNNING_JS_OPTS=1"
 
 rm -f test/js.done
 
@@ -13,7 +13,7 @@ emconfigure ./configure --enable-minimal --disable-shared --prefix="$PREFIX" \
   CFLAGS="-O3" && \
 emmake make clean && \
 emmake make $MAKE_FLAGS install V=1 && \
-emcc -O3 --closure 1 --llvm-lto 1 --memory-init-file 0 $LDFLAGS $JS_EXPORTS_FLAGS \
+emcc -O3 --llvm-lto 1 --memory-init-file 0 $LDFLAGS $JS_EXPORTS_FLAGS \
   "${PREFIX}/lib/libsodium.a" -o "${PREFIX}/lib/libsodium.js" || exit 1
 
 if test "x$NODE" = x; then

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

@@ -55,8 +55,8 @@ export PATH="${BASEDIR}/usr/bin:$BASEDIR/usr/sbin:$PATH"
 export SDK="${BASEDIR}/SDKs/iPhoneOS.sdk"
 
 ## 32-bit iOS
-export CFLAGS="-Oz -mthumb -arch armv7 -arch armv7s -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}"
-export LDFLAGS="-mthumb -arch armv7 -arch armv7s -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}"
+export CFLAGS="-Oz -mthumb -arch armv7 -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}"
+export LDFLAGS="-mthumb -arch armv7 -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}"
 
 make distclean > /dev/null
 
@@ -82,19 +82,19 @@ make -j3 install || exit 1
 
 # Create universal binary and include folder
 rm -fr -- "$PREFIX/include" "$PREFIX/libsodium.a" 2> /dev/null
-mkdir -p -- "$PREFIX"
+mkdir -p -- "$PREFIX/lib"
 lipo -create \
   "$SIMULATOR32_PREFIX/lib/libsodium.a" \
   "$SIMULATOR64_PREFIX/lib/libsodium.a" \
   "$IOS32_PREFIX/lib/libsodium.a" \
   "$IOS64_PREFIX/lib/libsodium.a" \
-  -output "$PREFIX/libsodium.a"
+  -output "$PREFIX/lib/libsodium.a"
 mv -f -- "$IOS32_PREFIX/include" "$PREFIX/"
 
 echo
 echo "libsodium has been installed into $PREFIX"
 echo
-file -- "$PREFIX/libsodium.a"
+file -- "$PREFIX/lib/libsodium.a"
 
 # Cleanup
 rm -rf -- "$PREFIX/tmp"

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

@@ -0,0 +1,28 @@
+#! /bin/sh
+
+export NACL_SDK_ROOT=${NACL_SDK_ROOT-"/opt/nacl_sdk/pepper_45"}
+export NACL_TOOLCHAIN=${NACL_TOOLCHAIN-"${NACL_SDK_ROOT}/toolchain/mac_pnacl"}
+export NACL_BIN=${NACL_BIN-"${NACL_TOOLCHAIN}/bin"}
+export PREFIX="$(pwd)/libsodium-nativeclient"
+export PATH="${NACL_BIN}:$PATH"
+export AR=${AR-"pnacl-ar"}
+export AS=${AS-"pnacl-as"}
+export CC=${CC-"pnacl-clang"}
+export LD=${LD-"pnacl-ld"}
+export NM=${NM-"pnacl-nm"}
+export RANLIB=${RANLIB-"pnacl-ranlib"}
+export PNACL_FINALIZE=${PNACL_FINALIZE-"pnacl-finalize"}
+export PNACL_TRANSLATE=${PNACL_TRANSLATE-"pnacl-translate"}
+
+mkdir -p $PREFIX || exit 1
+
+make distclean > /dev/null
+
+./configure --enable-minimal \
+            --host=nacl \
+            --prefix="$PREFIX" || exit 1
+
+make -j3 check && make -j3 install || exit 1
+
+# Cleanup
+make distclean > /dev/null

data/vendor/libsodium/examples/Makefile

@@ -0,0 +1,21 @@
+
+TARGETS = \
+	auth \
+	box \
+	box_detached \
+	generichash \
+	generichash_stream \
+	shorthash \
+	sign
+
+SODIUM_CFLAGS != pkg-config --cflags libsodium
+SODIUM_LIBS != pkg-config --libs libsodium
+CFLAGS += $(SODIUM_CFLAGS)
+LDFLAGS += $(SODIUM_LIBS)
+
+all: $(TARGETS)
+
+clean:
+	rm -f $(TARGETS)
+
+distclean: clean

data/vendor/libsodium/examples/auth.c

@@ -0,0 +1,68 @@
+/*
+ * GraxRabble
+ * example programs for libsodium.
+ */
+
+#include <sodium.h> /* library header */
+
+#include "utils.h" /* utility functions shared by examples */
+
+/*
+ * This operation computes an authentication tag for a message and a
+ * secret key, and provides a way to verify that a given tag is valid
+ * for a given message and a key.
+ *
+ * The function computing the tag deterministic: the same (message,
+ * key) tuple will always produce the same output.
+ *
+ * However, even if the message is public, knowing the key is
+ * required in order to be able to compute a valid tag. Therefore,
+ * the key should remain confidential. The tag, however, can be
+ * public.
+ *
+ * A typical use case is:
+ *
+ * - A prepares a message, add an authentication tag, sends it to B
+ * - A doesn't store the message
+ * - Later on, B sends the message and the authentication tag to A
+ * - A uses the authentication tag to verify that it created this message.
+ *
+ * This operation does not encrypt the message. It only computes and
+ * verifies an authentication tag.
+ */
+static int
+auth(void)
+{
+    unsigned char key[crypto_auth_KEYBYTES];
+    unsigned char mac[crypto_auth_BYTES];
+    unsigned char message[MAX_INPUT_LEN];
+    size_t        message_len;
+    int           ret;
+
+    puts("Example: crypto_auth\n");
+
+    prompt_input("a key", (char*)key, sizeof key, 0);
+    message_len = prompt_input("a message", (char*)message, sizeof message, 1);
+
+    printf("Generating %s authentication...\n", crypto_auth_primitive());
+    crypto_auth(mac, message, message_len, key);
+
+    printf("Authentication tag: ");
+    print_hex(mac, sizeof mac);
+
+    puts("Verifying authentication tag...");
+    ret = crypto_auth_verify(mac, message, message_len, key);
+    print_verification(ret);
+
+    sodium_memzero(key, sizeof key); /* wipe sensitive data */
+
+    return ret;
+}
+
+int
+main(void)
+{
+    init();
+
+    return auth() != 0;
+}