rbnacl-libsodium 1.0.13 → 1.0.15

data/vendor/libsodium/configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.65])
-AC_INIT([libsodium],[1.0.13],
+AC_INIT([libsodium],[1.0.15],
   [https://github.com/jedisct1/libsodium/issues],
   [libsodium],
   [https://github.com/jedisct1/libsodium])
@@ -16,10 +16,10 @@ AC_SUBST(VERSION)
 ISODATE=`date +%Y-%m-%d`
 AC_SUBST(ISODATE)
 
-SODIUM_LIBRARY_VERSION_MAJOR=9
-SODIUM_LIBRARY_VERSION_MINOR=5
+SODIUM_LIBRARY_VERSION_MAJOR=10
+SODIUM_LIBRARY_VERSION_MINOR=0
 DLL_VERSION=8
-SODIUM_LIBRARY_VERSION=21:0:3
+SODIUM_LIBRARY_VERSION=23:0:0
 #                       | | |
 #                +------+ | +---+
 #                |        |     |
@@ -74,8 +74,14 @@ AC_ARG_ENABLE(asm,
 ])
 
 AS_IF([test "x$EMSCRIPTEN" != "x"], [
-  enable_asm="no"
-  AC_MSG_WARN([compiling to JavaScript - asm implementations disabled])
+  AX_CHECK_COMPILE_FLAG([-s ASSERTIONS=0], [
+    enable_asm="no"
+    AC_MSG_WARN([compiling to JavaScript - asm implementations disabled])
+  ], [
+    AC_MSG_WARN([EMSCRIPTEN environment variable defined, but emcc doesn't appear to be used - Assuming compilation to native code])
+    CFLAGS="$CFLAGS -U__EMSCRIPTEN__"
+    unset EMSCRIPTEN
+  ])
 ])
 AS_IF([test "$host_os" = "nacl" -o "$host_os" = "pnacl"], [
   enable_asm="no"
@@ -151,7 +157,7 @@ AC_ARG_ENABLE(debug,
       done
       CFLAGS="$nxflags -O0 -g3"
     ])
-    CPPFLAGS="$CPPFLAGS -DDEBUG=1"
+    CPPFLAGS="$CPPFLAGS -DDEBUG=1 -UFORTIFY_SOURCE"
   ])
 ])
 
@@ -236,6 +242,13 @@ AS_CASE([$host_os],
     AX_CHECK_LINK_FLAG([-Wl,--nxcompat], [LDFLAGS="$LDFLAGS -Wl,--nxcompat"])
   ])
 
+AS_CASE([$host_os],
+  [cygwin*|mingw*|msys|pw32*|cegcc*], [
+    AX_CHECK_COMPILE_FLAG([-fno-asynchronous-unwind-tables], [
+      [CFLAGS="$CFLAGS -fno-asynchronous-unwind-tables"]
+    ])
+])
+
 AS_IF([test "x$enable_ssp" != "xno"],[
 
 AS_CASE([$host_os],
@@ -261,7 +274,7 @@ AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wextra], [CWFLAGS="$CWFLAGS -Wextra"])
 AC_MSG_CHECKING(for clang)
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
 #ifndef __clang__
-be sad
+#error Not clang
 #endif
 ]])],
   [AC_MSG_RESULT(yes)
@@ -280,22 +293,37 @@ AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wformat=2], [CWFLAGS="$CWFLAGS -Wformat=2"])
 AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wmissing-declarations], [CWFLAGS="$CWFLAGS -Wmissing-declarations"])
 AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wmissing-prototypes], [CWFLAGS="$CWFLAGS -Wmissing-prototypes"])
 AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wnested-externs], [CWFLAGS="$CWFLAGS -Wnested-externs"])
+AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wno-type-limits], [CWFLAGS="$CWFLAGS -Wno-type-limits"])
 AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wno-unknown-pragmas], [CWFLAGS="$CWFLAGS -Wno-unknown-pragmas"])
 AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wnormalized=id], [CWFLAGS="$CWFLAGS -Wnormalized=id"])
 AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wnull-dereference], [CWFLAGS="$CWFLAGS -Wnull-dereference"])
+AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wold-style-declaration], [CWFLAGS="$CWFLAGS -Wold-style-declaration"])
 AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wpointer-arith], [CWFLAGS="$CWFLAGS -Wpointer-arith"])
 AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wredundant-decls], [CWFLAGS="$CWFLAGS -Wredundant-decls"])
 AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wshorten-64-to-32], [CWFLAGS="$CWFLAGS -Wshorten-64-to-32"])
 AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wstrict-prototypes], [CWFLAGS="$CWFLAGS -Wstrict-prototypes"])
 AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wswitch-enum], [CWFLAGS="$CWFLAGS -Wswitch-enum"])
 AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wvariable-decl], [CWFLAGS="$CWFLAGS -Wvariable-decl"])
-AX_CHECK_COMPILE_FLAG([$CWFLAGS -Wno-type-limits], [CWFLAGS="$CWFLAGS -Wno-type-limits"])
 
 AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"])
 AX_CHECK_LINK_FLAG([-Wl,-z,now], [LDFLAGS="$LDFLAGS -Wl,-z,now"])
 AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"])
 
+AC_MSG_CHECKING(for a broken clang + AVX512 combination)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
+#if !(defined(__AVX512F__) && defined(__clang__) && __clang_major__ < 4)
+#error Not a broken clang + AVX512 combination
+#endif
+]])],
+  [AC_MSG_RESULT(yes - disabling AVX512 optimizations)
+   AX_CHECK_COMPILE_FLAG([$CFLAGS -mno-avx512f],
+     [CFLAGS="$CFLAGS -mno-avx512f"])
+  ],
+  [AC_MSG_RESULT(no)
+])
+
 AX_CHECK_CATCHABLE_SEGV
+AX_CHECK_CATCHABLE_ABRT
 
 LT_INIT
 AC_SUBST(LIBTOOL_DEPS)
@@ -426,6 +454,25 @@ return _mm256_movemask_ps(_mm256_cmp_ps(x, y, _CMP_NEQ_OQ));
     [AC_MSG_RESULT(no)])
   CFLAGS="$oldcflags"
 
+  oldcflags="$CFLAGS"
+  AX_CHECK_COMPILE_FLAG([-mavx512f], [CFLAGS="$CFLAGS -mavx512f"])
+  AC_MSG_CHECKING(for AVX512F instructions set)
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#ifdef __native_client__
+# error NativeClient detected - Avoiding AVX512F opcodes
+#endif
+#pragma GCC target("avx512f")
+#include <immintrin.h>
+]], [[
+__m512i x = _mm512_setzero_epi32();
+__m512i y = _mm512_permutexvar_epi64(_mm512_setr_epi64(0, 1, 4, 5, 2, 3, 6, 7), x);
+]])],
+    [AC_MSG_RESULT(yes)
+     AC_DEFINE([HAVE_AVX512FINTRIN_H], [1], [AVX512F is available])
+     AX_CHECK_COMPILE_FLAG([-mavx512f], [CFLAGS_AVX512F="-mavx512f"])],
+    [AC_MSG_RESULT(no)])
+  CFLAGS="$oldcflags"
+
   oldcflags="$CFLAGS"
   AX_CHECK_COMPILE_FLAG([-maes], [CFLAGS="$CFLAGS -maes"])
   AX_CHECK_COMPILE_FLAG([-mpclmul], [CFLAGS="$CFLAGS -mpclmul"])
@@ -456,6 +503,7 @@ AC_SUBST(CFLAGS_SSSE3)
 AC_SUBST(CFLAGS_SSE41)
 AC_SUBST(CFLAGS_AVX)
 AC_SUBST(CFLAGS_AVX2)
+AC_SUBST(CFLAGS_AVX512F)
 AC_SUBST(CFLAGS_AESNI)
 AC_SUBST(CFLAGS_PCLMUL)
 
@@ -686,7 +734,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 nanosleep])
+  AC_CHECK_FUNCS([mmap mlock madvise mprotect memset_s explicit_bzero nanosleep])
 ])
 AC_CHECK_FUNCS([posix_memalign getpid])
 
@@ -718,6 +766,7 @@ AH_VERBATIM([NDEBUG], [/* Always evaluate assert() calls */
 #endif])
 
 AC_CONFIG_FILES([Makefile
+                 builds/Makefile
                  contrib/Makefile
                  dist-build/Makefile
                  libsodium.pc

data/vendor/libsodium/contrib/Findsodium.cmake

@@ -130,6 +130,7 @@ elseif (WIN32)
             PATH_SUFFIXES ${_RELEASE_PATH_SUFFIX}
         )
         if (NOT sodium_USE_STATIC_LIBS)
+            set(CMAKE_FIND_LIBRARY_SUFFIXES_BCK ${CMAKE_FIND_LIBRARY_SUFFIXES})
             set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
             find_library(sodium_DLL_DEBUG libsodium
                 HINTS ${sodium_DIR}
@@ -139,6 +140,7 @@ elseif (WIN32)
                 HINTS ${sodium_DIR}
                 PATH_SUFFIXES ${_RELEASE_PATH_SUFFIX}
             )
+            set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BCK})
         endif()
 
     elseif(_GCC_COMPATIBLE)

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

@@ -11,6 +11,7 @@ _crypto_aead_aes256gcm_encrypt_detached_afternm 0 0
 _crypto_aead_aes256gcm_is_available 0 0
 _crypto_aead_aes256gcm_keybytes 0 0
 _crypto_aead_aes256gcm_keygen 0 0
+_crypto_aead_aes256gcm_messagebytes_max 0 0
 _crypto_aead_aes256gcm_npubbytes 0 0
 _crypto_aead_aes256gcm_nsecbytes 0 0
 _crypto_aead_aes256gcm_statebytes 0 0
@@ -25,13 +26,15 @@ _crypto_aead_chacha20poly1305_ietf_decrypt_detached 1 1
 _crypto_aead_chacha20poly1305_ietf_encrypt 1 1
 _crypto_aead_chacha20poly1305_ietf_encrypt_detached 1 1
 _crypto_aead_chacha20poly1305_ietf_keybytes 1 1
+_crypto_aead_chacha20poly1305_ietf_keygen 1 1
+_crypto_aead_chacha20poly1305_ietf_messagebytes_max 0 0
 _crypto_aead_chacha20poly1305_ietf_npubbytes 1 1
 _crypto_aead_chacha20poly1305_ietf_nsecbytes 1 1
 _crypto_aead_chacha20poly1305_keybytes 1 1
+_crypto_aead_chacha20poly1305_keygen 1 1
+_crypto_aead_chacha20poly1305_messagebytes_max 0 0
 _crypto_aead_chacha20poly1305_npubbytes 1 1
 _crypto_aead_chacha20poly1305_nsecbytes 1 1
-_crypto_aead_chacha20poly1305_ietf_keygen 1 1
-_crypto_aead_chacha20poly1305_keygen 1 1
 _crypto_aead_xchacha20poly1305_ietf_abytes 1 1
 _crypto_aead_xchacha20poly1305_ietf_decrypt 1 1
 _crypto_aead_xchacha20poly1305_ietf_decrypt_detached 1 1
@@ -39,6 +42,7 @@ _crypto_aead_xchacha20poly1305_ietf_encrypt 1 1
 _crypto_aead_xchacha20poly1305_ietf_encrypt_detached 1 1
 _crypto_aead_xchacha20poly1305_ietf_keybytes 1 1
 _crypto_aead_xchacha20poly1305_ietf_keygen 1 1
+_crypto_aead_xchacha20poly1305_ietf_messagebytes_max 0 0
 _crypto_aead_xchacha20poly1305_ietf_npubbytes 1 1
 _crypto_aead_xchacha20poly1305_ietf_nsecbytes 1 1
 _crypto_auth 1 1
@@ -87,6 +91,7 @@ _crypto_box_curve25519xchacha20poly1305_easy 0 1
 _crypto_box_curve25519xchacha20poly1305_easy_afternm 0 1
 _crypto_box_curve25519xchacha20poly1305_keypair 0 1
 _crypto_box_curve25519xchacha20poly1305_macbytes 0 1
+_crypto_box_curve25519xchacha20poly1305_messagebytes_max 0 0
 _crypto_box_curve25519xchacha20poly1305_noncebytes 0 1
 _crypto_box_curve25519xchacha20poly1305_open_detached 0 1
 _crypto_box_curve25519xchacha20poly1305_open_detached_afternm 0 1
@@ -106,6 +111,7 @@ _crypto_box_curve25519xsalsa20poly1305_beforenmbytes 0 1
 _crypto_box_curve25519xsalsa20poly1305_boxzerobytes 0 1
 _crypto_box_curve25519xsalsa20poly1305_keypair 0 1
 _crypto_box_curve25519xsalsa20poly1305_macbytes 0 1
+_crypto_box_curve25519xsalsa20poly1305_messagebytes_max 0 0
 _crypto_box_curve25519xsalsa20poly1305_noncebytes 0 1
 _crypto_box_curve25519xsalsa20poly1305_open 0 1
 _crypto_box_curve25519xsalsa20poly1305_open_afternm 0 1
@@ -120,6 +126,7 @@ _crypto_box_easy 1 1
 _crypto_box_easy_afternm 1 1
 _crypto_box_keypair 1 1
 _crypto_box_macbytes 1 1
+_crypto_box_messagebytes_max 0 0
 _crypto_box_noncebytes 1 1
 _crypto_box_open 0 1
 _crypto_box_open_afternm 0 1
@@ -247,29 +254,30 @@ _crypto_onetimeauth_update 0 1
 _crypto_onetimeauth_verify 0 1
 _crypto_pwhash 0 1
 _crypto_pwhash_alg_argon2i13 0 1
+_crypto_pwhash_alg_argon2id13 0 1
 _crypto_pwhash_alg_default 0 1
 _crypto_pwhash_argon2i 0 1
 _crypto_pwhash_argon2i_alg_argon2i13 0 1
 _crypto_pwhash_argon2i_bytes_max 0 1
 _crypto_pwhash_argon2i_bytes_min 0 1
 _crypto_pwhash_argon2i_memlimit_interactive 0 1
-_crypto_pwhash_argon2i_memlimit_moderate 0 1
-_crypto_pwhash_argon2i_memlimit_sensitive 0 1
 _crypto_pwhash_argon2i_memlimit_max 0 1
 _crypto_pwhash_argon2i_memlimit_min 0 1
+_crypto_pwhash_argon2i_memlimit_moderate 0 1
+_crypto_pwhash_argon2i_memlimit_sensitive 0 1
 _crypto_pwhash_argon2i_opslimit_interactive 0 1
-_crypto_pwhash_argon2i_opslimit_moderate 0 1
-_crypto_pwhash_argon2i_opslimit_sensitive 0 1
 _crypto_pwhash_argon2i_opslimit_max 0 1
 _crypto_pwhash_argon2i_opslimit_min 0 1
+_crypto_pwhash_argon2i_opslimit_moderate 0 1
+_crypto_pwhash_argon2i_opslimit_sensitive 0 1
 _crypto_pwhash_argon2i_passwd_max 0 1
 _crypto_pwhash_argon2i_passwd_min 0 1
 _crypto_pwhash_argon2i_saltbytes 0 1
 _crypto_pwhash_argon2i_str 0 1
+_crypto_pwhash_argon2i_str_needs_rehash 0 1
 _crypto_pwhash_argon2i_str_verify 0 1
 _crypto_pwhash_argon2i_strbytes 0 1
 _crypto_pwhash_argon2i_strprefix 0 1
-_crypto_pwhash_alg_argon2id13 0 1
 _crypto_pwhash_argon2id 0 1
 _crypto_pwhash_argon2id_alg_argon2id13 0 1
 _crypto_pwhash_argon2id_bytes_max 0 1
@@ -288,45 +296,49 @@ _crypto_pwhash_argon2id_passwd_max 0 1
 _crypto_pwhash_argon2id_passwd_min 0 1
 _crypto_pwhash_argon2id_saltbytes 0 1
 _crypto_pwhash_argon2id_str 0 1
+_crypto_pwhash_argon2id_str_needs_rehash 0 1
 _crypto_pwhash_argon2id_str_verify 0 1
 _crypto_pwhash_argon2id_strbytes 0 1
 _crypto_pwhash_argon2id_strprefix 0 1
-_crypto_pwhash_bytes_max 1 1
-_crypto_pwhash_bytes_min 1 1
+_crypto_pwhash_bytes_max 0 1
+_crypto_pwhash_bytes_min 0 1
 _crypto_pwhash_memlimit_interactive 0 1
-_crypto_pwhash_memlimit_max 1 1
-_crypto_pwhash_memlimit_min 1 1
+_crypto_pwhash_memlimit_max 0 1
+_crypto_pwhash_memlimit_min 0 1
 _crypto_pwhash_memlimit_moderate 0 1
 _crypto_pwhash_memlimit_sensitive 0 1
 _crypto_pwhash_opslimit_interactive 0 1
-_crypto_pwhash_opslimit_max 1 1
-_crypto_pwhash_opslimit_min 1 1
+_crypto_pwhash_opslimit_max 0 1
+_crypto_pwhash_opslimit_min 0 1
 _crypto_pwhash_opslimit_moderate 0 1
 _crypto_pwhash_opslimit_sensitive 0 1
-_crypto_pwhash_passwd_max 1 1
-_crypto_pwhash_passwd_min 1 1
+_crypto_pwhash_passwd_max 0 1
+_crypto_pwhash_passwd_min 0 1
 _crypto_pwhash_primitive 0 1
 _crypto_pwhash_saltbytes 0 1
 _crypto_pwhash_scryptsalsa208sha256 0 1
+_crypto_pwhash_scryptsalsa208sha256_bytes_max 0 1
+_crypto_pwhash_scryptsalsa208sha256_bytes_min 0 1
 _crypto_pwhash_scryptsalsa208sha256_ll 0 1
 _crypto_pwhash_scryptsalsa208sha256_memlimit_interactive 0 1
+_crypto_pwhash_scryptsalsa208sha256_memlimit_max 0 1
+_crypto_pwhash_scryptsalsa208sha256_memlimit_min 0 1
 _crypto_pwhash_scryptsalsa208sha256_memlimit_sensitive 0 1
 _crypto_pwhash_scryptsalsa208sha256_opslimit_interactive 0 1
+_crypto_pwhash_scryptsalsa208sha256_opslimit_max 0 1
+_crypto_pwhash_scryptsalsa208sha256_opslimit_min 0 1
 _crypto_pwhash_scryptsalsa208sha256_opslimit_sensitive 0 1
+_crypto_pwhash_scryptsalsa208sha256_passwd_max 0 1
+_crypto_pwhash_scryptsalsa208sha256_passwd_min 0 1
 _crypto_pwhash_scryptsalsa208sha256_saltbytes 0 1
 _crypto_pwhash_scryptsalsa208sha256_str 0 1
+_crypto_pwhash_scryptsalsa208sha256_str_needs_rehash 0 1
 _crypto_pwhash_scryptsalsa208sha256_str_verify 0 1
 _crypto_pwhash_scryptsalsa208sha256_strbytes 0 1
 _crypto_pwhash_scryptsalsa208sha256_strprefix 0 1
-_crypto_pwhash_scryptsalsa208sha256_bytes_max 0 1
-_crypto_pwhash_scryptsalsa208sha256_bytes_min 0 1
-_crypto_pwhash_scryptsalsa208sha256_memlimit_max 0 1
-_crypto_pwhash_scryptsalsa208sha256_memlimit_min 0 1
-_crypto_pwhash_scryptsalsa208sha256_opslimit_max 0 1
-_crypto_pwhash_scryptsalsa208sha256_opslimit_min 0 1
-_crypto_pwhash_scryptsalsa208sha256_passwd_max 0 1
-_crypto_pwhash_scryptsalsa208sha256_passwd_min 0 1
 _crypto_pwhash_str 0 1
+_crypto_pwhash_str_alg 0 1
+_crypto_pwhash_str_needs_rehash 0 1
 _crypto_pwhash_str_verify 0 1
 _crypto_pwhash_strbytes 0 1
 _crypto_pwhash_strprefix 0 1
@@ -346,6 +358,7 @@ _crypto_secretbox_easy 1 1
 _crypto_secretbox_keybytes 1 1
 _crypto_secretbox_keygen 1 1
 _crypto_secretbox_macbytes 1 1
+_crypto_secretbox_messagebytes_max 0 0
 _crypto_secretbox_noncebytes 1 1
 _crypto_secretbox_open 0 1
 _crypto_secretbox_open_detached 1 1
@@ -355,18 +368,35 @@ _crypto_secretbox_xchacha20poly1305_detached 0 1
 _crypto_secretbox_xchacha20poly1305_easy 0 1
 _crypto_secretbox_xchacha20poly1305_keybytes 0 1
 _crypto_secretbox_xchacha20poly1305_macbytes 0 1
+_crypto_secretbox_xchacha20poly1305_messagebytes_max 0 0
 _crypto_secretbox_xchacha20poly1305_noncebytes 0 1
 _crypto_secretbox_xchacha20poly1305_open_detached 0 1
 _crypto_secretbox_xchacha20poly1305_open_easy 0 1
 _crypto_secretbox_xsalsa20poly1305 0 1
 _crypto_secretbox_xsalsa20poly1305_boxzerobytes 0 1
 _crypto_secretbox_xsalsa20poly1305_keybytes 0 1
+_crypto_secretbox_xsalsa20poly1305_keygen 0 1
 _crypto_secretbox_xsalsa20poly1305_macbytes 0 1
+_crypto_secretbox_xsalsa20poly1305_messagebytes_max 0 0
 _crypto_secretbox_xsalsa20poly1305_noncebytes 0 1
 _crypto_secretbox_xsalsa20poly1305_open 0 1
 _crypto_secretbox_xsalsa20poly1305_zerobytes 0 1
-_crypto_secretbox_xsalsa20poly1305_keygen 0 1
 _crypto_secretbox_zerobytes 0 1
+_crypto_secretstream_xchacha20poly1305_abytes 1 1
+_crypto_secretstream_xchacha20poly1305_init_pull 1 1
+_crypto_secretstream_xchacha20poly1305_init_push 1 1
+_crypto_secretstream_xchacha20poly1305_headerbytes 1 1
+_crypto_secretstream_xchacha20poly1305_keybytes 1 1
+_crypto_secretstream_xchacha20poly1305_keygen 1 1
+_crypto_secretstream_xchacha20poly1305_messagebytes_max 1 1
+_crypto_secretstream_xchacha20poly1305_pull 1 1
+_crypto_secretstream_xchacha20poly1305_push 1 1
+_crypto_secretstream_xchacha20poly1305_rekey 1 1
+_crypto_secretstream_xchacha20poly1305_statebytes 1 1
+_crypto_secretstream_xchacha20poly1305_tag_final 1 1
+_crypto_secretstream_xchacha20poly1305_tag_message 1 1
+_crypto_secretstream_xchacha20poly1305_tag_push 1 1
+_crypto_secretstream_xchacha20poly1305_tag_rekey 1 1
 _crypto_shorthash 1 1
 _crypto_shorthash_bytes 1 1
 _crypto_shorthash_keybytes 1 1
@@ -385,6 +415,7 @@ _crypto_sign_ed25519 0 1
 _crypto_sign_ed25519_bytes 0 1
 _crypto_sign_ed25519_detached 0 1
 _crypto_sign_ed25519_keypair 0 1
+_crypto_sign_ed25519_messagebytes_max 0 0
 _crypto_sign_ed25519_open 0 1
 _crypto_sign_ed25519_pk_to_curve25519 1 1
 _crypto_sign_ed25519_publickeybytes 0 1
@@ -407,6 +438,7 @@ _crypto_sign_final_create 1 1
 _crypto_sign_final_verify 1 1
 _crypto_sign_init 1 1
 _crypto_sign_keypair 1 1
+_crypto_sign_messagebytes_max 0 0
 _crypto_sign_open 1 1
 _crypto_sign_primitive 0 1
 _crypto_sign_publickeybytes 1 1
@@ -417,49 +449,48 @@ _crypto_sign_statebytes 1 1
 _crypto_sign_update 1 1
 _crypto_sign_verify_detached 1 1
 _crypto_stream 0 1
-_crypto_stream_aes128ctr 0 1
-_crypto_stream_aes128ctr_afternm 0 1
-_crypto_stream_aes128ctr_beforenm 0 1
-_crypto_stream_aes128ctr_beforenmbytes 0 1
-_crypto_stream_aes128ctr_keybytes 0 1
-_crypto_stream_aes128ctr_noncebytes 0 1
-_crypto_stream_aes128ctr_xor 0 1
-_crypto_stream_aes128ctr_xor_afternm 0 1
 _crypto_stream_chacha20 0 1
 _crypto_stream_chacha20_ietf 0 1
 _crypto_stream_chacha20_ietf_keybytes 0 1
 _crypto_stream_chacha20_ietf_keygen 0 1
+_crypto_stream_chacha20_ietf_messagebytes_max 0 0
 _crypto_stream_chacha20_ietf_noncebytes 0 1
 _crypto_stream_chacha20_ietf_xor 0 1
 _crypto_stream_chacha20_ietf_xor_ic 0 1
 _crypto_stream_chacha20_keybytes 0 1
 _crypto_stream_chacha20_keygen 0 1
+_crypto_stream_chacha20_messagebytes_max 0 0
 _crypto_stream_chacha20_noncebytes 0 1
 _crypto_stream_chacha20_xor 0 1
 _crypto_stream_chacha20_xor_ic 0 1
 _crypto_stream_keybytes 0 1
 _crypto_stream_keygen 1 1
+_crypto_stream_messagebytes_max 0 0
 _crypto_stream_noncebytes 0 1
 _crypto_stream_primitive 0 1
 _crypto_stream_salsa20 0 1
 _crypto_stream_salsa2012 0 1
 _crypto_stream_salsa2012_keybytes 0 1
 _crypto_stream_salsa2012_keygen 0 1
+_crypto_stream_salsa2012_messagebytes_max 0 0
 _crypto_stream_salsa2012_noncebytes 0 1
 _crypto_stream_salsa2012_xor 0 1
 _crypto_stream_salsa208 0 1
 _crypto_stream_salsa208_keybytes 0 1
 _crypto_stream_salsa208_keygen 0 1
+_crypto_stream_salsa208_messagebytes_max 0 1
 _crypto_stream_salsa208_noncebytes 0 1
 _crypto_stream_salsa208_xor 0 1
 _crypto_stream_salsa20_keybytes 0 1
 _crypto_stream_salsa20_keygen 0 1
+_crypto_stream_salsa20_messagebytes_max 0 0
 _crypto_stream_salsa20_noncebytes 0 1
 _crypto_stream_salsa20_xor 0 1
 _crypto_stream_salsa20_xor_ic 0 1
 _crypto_stream_xchacha20 0 1
 _crypto_stream_xchacha20_keybytes 0 1
 _crypto_stream_xchacha20_keygen 0 1
+_crypto_stream_xchacha20_messagebytes_max 0 0
 _crypto_stream_xchacha20_noncebytes 0 1
 _crypto_stream_xchacha20_xor 0 1
 _crypto_stream_xchacha20_xor_ic 0 1
@@ -467,6 +498,7 @@ _crypto_stream_xor 0 1
 _crypto_stream_xsalsa20 0 1
 _crypto_stream_xsalsa20_keybytes 0 1
 _crypto_stream_xsalsa20_keygen 0 1
+_crypto_stream_xsalsa20_messagebytes_max 0 0
 _crypto_stream_xsalsa20_noncebytes 0 1
 _crypto_stream_xsalsa20_xor 0 1
 _crypto_stream_xsalsa20_xor_ic 0 1
@@ -488,6 +520,9 @@ _randombytes_stir 1 1
 _randombytes_uniform 1 1
 _sodium_add 0 0
 _sodium_allocarray 0 0
+_sodium_base64_encoded_len 1 1
+_sodium_base642bin 1 1
+_sodium_bin2base64 1 1
 _sodium_bin2hex 1 1
 _sodium_compare 0 0
 _sodium_free 0 0
@@ -501,18 +536,23 @@ _sodium_library_version_minor 1 1
 _sodium_malloc 0 0
 _sodium_memcmp 0 0
 _sodium_memzero 0 0
+_sodium_misuse 0 0
 _sodium_mlock 0 0
 _sodium_mprotect_noaccess 0 0
 _sodium_mprotect_readonly 0 0
 _sodium_mprotect_readwrite 0 0
 _sodium_munlock 0 0
+_sodium_pad 1 1
 _sodium_runtime_has_aesni 0 0
 _sodium_runtime_has_avx 0 0
 _sodium_runtime_has_avx2 0 0
+_sodium_runtime_has_avx512f 0 0
 _sodium_runtime_has_neon 0 0
 _sodium_runtime_has_pclmul 0 0
 _sodium_runtime_has_sse2 0 0
 _sodium_runtime_has_sse3 0 0
 _sodium_runtime_has_sse41 0 0
 _sodium_runtime_has_ssse3 0 0
+_sodium_set_misuse_handler 0 0
+_sodium_unpad 1 1
 _sodium_version_string 1 1