rbnacl-libsodium 1.0.10 → 1.0.11

data/vendor/libsodium/configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.65])
-AC_INIT([libsodium],[1.0.10],
+AC_INIT([libsodium],[1.0.11],
   [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=2
+SODIUM_LIBRARY_VERSION_MINOR=3
 DLL_VERSION=8
-SODIUM_LIBRARY_VERSION=19:0:1
+SODIUM_LIBRARY_VERSION=19:1:1
 #                       | | |
 #                +------+ | +---+
 #                |        |     |
@@ -40,8 +40,8 @@ LX_CFLAGS=${CFLAGS-NONE}
 
 dnl Path check
 
-AS_IF([test pwd | fgrep ' ' > /dev/null 2>&1],
-  [AC_MSG_WARN([The build directory contains whitespaces - This can cause tests/installation to fail due to limitations of some libtool versions])]
+AS_IF([pwd | fgrep ' ' > /dev/null 2>&1],
+  [AC_MSG_ERROR([The build directory contains whitespaces - This can cause tests/installation to fail due to limitations of some libtool versions])]
 )
 
 dnl Switches
@@ -72,9 +72,13 @@ AC_ARG_ENABLE(asm,
   enable_asm="yes"
 ])
 
-AS_IF([test "x$EMSCRIPTEN" != "x"],[
+AS_IF([test "x$EMSCRIPTEN" != "x"], [
+  enable_asm="no"
+  AC_MSG_WARN([compiling to JavaScript - asm implementations disabled])
+])
+AS_IF([test "$host_os" = "nacl" -o "$host_os" = "pnacl"], [
   enable_asm="no"
-  AC_MSG_WARN([compiling to javascript - asm implementations disabled])
+  AC_MSG_WARN([compiling to Native Client - asm implementations disabled])
 ])
 
 AC_ARG_ENABLE(pie,
@@ -106,6 +110,18 @@ AC_ARG_ENABLE(minimal,
 ])
 AM_CONDITIONAL([MINIMAL], [test x$enable_minimal = xyes])
 
+AC_ARG_WITH(pthreads, AC_HELP_STRING([--with-pthreads],
+ [use pthreads library, or --without-pthreads to disable threading support.]),
+ [ ], [withval="yes"])
+
+AS_IF([test "x$withval" = "xyes"], [
+  AX_PTHREAD([
+    AC_DEFINE([HAVE_PTHREAD], [1], [Define if you have POSIX threads libraries and header files])
+    LIBS="$PTHREAD_LIBS $LIBS"
+    CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+    CC="$PTHREAD_CC"])
+])
+
 AC_ARG_WITH(safecode,
 [AS_HELP_STRING(--with-safecode,For maintainers only - please do not use)],
 [AS_IF([test "x$withval" = "xyes"], [
@@ -285,7 +301,7 @@ AC_CHECK_TOOL([AR], [ar], [ar])
 
 dnl Checks for headers
 
-AS_IF([test "x$EMSCRIPTEN" = "x"],[
+AS_IF([test "x$EMSCRIPTEN" = "x" -a "$host_os" != "pnacl"], [
 
   AC_MSG_CHECKING(for MMX instructions set)
   oldcflags="$CFLAGS"
@@ -361,6 +377,9 @@ AS_IF([test "x$EMSCRIPTEN" = "x"],[
   AX_CHECK_COMPILE_FLAG([-mavx], [CFLAGS="$CFLAGS -mavx"])
   AC_MSG_CHECKING(for AVX instructions set)
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#ifdef __native_client__
+# error NativeClient detected - Avoiding AVX opcodes
+#endif
 #pragma GCC target("avx")
 #include <immintrin.h>
 ]], [[ _mm256_zeroall(); ]])],
@@ -374,6 +393,9 @@ AS_IF([test "x$EMSCRIPTEN" = "x"],[
   AX_CHECK_COMPILE_FLAG([-mavx2], [CFLAGS="$CFLAGS -mavx2"])
   AC_MSG_CHECKING(for AVX2 instructions set)
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#ifdef __native_client__
+# error NativeClient detected - Avoiding AVX2 opcodes
+#endif
 #pragma GCC target("avx2")
 #include <immintrin.h>
 ]], [[ __m256i x = _mm256_abs_epi8(_mm256_setzero_si256()); ]])],
@@ -382,6 +404,9 @@ AS_IF([test "x$EMSCRIPTEN" = "x"],[
      AX_CHECK_COMPILE_FLAG([-mavx2], [CFLAGS_AVX="-mavx2"])
      AC_MSG_CHECKING(if _mm256_broadcastsi128_si256 is correctly defined)
      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#ifdef __native_client__
+# error NativeClient detected - Avoiding AVX2 opcodes
+#endif
 #pragma GCC target("avx2")
 #include <immintrin.h>
      ]], [[ __m256i y = _mm256_broadcastsi128_si256(_mm_setzero_si128()); ]])],
@@ -398,6 +423,9 @@ AS_IF([test "x$EMSCRIPTEN" = "x"],[
   AX_CHECK_COMPILE_FLAG([-mpclmul], [CFLAGS="$CFLAGS -mpclmul"])
   AC_MSG_CHECKING(for AESNI instructions set and PCLMULQDQ)
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#ifdef __native_client__
+# error NativeClient detected - Avoiding AESNI opcodes
+#endif
 #pragma GCC target("aes")
 #pragma GCC target("pclmul")
 #include <wmmintrin.h>
@@ -541,7 +569,7 @@ AM_CONDITIONAL([HAVE_TI_MODE], [test $HAVE_TI_MODE_V = 1])
 AC_SUBST(HAVE_TI_MODE_V)
 
 HAVE_CPUID_V=0
-AS_IF([test "$enable_asm" != "no"],[
+AS_IF([test "$enable_asm" != "no" -o "$host_alias" = "x86_64-nacl"],[
   AC_MSG_CHECKING(for cpuid instruction)
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[
 unsigned int cpu_info[4];
@@ -558,7 +586,7 @@ __asm__ __volatile__ ("xchgl %%ebx, %k1; cpuid; xchgl %%ebx, %k1" :
 AC_SUBST(HAVE_CPUID_V)
 
 asm_hide_symbol="unsupported"
-AS_IF([test "$enable_asm" != "no"],[
+AS_IF([test "$enable_asm" != "no" -o "$host_os" = "nacl"],[
   AC_MSG_CHECKING(if the .private_extern asm directive is supported)
   AC_LINK_IFELSE([AC_LANG_PROGRAM([[ ]], [[
 __asm__ __volatile__ (".private_extern dummy_symbol \n"
@@ -600,6 +628,9 @@ __asm__ __volatile__ (".hidden dummy_symbol \n"
 
 AC_MSG_CHECKING(if weak symbols are supported)
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+#if !defined(__ELF__) && !defined(__APPLE_CC__)
+# error Support for weak symbols may not be available
+#endif
 __attribute__((weak)) void __dummy(void *x) { }
 void f(void *x) { __dummy(x); }
 ]], [[ ]]
@@ -629,7 +660,7 @@ dnl Checks for functions and headers
 
 AS_IF([test "x$EMSCRIPTEN" = "x"],[
   AC_CHECK_FUNCS([arc4random arc4random_buf])
-  AC_CHECK_FUNCS([mmap mlock madvise mprotect explicit_bzero])
+  AC_CHECK_FUNCS([mmap mlock madvise mprotect explicit_bzero nanosleep])
 ])
 AC_CHECK_FUNCS([posix_memalign getpid])
 
@@ -645,6 +676,8 @@ AM_CONDITIONAL([EMSCRIPTEN], [test "x$EMSCRIPTEN" != "x"])
 
 AM_CONDITIONAL([NATIVECLIENT], [test "x$NATIVECLIENT" != "x"])
 
+AC_DEFINE([CONFIGURED], [1], [the build system was properly configured])
+
 dnl Libtool.
 
 LT_INIT([dlopen])

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

@@ -7,9 +7,11 @@ EXTRA_DIST = \
 	android-mips32.sh \
 	android-mips64.sh \
 	android-x86.sh \
-	android-x86-64.sh \
+	android-x86_64.sh \
 	emscripten.sh \
 	ios.sh \
 	msys2-win32.sh \
 	msys2-win64.sh \
-	nativeclient.sh
+	nativeclient-pnacl.sh \
+	nativeclient-x86.sh \
+	nativeclient-x86_64.sh

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

@@ -92,6 +92,7 @@ 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/ax_pthread.m4 \
 	$(top_srcdir)/m4/ax_valgrind_check.m4 \
 	$(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -205,6 +206,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
 SAFECODE_HOME = @SAFECODE_HOME@
 SED = @SED@
@@ -234,6 +238,7 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
+ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -282,12 +287,14 @@ EXTRA_DIST = \
 	android-mips32.sh \
 	android-mips64.sh \
 	android-x86.sh \
-	android-x86-64.sh \
+	android-x86_64.sh \
 	emscripten.sh \
 	ios.sh \
 	msys2-win32.sh \
 	msys2-win64.sh \
-	nativeclient.sh
+	nativeclient-pnacl.sh \
+	nativeclient-x86.sh \
+	nativeclient-x86_64.sh
 
 all: all-am
 

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

@@ -1,4 +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"
+NDK_PLATFORM_COMPAT=android-21 ARCH=arm64 HOST_COMPILER=aarch64-linux-android "$(dirname "$0")/android-build.sh"

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

@@ -1,5 +1,12 @@
 #! /bin/sh
 
+if [ -z "$NDK_PLATFORM" ]; then
+  export NDK_PLATFORM="android-24"
+  export NDK_PLATFORM_COMPAT="${NDK_PLATFORM_COMPAT:-android-16}"
+else
+  export NDK_PLATFORM_COMPAT="${NDK_PLATFORM_COMPAT:-${NDK_PLATFORM}}"
+fi
+
 if [ -z "$ANDROID_NDK_HOME" ]; then
     echo "You should probably set ANDROID_NDK_HOME to the directory containing"
     echo "the Android NDK"
@@ -24,14 +31,44 @@ export PATH="${PATH}:${TOOLCHAIN_DIR}/bin"
 
 rm -rf "${TOOLCHAIN_DIR}" "${PREFIX}"
 
-bash $MAKE_TOOLCHAIN --platform="${NDK_PLATFORM:-android-16}" \
-    --arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" && \
+echo
+echo "Building for platform [${NDK_PLATFORM}], retaining compatibility with platform [${NDK_PLATFORM_COMPAT}]"
+echo
+
+bash $MAKE_TOOLCHAIN --platform="$NDK_PLATFORM_COMPAT" \
+    --arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" || exit 1
+
 ./configure \
     --disable-soname-versions \
     --enable-minimal \
     --host="${HOST_COMPILER}" \
     --prefix="${PREFIX}" \
-    --with-sysroot="${TOOLCHAIN_DIR}/sysroot" && \
+    --with-sysroot="${TOOLCHAIN_DIR}/sysroot" || exit 1
+
+if [ "$NDK_PLATFORM" != "$NDK_PLATFORM_COMPAT" ]; then
+  egrep '^#define ' config.log | sort -u > config-def-compat.log
+  echo
+  echo "Configuring again for platform [${NDK_PLATFORM}]"
+  echo
+  bash $MAKE_TOOLCHAIN --platform="$NDK_PLATFORM" \
+      --arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" || exit 1
+
+  ./configure \
+      --disable-soname-versions \
+      --enable-minimal \
+      --host="${HOST_COMPILER}" \
+      --prefix="${PREFIX}" \
+      --with-sysroot="${TOOLCHAIN_DIR}/sysroot" || exit 1
+
+  egrep '^#define ' config.log | sort -u > config-def.log
+  if ! cmp config-def.log config-def-compat.log; then
+    echo "Platform [${NDK_PLATFORM}] is not backwards-compatible with [${NDK_PLATFORM_COMPAT}]" >&2
+    diff -u config-def.log config-def-compat.log >&2
+    exit 1
+  fi
+  rm -f config-def.log config-def-compat.log
+fi
+
 make clean && \
 make -j3 install && \
 echo "libsodium has been installed into ${PREFIX}"

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

@@ -1,4 +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"
+NDK_PLATFORM_COMPAT=android-21 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=westmere
+export CFLAGS="-Os -march=${TARGET_ARCH}"
+NDK_PLATFORM_COMPAT=android-21 ARCH=x86_64 HOST_COMPILER=x86_64-linux-android "$(dirname "$0")/android-build.sh"

data/vendor/libsodium/dist-build/emscripten-symbols.def

@@ -183,9 +183,9 @@ _crypto_onetimeauth_primitive 0 1
 _crypto_onetimeauth_statebytes 0 1
 _crypto_onetimeauth_update 0 1
 _crypto_onetimeauth_verify 0 1
-_crypto_pwhash 1 1
-_crypto_pwhash_alg_argon2i13 1 1
-_crypto_pwhash_alg_default 1 1
+_crypto_pwhash 0 1
+_crypto_pwhash_alg_argon2i13 0 1
+_crypto_pwhash_alg_default 0 1
 _crypto_pwhash_argon2i 0 1
 _crypto_pwhash_argon2i_alg_argon2i13 0 1
 _crypto_pwhash_argon2i_memlimit_interactive 0 1
@@ -199,29 +199,29 @@ _crypto_pwhash_argon2i_str 0 1
 _crypto_pwhash_argon2i_str_verify 0 1
 _crypto_pwhash_argon2i_strbytes 0 1
 _crypto_pwhash_argon2i_strprefix 0 1
-_crypto_pwhash_memlimit_interactive 1 1
-_crypto_pwhash_memlimit_moderate 1 1
-_crypto_pwhash_memlimit_sensitive 1 1
-_crypto_pwhash_opslimit_interactive 1 1
-_crypto_pwhash_opslimit_moderate 1 1
-_crypto_pwhash_opslimit_sensitive 1 1
+_crypto_pwhash_memlimit_interactive 0 1
+_crypto_pwhash_memlimit_moderate 0 1
+_crypto_pwhash_memlimit_sensitive 0 1
+_crypto_pwhash_opslimit_interactive 0 1
+_crypto_pwhash_opslimit_moderate 0 1
+_crypto_pwhash_opslimit_sensitive 0 1
 _crypto_pwhash_primitive 0 1
-_crypto_pwhash_saltbytes 1 1
-_crypto_pwhash_scryptsalsa208sha256 1 1
-_crypto_pwhash_scryptsalsa208sha256_ll 1 1
-_crypto_pwhash_scryptsalsa208sha256_memlimit_interactive 1 1
-_crypto_pwhash_scryptsalsa208sha256_memlimit_sensitive 1 1
-_crypto_pwhash_scryptsalsa208sha256_opslimit_interactive 1 1
-_crypto_pwhash_scryptsalsa208sha256_opslimit_sensitive 1 1
-_crypto_pwhash_scryptsalsa208sha256_saltbytes 1 1
-_crypto_pwhash_scryptsalsa208sha256_str 1 1
-_crypto_pwhash_scryptsalsa208sha256_str_verify 1 1
-_crypto_pwhash_scryptsalsa208sha256_strbytes 1 1
-_crypto_pwhash_scryptsalsa208sha256_strprefix 1 1
-_crypto_pwhash_str 1 1
-_crypto_pwhash_str_verify 1 1
-_crypto_pwhash_strbytes 1 1
-_crypto_pwhash_strprefix 1 1
+_crypto_pwhash_saltbytes 0 1
+_crypto_pwhash_scryptsalsa208sha256 0 1
+_crypto_pwhash_scryptsalsa208sha256_ll 0 1
+_crypto_pwhash_scryptsalsa208sha256_memlimit_interactive 0 1
+_crypto_pwhash_scryptsalsa208sha256_memlimit_sensitive 0 1
+_crypto_pwhash_scryptsalsa208sha256_opslimit_interactive 0 1
+_crypto_pwhash_scryptsalsa208sha256_opslimit_sensitive 0 1
+_crypto_pwhash_scryptsalsa208sha256_saltbytes 0 1
+_crypto_pwhash_scryptsalsa208sha256_str 0 1
+_crypto_pwhash_scryptsalsa208sha256_str_verify 0 1
+_crypto_pwhash_scryptsalsa208sha256_strbytes 0 1
+_crypto_pwhash_scryptsalsa208sha256_strprefix 0 1
+_crypto_pwhash_str 0 1
+_crypto_pwhash_str_verify 0 1
+_crypto_pwhash_strbytes 0 1
+_crypto_pwhash_strprefix 0 1
 _crypto_scalarmult 1 1
 _crypto_scalarmult_base 1 1
 _crypto_scalarmult_bytes 1 1

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

@@ -1,35 +1,72 @@
 #! /bin/sh
 
 export MAKE_FLAGS='-j4'
-export PREFIX="$(pwd)/libsodium-js"
-export EXPORTED_FUNCTIONS_STANDARD='["_crypto_aead_chacha20poly1305_abytes","_crypto_aead_chacha20poly1305_decrypt","_crypto_aead_chacha20poly1305_decrypt_detached","_crypto_aead_chacha20poly1305_encrypt","_crypto_aead_chacha20poly1305_encrypt_detached","_crypto_aead_chacha20poly1305_ietf_abytes","_crypto_aead_chacha20poly1305_ietf_decrypt","_crypto_aead_chacha20poly1305_ietf_decrypt_detached","_crypto_aead_chacha20poly1305_ietf_encrypt","_crypto_aead_chacha20poly1305_ietf_encrypt_detached","_crypto_aead_chacha20poly1305_ietf_keybytes","_crypto_aead_chacha20poly1305_ietf_npubbytes","_crypto_aead_chacha20poly1305_ietf_nsecbytes","_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_primitive","_crypto_generichash_statebytes","_crypto_generichash_update","_crypto_hash","_crypto_hash_bytes","_crypto_pwhash","_crypto_pwhash_alg_argon2i13","_crypto_pwhash_alg_default","_crypto_pwhash_memlimit_interactive","_crypto_pwhash_memlimit_moderate","_crypto_pwhash_memlimit_sensitive","_crypto_pwhash_opslimit_interactive","_crypto_pwhash_opslimit_moderate","_crypto_pwhash_opslimit_sensitive","_crypto_pwhash_saltbytes","_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_pwhash_str","_crypto_pwhash_str_verify","_crypto_pwhash_strbytes","_crypto_pwhash_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","_randombytes_buf","_randombytes_close","_randombytes_random","_randombytes_stir","_randombytes_uniform","_sodium_bin2hex","_sodium_hex2bin","_sodium_init","_sodium_library_version_major","_sodium_library_version_minor","_sodium_version_string"]'
+export EXPORTED_FUNCTIONS_STANDARD='["_crypto_aead_chacha20poly1305_abytes","_crypto_aead_chacha20poly1305_decrypt","_crypto_aead_chacha20poly1305_decrypt_detached","_crypto_aead_chacha20poly1305_encrypt","_crypto_aead_chacha20poly1305_encrypt_detached","_crypto_aead_chacha20poly1305_ietf_abytes","_crypto_aead_chacha20poly1305_ietf_decrypt","_crypto_aead_chacha20poly1305_ietf_decrypt_detached","_crypto_aead_chacha20poly1305_ietf_encrypt","_crypto_aead_chacha20poly1305_ietf_encrypt_detached","_crypto_aead_chacha20poly1305_ietf_keybytes","_crypto_aead_chacha20poly1305_ietf_npubbytes","_crypto_aead_chacha20poly1305_ietf_nsecbytes","_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_primitive","_crypto_generichash_statebytes","_crypto_generichash_update","_crypto_hash","_crypto_hash_bytes","_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","_randombytes_buf","_randombytes_close","_randombytes_random","_randombytes_stir","_randombytes_uniform","_sodium_bin2hex","_sodium_hex2bin","_sodium_init","_sodium_library_version_major","_sodium_library_version_minor","_sodium_version_string"]'
 export EXPORTED_FUNCTIONS_SUMO='["_crypto_aead_chacha20poly1305_abytes","_crypto_aead_chacha20poly1305_decrypt","_crypto_aead_chacha20poly1305_decrypt_detached","_crypto_aead_chacha20poly1305_encrypt","_crypto_aead_chacha20poly1305_encrypt_detached","_crypto_aead_chacha20poly1305_ietf_abytes","_crypto_aead_chacha20poly1305_ietf_decrypt","_crypto_aead_chacha20poly1305_ietf_decrypt_detached","_crypto_aead_chacha20poly1305_ietf_encrypt","_crypto_aead_chacha20poly1305_ietf_encrypt_detached","_crypto_aead_chacha20poly1305_ietf_keybytes","_crypto_aead_chacha20poly1305_ietf_npubbytes","_crypto_aead_chacha20poly1305_ietf_nsecbytes","_crypto_aead_chacha20poly1305_keybytes","_crypto_aead_chacha20poly1305_npubbytes","_crypto_aead_chacha20poly1305_nsecbytes","_crypto_auth","_crypto_auth_bytes","_crypto_auth_hmacsha256","_crypto_auth_hmacsha256_bytes","_crypto_auth_hmacsha256_final","_crypto_auth_hmacsha256_init","_crypto_auth_hmacsha256_keybytes","_crypto_auth_hmacsha256_statebytes","_crypto_auth_hmacsha256_update","_crypto_auth_hmacsha256_verify","_crypto_auth_hmacsha512","_crypto_auth_hmacsha512256","_crypto_auth_hmacsha512256_bytes","_crypto_auth_hmacsha512256_final","_crypto_auth_hmacsha512256_init","_crypto_auth_hmacsha512256_keybytes","_crypto_auth_hmacsha512256_statebytes","_crypto_auth_hmacsha512256_update","_crypto_auth_hmacsha512256_verify","_crypto_auth_hmacsha512_bytes","_crypto_auth_hmacsha512_final","_crypto_auth_hmacsha512_init","_crypto_auth_hmacsha512_keybytes","_crypto_auth_hmacsha512_statebytes","_crypto_auth_hmacsha512_update","_crypto_auth_hmacsha512_verify","_crypto_auth_keybytes","_crypto_auth_verify","_crypto_box","_crypto_box_afternm","_crypto_box_beforenm","_crypto_box_beforenmbytes","_crypto_box_boxzerobytes","_crypto_box_curve25519xsalsa20poly1305","_crypto_box_curve25519xsalsa20poly1305_afternm","_crypto_box_curve25519xsalsa20poly1305_beforenm","_crypto_box_curve25519xsalsa20poly1305_beforenmbytes","_crypto_box_curve25519xsalsa20poly1305_boxzerobytes","_crypto_box_curve25519xsalsa20poly1305_keypair","_crypto_box_curve25519xsalsa20poly1305_macbytes","_crypto_box_curve25519xsalsa20poly1305_noncebytes","_crypto_box_curve25519xsalsa20poly1305_open","_crypto_box_curve25519xsalsa20poly1305_open_afternm","_crypto_box_curve25519xsalsa20poly1305_publickeybytes","_crypto_box_curve25519xsalsa20poly1305_secretkeybytes","_crypto_box_curve25519xsalsa20poly1305_seed_keypair","_crypto_box_curve25519xsalsa20poly1305_seedbytes","_crypto_box_curve25519xsalsa20poly1305_zerobytes","_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","_crypto_box_open_afternm","_crypto_box_open_detached","_crypto_box_open_detached_afternm","_crypto_box_open_easy","_crypto_box_open_easy_afternm","_crypto_box_primitive","_crypto_box_publickeybytes","_crypto_box_seal","_crypto_box_seal_open","_crypto_box_sealbytes","_crypto_box_secretkeybytes","_crypto_box_seed_keypair","_crypto_box_seedbytes","_crypto_box_zerobytes","_crypto_core_hsalsa20","_crypto_core_hsalsa20_constbytes","_crypto_core_hsalsa20_inputbytes","_crypto_core_hsalsa20_keybytes","_crypto_core_hsalsa20_outputbytes","_crypto_core_salsa20","_crypto_core_salsa20_constbytes","_crypto_core_salsa20_inputbytes","_crypto_core_salsa20_keybytes","_crypto_core_salsa20_outputbytes","_crypto_generichash","_crypto_generichash_blake2b","_crypto_generichash_blake2b_bytes","_crypto_generichash_blake2b_bytes_max","_crypto_generichash_blake2b_bytes_min","_crypto_generichash_blake2b_final","_crypto_generichash_blake2b_init","_crypto_generichash_blake2b_init_salt_personal","_crypto_generichash_blake2b_keybytes","_crypto_generichash_blake2b_keybytes_max","_crypto_generichash_blake2b_keybytes_min","_crypto_generichash_blake2b_personalbytes","_crypto_generichash_blake2b_salt_personal","_crypto_generichash_blake2b_saltbytes","_crypto_generichash_blake2b_statebytes","_crypto_generichash_blake2b_update","_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_primitive","_crypto_generichash_statebytes","_crypto_generichash_update","_crypto_hash","_crypto_hash_bytes","_crypto_hash_primitive","_crypto_hash_sha256","_crypto_hash_sha256_bytes","_crypto_hash_sha256_final","_crypto_hash_sha256_init","_crypto_hash_sha256_statebytes","_crypto_hash_sha256_update","_crypto_hash_sha512","_crypto_hash_sha512_bytes","_crypto_hash_sha512_final","_crypto_hash_sha512_init","_crypto_hash_sha512_statebytes","_crypto_hash_sha512_update","_crypto_onetimeauth","_crypto_onetimeauth_bytes","_crypto_onetimeauth_final","_crypto_onetimeauth_init","_crypto_onetimeauth_keybytes","_crypto_onetimeauth_poly1305","_crypto_onetimeauth_poly1305_bytes","_crypto_onetimeauth_poly1305_final","_crypto_onetimeauth_poly1305_init","_crypto_onetimeauth_poly1305_keybytes","_crypto_onetimeauth_poly1305_update","_crypto_onetimeauth_poly1305_verify","_crypto_onetimeauth_primitive","_crypto_onetimeauth_statebytes","_crypto_onetimeauth_update","_crypto_onetimeauth_verify","_crypto_pwhash","_crypto_pwhash_alg_argon2i13","_crypto_pwhash_alg_default","_crypto_pwhash_argon2i","_crypto_pwhash_argon2i_alg_argon2i13","_crypto_pwhash_argon2i_memlimit_interactive","_crypto_pwhash_argon2i_memlimit_moderate","_crypto_pwhash_argon2i_memlimit_sensitive","_crypto_pwhash_argon2i_opslimit_interactive","_crypto_pwhash_argon2i_opslimit_moderate","_crypto_pwhash_argon2i_opslimit_sensitive","_crypto_pwhash_argon2i_saltbytes","_crypto_pwhash_argon2i_str","_crypto_pwhash_argon2i_str_verify","_crypto_pwhash_argon2i_strbytes","_crypto_pwhash_argon2i_strprefix","_crypto_pwhash_memlimit_interactive","_crypto_pwhash_memlimit_moderate","_crypto_pwhash_memlimit_sensitive","_crypto_pwhash_opslimit_interactive","_crypto_pwhash_opslimit_moderate","_crypto_pwhash_opslimit_sensitive","_crypto_pwhash_primitive","_crypto_pwhash_saltbytes","_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_pwhash_str","_crypto_pwhash_str_verify","_crypto_pwhash_strbytes","_crypto_pwhash_strprefix","_crypto_scalarmult","_crypto_scalarmult_base","_crypto_scalarmult_bytes","_crypto_scalarmult_curve25519","_crypto_scalarmult_curve25519_base","_crypto_scalarmult_curve25519_bytes","_crypto_scalarmult_curve25519_scalarbytes","_crypto_scalarmult_primitive","_crypto_scalarmult_scalarbytes","_crypto_secretbox","_crypto_secretbox_boxzerobytes","_crypto_secretbox_detached","_crypto_secretbox_easy","_crypto_secretbox_keybytes","_crypto_secretbox_macbytes","_crypto_secretbox_noncebytes","_crypto_secretbox_open","_crypto_secretbox_open_detached","_crypto_secretbox_open_easy","_crypto_secretbox_primitive","_crypto_secretbox_xsalsa20poly1305","_crypto_secretbox_xsalsa20poly1305_boxzerobytes","_crypto_secretbox_xsalsa20poly1305_keybytes","_crypto_secretbox_xsalsa20poly1305_macbytes","_crypto_secretbox_xsalsa20poly1305_noncebytes","_crypto_secretbox_xsalsa20poly1305_open","_crypto_secretbox_xsalsa20poly1305_zerobytes","_crypto_secretbox_zerobytes","_crypto_shorthash","_crypto_shorthash_bytes","_crypto_shorthash_keybytes","_crypto_shorthash_primitive","_crypto_shorthash_siphash24","_crypto_shorthash_siphash24_bytes","_crypto_shorthash_siphash24_keybytes","_crypto_sign","_crypto_sign_bytes","_crypto_sign_detached","_crypto_sign_ed25519","_crypto_sign_ed25519_bytes","_crypto_sign_ed25519_detached","_crypto_sign_ed25519_keypair","_crypto_sign_ed25519_open","_crypto_sign_ed25519_pk_to_curve25519","_crypto_sign_ed25519_publickeybytes","_crypto_sign_ed25519_secretkeybytes","_crypto_sign_ed25519_seed_keypair","_crypto_sign_ed25519_seedbytes","_crypto_sign_ed25519_sk_to_curve25519","_crypto_sign_ed25519_sk_to_pk","_crypto_sign_ed25519_sk_to_seed","_crypto_sign_ed25519_verify_detached","_crypto_sign_keypair","_crypto_sign_open","_crypto_sign_primitive","_crypto_sign_publickeybytes","_crypto_sign_secretkeybytes","_crypto_sign_seed_keypair","_crypto_sign_seedbytes","_crypto_sign_verify_detached","_crypto_stream","_crypto_stream_chacha20","_crypto_stream_chacha20_ietf","_crypto_stream_chacha20_ietf_noncebytes","_crypto_stream_chacha20_ietf_xor","_crypto_stream_chacha20_ietf_xor_ic","_crypto_stream_chacha20_keybytes","_crypto_stream_chacha20_noncebytes","_crypto_stream_chacha20_xor","_crypto_stream_chacha20_xor_ic","_crypto_stream_keybytes","_crypto_stream_noncebytes","_crypto_stream_primitive","_crypto_stream_salsa20","_crypto_stream_salsa20_keybytes","_crypto_stream_salsa20_noncebytes","_crypto_stream_salsa20_xor","_crypto_stream_salsa20_xor_ic","_crypto_stream_xor","_crypto_stream_xsalsa20","_crypto_stream_xsalsa20_keybytes","_crypto_stream_xsalsa20_noncebytes","_crypto_stream_xsalsa20_xor","_crypto_stream_xsalsa20_xor_ic","_crypto_verify_16","_crypto_verify_16_bytes","_crypto_verify_32","_crypto_verify_32_bytes","_crypto_verify_64","_crypto_verify_64_bytes","_randombytes","_randombytes_buf","_randombytes_close","_randombytes_implementation_name","_randombytes_random","_randombytes_stir","_randombytes_uniform","_sodium_bin2hex","_sodium_hex2bin","_sodium_init","_sodium_library_version_major","_sodium_library_version_minor","_sodium_version_string"]'
-export TOTAL_MEMORY=50000000
-export LDFLAGS="-s TOTAL_MEMORY=${TOTAL_MEMORY} -s RESERVED_FUNCTION_POINTERS=8 -s NO_DYNAMIC_EXECUTION=1 -s RUNNING_JS_OPTS=1"
+export TOTAL_MEMORY=131072
+export TOTAL_MEMORY_SUMO=35000000
+export LDFLAGS="-s RESERVED_FUNCTION_POINTERS=8"
+export LDFLAGS="${LDFLAGS} -s NO_DYNAMIC_EXECUTION=1 -s RUNNING_JS_OPTS=1 -s ASSERTIONS=0"
+export LDFLAGS="${LDFLAGS} -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ALIASING_FUNCTION_POINTERS=1"
+export LDFLAGS="${LDFLAGS} -s FUNCTION_POINTER_ALIGNMENT=1 -s DISABLE_EXCEPTION_CATCHING=1"
+export LDFLAGS="${LDFLAGS} -s ELIMINATE_DUPLICATE_FUNCTIONS=1"
+export LDFLAGS_DIST="-s NO_FILESYSTEM=1"
+export CFLAGS="-Os"
 
-export EXPORTED_FUNCTIONS="$EXPORTED_FUNCTIONS_STANDARD"
-if [ "x$1" = "x--sumo" ]; then
+echo
+if [ "x$1" = "x--standard" ]; then
+  echo "Building a standard distribution in ${PREFIX}"
+  export EXPORTED_FUNCTIONS="$EXPORTED_FUNCTIONS_STANDARD"
+  export LDFLAGS="${LDFLAGS} ${LDFLAGS_DIST} -s TOTAL_MEMORY=${TOTAL_MEMORY}"
+  export PREFIX="$(pwd)/libsodium-js"
+  export DONE_FILE="$(pwd)/js.done"
+  export DIST='yes'
+elif [ "x$1" = "x--sumo" ]; then
+  echo "Building a sumo distribution in ${PREFIX}"
   export EXPORTED_FUNCTIONS="$EXPORTED_FUNCTIONS_SUMO"
-fi
-export JS_EXPORTS_FLAGS="-s EXPORTED_FUNCTIONS=${EXPORTED_FUNCTIONS}"
-
-if [ "x$1" = "x--browser-tests" ]; then
+  export LDFLAGS="${LDFLAGS} ${LDFLAGS_DIST} -s TOTAL_MEMORY=${TOTAL_MEMORY_SUMO}"
+  export PREFIX="$(pwd)/libsodium-js-sumo"
+  export DONE_FILE="$(pwd)/js-sumo.done"
+  export DIST='yes'
+elif [ "x$1" = "x--browser-tests" ]; then
+  echo "Building tests for web browsers"
+  export EXPORTED_FUNCTIONS="$EXPORTED_FUNCTIONS_SUMO"
+  export LDFLAGS="${LDFLAGS} -s TOTAL_MEMORY=${TOTAL_MEMORY_SUMO}"
+  export PREFIX="$(pwd)/libsodium-js-tests"
+  export DONE_FILE="$(pwd)/js-tests-browser.done"
   export BROWSER_TESTS='yes'
-fi
-
-if [ "x$BROWSER_TESTS" != "x" ]; then
-  echo "Tests will be built to be run in a web browser"
-  rm -f test/browser-js.done
+  export DIST='no'
+elif [ "x$1" = "x--tests" ]; then
+  echo "Building for testing"
+  export EXPORTED_FUNCTIONS="$EXPORTED_FUNCTIONS_SUMO"
+  export LDFLAGS="${LDFLAGS} -s TOTAL_MEMORY=${TOTAL_MEMORY_SUMO}"
+  export PREFIX="$(pwd)/libsodium-js-tests"
+  export DONE_FILE="$(pwd)/js-tests.done"
+  export DIST='no'
 else
-  rm -f test/js.done
+  echo "Usage: $0 <build_type>"
+  echo "<build_type> := --standard | --sumo | --browser-tests | --tests"
+  echo
+  exit 1
 fi
+export JS_EXPORTS_FLAGS="-s EXPORTED_FUNCTIONS=${EXPORTED_FUNCTIONS}"
+
+rm -f "$DONE_FILE"
 
+echo
 emconfigure ./configure --enable-minimal --disable-shared --prefix="$PREFIX" \
-  CFLAGS="-O3" && \
-emmake make clean && \
-emmake make $MAKE_FLAGS install V=1 && \
-emcc -O3 --llvm-lto 1 --memory-init-file 0 $CPPFLAGS $LDFLAGS $JS_EXPORTS_FLAGS \
-  "${PREFIX}/lib/libsodium.a" -o "${PREFIX}/lib/libsodium.js" || exit 1
+                        --without-pthreads CFLAGS="$CFLAGS" && \
+emmake make clean
+[ $? = 0 ] || exit 1
+
+if [ "$DIST" = yes ]; then
+  emmake make $MAKE_FLAGS install && \
+  emcc "$CFLAGS" --llvm-lto 1 --memory-init-file 0 $CPPFLAGS $LDFLAGS $JS_EXPORTS_FLAGS \
+    "${PREFIX}/lib/libsodium.a" -o "${PREFIX}/lib/libsodium.js" || exit 1
+  touch -r "${PREFIX}/lib/libsodium.js" "$DONE_FILE"
+  ls -l "${PREFIX}/lib/libsodium.js"
+  exit 0
+fi
 
 if test "x$NODE" = x; then
   for candidate in node nodejs; do
@@ -41,18 +78,15 @@ if test "x$NODE" = x; then
   done
 fi
 
-if test "x$NODE" = x; then
-  echo 'node.js not found - test suite skipped' >&2
-  exit 1
-fi
-
-echo "Using [${NODE}] as a Javascript runtime"
-
 if [ "x$BROWSER_TESTS" != "x" ]; then
   echo 'Compiling the test suite for web browsers...' && \
-    emmake make $MAKE_FLAGS CPPFLAGS="$CPPFLAGS -DBROWSER_TESTS=1" check \
-      > /dev/null 2>&1
+    emmake make $MAKE_FLAGS CPPFLAGS="$CPPFLAGS -DBROWSER_TESTS=1" check > /dev/null 2>&1
 else
+  if test "x$NODE" = x; then
+    echo 'node.js not found - test suite skipped' >&2
+    exit 1
+  fi
+  echo "Using [${NODE}] as a Javascript runtime"
   echo 'Compiling the test suite...' && \
     emmake make $MAKE_FLAGS check > /dev/null 2>&1
 fi
@@ -64,13 +98,13 @@ if [ "x$BROWSER_TESTS" != "x" ]; then
     mkdir -p browser && \
     rm -f browser/tests.txt && \
     for file in *.js; do
-      fgrep -v "#! /usr/bin/env {NODE}" "$file" > "browser/${file}"
+      fgrep -v "#! /usr/bin/env ${NODE}" "$file" > "browser/${file}"
       tname=$(echo "$file" | sed 's/.js$//')
       cp -f "${tname}.exp" "browser/${tname}.exp"
       sed "s/{{tname}}/${tname}/" index.html.tpl > "browser/${tname}.html"
       echo "${tname}.html" >> "browser/tests.txt"
     done
-    touch -r "${PREFIX}/lib/libsodium.js" ../browser-js.done
+    touch "$DONE_FILE"
   )
 else
   echo 'Running the test suite'
@@ -78,13 +112,13 @@ else
     cd test/default && \
     for file in *.js; do
       echo "#! /usr/bin/env ${NODE}" > "${file}.tmp"
-      fgrep -v "#! /usr/bin/env {NODE}" "$file" >> "${file}.tmp"
+      fgrep -v "#! /usr/bin/env ${NODE}" "$file" >> "${file}.tmp"
       chmod +x "${file}.tmp"
       mv -f "${file}.tmp" "$file"
     done
   )
-  make $MAKE_FLAGS check || exit 1
-  touch -r "${PREFIX}/lib/libsodium.js" test/js.done
+  time make $MAKE_FLAGS check || exit 1
+  touch "$DONE_FILE"
 fi
 
 echo 'Done.'