rbnacl-libsodium 1.0.11 → 1.0.13

data/vendor/libsodium/src/libsodium/sodium/version.c

@@ -18,3 +18,13 @@ sodium_library_version_minor(void)
 {
     return SODIUM_LIBRARY_VERSION_MINOR;
 }
+
+int
+sodium_library_minimal(void)
+{
+#ifdef SODIUM_LIBRARY_MINIMAL
+    return 1;
+#else
+    return 0;
+#endif
+}

data/vendor/libsodium/test/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -89,7 +89,8 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = test
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_catchable_segv.m4 \
+	$(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 \
@@ -224,6 +225,10 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ENABLE_VALGRIND_drd = @ENABLE_VALGRIND_drd@
+ENABLE_VALGRIND_helgrind = @ENABLE_VALGRIND_helgrind@
+ENABLE_VALGRIND_memcheck = @ENABLE_VALGRIND_memcheck@
+ENABLE_VALGRIND_sgcheck = @ENABLE_VALGRIND_sgcheck@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
@@ -274,6 +279,7 @@ SAFECODE_HOME = @SAFECODE_HOME@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SODIUM_LIBRARY_MINIMAL_DEF = @SODIUM_LIBRARY_MINIMAL_DEF@
 SODIUM_LIBRARY_VERSION = @SODIUM_LIBRARY_VERSION@
 SODIUM_LIBRARY_VERSION_MAJOR = @SODIUM_LIBRARY_VERSION_MAJOR@
 SODIUM_LIBRARY_VERSION_MINOR = @SODIUM_LIBRARY_VERSION_MINOR@
@@ -281,10 +287,6 @@ STRIP = @STRIP@
 TEST_LDFLAGS = @TEST_LDFLAGS@
 VALGRIND = @VALGRIND@
 VALGRIND_ENABLED = @VALGRIND_ENABLED@
-VALGRIND_HAVE_TOOL_drd = @VALGRIND_HAVE_TOOL_drd@
-VALGRIND_HAVE_TOOL_exp_sgcheck = @VALGRIND_HAVE_TOOL_exp_sgcheck@
-VALGRIND_HAVE_TOOL_helgrind = @VALGRIND_HAVE_TOOL_helgrind@
-VALGRIND_HAVE_TOOL_memcheck = @VALGRIND_HAVE_TOOL_memcheck@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -339,6 +341,8 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+valgrind_enabled_tools = @valgrind_enabled_tools@
+valgrind_tools = @valgrind_tools@
 SUBDIRS = \
 	default
 

data/vendor/libsodium/test/default/Makefile.am

@@ -5,6 +5,7 @@ EXTRA_DIST = \
 	pre.js.inc \
 	aead_aes256gcm.exp \
 	aead_chacha20poly1305.exp \
+	aead_xchacha20poly1305.exp \
 	auth.exp \
 	auth2.exp \
 	auth3.exp \
@@ -33,10 +34,14 @@ EXTRA_DIST = \
 	hash.exp \
 	hash2.exp \
 	hash3.exp \
+	kdf.exp \
+	keygen.exp \
+	kx.exp \
 	onetimeauth.exp \
 	onetimeauth2.exp \
 	onetimeauth7.exp \
 	pwhash.exp \
+	pwhash_argon2id.exp \
 	pwhash_scrypt.exp \
 	pwhash_scrypt_ll.exp \
 	randombytes.exp \
@@ -53,6 +58,7 @@ EXTRA_DIST = \
 	secretbox_easy2.exp \
 	shorthash.exp \
 	sign.exp \
+	siphashx24.exp \
 	sodium_core.exp \
 	sodium_utils.exp \
 	sodium_utils2.exp \
@@ -62,11 +68,13 @@ EXTRA_DIST = \
 	stream2.exp \
 	stream3.exp \
 	stream4.exp \
-	verify1.exp
+	verify1.exp \
+	xchacha20.exp
 
 DISTCLEANFILES = \
 	aead_aes256gcm.res \
 	aead_chacha20poly1305.res \
+	aead_xchacha20poly1305.res \
 	auth.res \
 	auth2.res \
 	auth3.res \
@@ -95,10 +103,14 @@ DISTCLEANFILES = \
 	hash.res \
 	hash2.res \
 	hash3.res \
+	kdf.res \
+	keygen.res \
+	kx.res \
 	onetimeauth.res \
 	onetimeauth2.res \
 	onetimeauth7.res \
 	pwhash.res \
+	pwhash_argon2id.res \
 	pwhash_scrypt.res \
 	pwhash_scrypt_ll.res \
 	randombytes.res \
@@ -115,6 +127,7 @@ DISTCLEANFILES = \
 	secretbox_easy2.res \
 	shorthash.res \
 	sign.res \
+	siphashx24.res \
 	sodium_core.res \
 	sodium_utils.res \
 	sodium_utils2.res \
@@ -124,12 +137,14 @@ DISTCLEANFILES = \
 	stream2.res \
 	stream3.res \
 	stream4.res \
-	verify1.res
+	verify1.res \
+	xchacha20.res
 
 if NATIVECLIENT
 CLEANFILES = \
 	aead_aes256gcm.final \
 	aead_chacha20poly1305.final \
+	aead_xchacha20poly1305.final \
 	auth.final \
 	auth2.final \
 	auth3.final \
@@ -158,10 +173,14 @@ CLEANFILES = \
 	hash.final \
 	hash2.final \
 	hash3.final \
+	kdf.final \
+	keygen.final \
+	kx.final \
 	onetimeauth.final \
 	onetimeauth2.final \
 	onetimeauth7.final \
 	pwhash.final \
+	pwhash_argon2id.final \
 	pwhash_scrypt.final \
 	pwhash_scrypt_ll.final \
 	randombytes.final \
@@ -178,6 +197,7 @@ CLEANFILES = \
 	secretbox_easy2.final \
 	shorthash.final \
 	sign.final \
+	siphashx24.final \
 	sodium_core.final \
 	sodium_utils.final \
 	sodium_version.final \
@@ -186,8 +206,10 @@ CLEANFILES = \
 	stream3.final \
 	stream4.final \
 	verify1.final \
+	xchacha20.final \
 	aead_aes256gcm.nexe \
 	aead_chacha20poly1305.nexe \
+	aead_xchacha20poly1305.nexe \
 	auth.nexe \
 	auth2.nexe \
 	auth3.nexe \
@@ -216,10 +238,14 @@ CLEANFILES = \
 	hash.nexe \
 	hash2.nexe \
 	hash3.nexe \
+	kdf.nexe \
+	keygen.nexe \
+	kx.nexe \
 	onetimeauth.nexe \
 	onetimeauth2.nexe \
 	onetimeauth7.nexe \
 	pwhash.nexe \
+	pwhash_argon2id.nexe \
 	pwhash_scrypt.nexe \
 	pwhash_scrypt_ll.nexe \
 	randombytes.nexe \
@@ -236,6 +262,7 @@ CLEANFILES = \
 	secretbox_easy2.nexe \
 	shorthash.nexe \
 	sign.nexe \
+	siphashx24.nexe \
 	sodium_core.nexe \
 	sodium_utils.nexe \
 	sodium_version.nexe \
@@ -243,7 +270,8 @@ CLEANFILES = \
 	stream2.nexe \
 	stream3.nexe \
 	stream4.nexe \
-	verify1.nexe
+	verify1.nexe \
+	xchacha20.nexe
 endif
 
 AM_CPPFLAGS = \
@@ -259,6 +287,7 @@ AM_LDFLAGS = @TEST_LDFLAGS@
 TESTS_TARGETS = \
 	aead_aes256gcm \
 	aead_chacha20poly1305 \
+	aead_xchacha20poly1305 \
 	auth \
 	auth2 \
 	auth3 \
@@ -286,12 +315,14 @@ TESTS_TARGETS = \
 	generichash3 \
 	hash \
 	hash3 \
+	kdf \
+	keygen \
+	kx \
 	onetimeauth \
 	onetimeauth2 \
 	onetimeauth7 \
 	pwhash \
-	pwhash_scrypt \
-	pwhash_scrypt_ll \
+	pwhash_argon2id \
 	randombytes \
 	scalarmult \
 	scalarmult2 \
@@ -336,6 +367,9 @@ aead_aes256gcm_LDADD                  = $(TESTS_LDADD)
 aead_chacha20poly1305_SOURCE          = cmptest.h aead_chacha20poly1305.c
 aead_chacha20poly1305_LDADD           = $(TESTS_LDADD)
 
+aead_xchacha20poly1305_SOURCE         = cmptest.h aead_xchacha20poly1305.c
+aead_xchacha20poly1305_LDADD          = $(TESTS_LDADD)
+
 auth_SOURCE               = cmptest.h auth.c
 auth_LDADD                = $(TESTS_LDADD)
 
@@ -417,6 +451,15 @@ hash_LDADD                = $(TESTS_LDADD)
 hash3_SOURCE              = cmptest.h hash3.c
 hash3_LDADD               = $(TESTS_LDADD)
 
+kdf_SOURCE                = cmptest.h kdf.c
+kdf_LDADD                 = $(TESTS_LDADD)
+
+keygen_SOURCE             = cmptest.h keygen.c
+keygen_LDADD              = $(TESTS_LDADD)
+
+kx_SOURCE                 = cmptest.h kx.c
+kx_LDADD                  = $(TESTS_LDADD)
+
 onetimeauth_SOURCE        = cmptest.h onetimeauth.c
 onetimeauth_LDADD         = $(TESTS_LDADD)
 
@@ -429,6 +472,9 @@ onetimeauth7_LDADD        = $(TESTS_LDADD)
 pwhash_SOURCE             = cmptest.h pwhash.c
 pwhash_LDADD              = $(TESTS_LDADD)
 
+pwhash_argon2id_SOURCE    = cmptest.h pwhash_argon2id.c
+pwhash_argon2id_LDADD     = $(TESTS_LDADD)
+
 pwhash_scrypt_SOURCE      = cmptest.h pwhash_scrypt.c
 pwhash_scrypt_LDADD       = $(TESTS_LDADD)
 
@@ -477,6 +523,9 @@ shorthash_LDADD           = $(TESTS_LDADD)
 sign_SOURCE               = cmptest.h sign.c
 sign_LDADD                = $(TESTS_LDADD)
 
+siphashx24_SOURCE         = cmptest.h siphashx24.c
+siphashx24_LDADD          = $(TESTS_LDADD)
+
 sodium_core_SOURCE        = cmptest.h sodium_core.c
 sodium_core_LDADD         = $(TESTS_LDADD)
 
@@ -507,6 +556,17 @@ stream4_LDADD             = $(TESTS_LDADD)
 verify1_SOURCE            = cmptest.h verify1.c
 verify1_LDADD             = $(TESTS_LDADD)
 
+xchacha20_SOURCE          = cmptest.h xchacha20.c
+xchacha20_LDADD           = $(TESTS_LDADD)
+
+if !MINIMAL
+TESTS_TARGETS += \
+	pwhash_scrypt \
+	pwhash_scrypt_ll \
+	siphashx24 \
+	xchacha20
+endif
+
 if NATIVECLIENT
 LOG_COMPILER = ./nacl-test-wrapper.sh
 endif

data/vendor/libsodium/test/default/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -91,11 +91,18 @@ host_triplet = @host@
 @EMSCRIPTEN_FALSE@@NATIVECLIENT_FALSE@	sodium_utils2 \
 @EMSCRIPTEN_FALSE@@NATIVECLIENT_FALSE@	sodium_utils3
 
-check_PROGRAMS = $(am__EXEEXT_2)
-TESTS = $(am__EXEEXT_2)
+check_PROGRAMS = $(am__EXEEXT_3)
+TESTS = $(am__EXEEXT_3)
+@MINIMAL_FALSE@am__append_2 = \
+@MINIMAL_FALSE@	pwhash_scrypt \
+@MINIMAL_FALSE@	pwhash_scrypt_ll \
+@MINIMAL_FALSE@	siphashx24 \
+@MINIMAL_FALSE@	xchacha20
+
 subdir = test/default
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_catchable_segv.m4 \
+	$(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 \
@@ -113,26 +120,30 @@ CONFIG_CLEAN_VPATH_FILES =
 @EMSCRIPTEN_FALSE@@NATIVECLIENT_FALSE@am__EXEEXT_1 =  \
 @EMSCRIPTEN_FALSE@@NATIVECLIENT_FALSE@	sodium_utils2$(EXEEXT) \
 @EMSCRIPTEN_FALSE@@NATIVECLIENT_FALSE@	sodium_utils3$(EXEEXT)
-am__EXEEXT_2 = aead_aes256gcm$(EXEEXT) aead_chacha20poly1305$(EXEEXT) \
-	auth$(EXEEXT) auth2$(EXEEXT) auth3$(EXEEXT) auth5$(EXEEXT) \
-	auth6$(EXEEXT) auth7$(EXEEXT) box$(EXEEXT) box2$(EXEEXT) \
-	box7$(EXEEXT) box8$(EXEEXT) box_easy$(EXEEXT) \
-	box_easy2$(EXEEXT) box_seal$(EXEEXT) box_seed$(EXEEXT) \
-	chacha20$(EXEEXT) core1$(EXEEXT) core2$(EXEEXT) core3$(EXEEXT) \
-	core4$(EXEEXT) core5$(EXEEXT) core6$(EXEEXT) \
-	ed25519_convert$(EXEEXT) generichash$(EXEEXT) \
+@MINIMAL_FALSE@am__EXEEXT_2 = pwhash_scrypt$(EXEEXT) \
+@MINIMAL_FALSE@	pwhash_scrypt_ll$(EXEEXT) siphashx24$(EXEEXT) \
+@MINIMAL_FALSE@	xchacha20$(EXEEXT)
+am__EXEEXT_3 = aead_aes256gcm$(EXEEXT) aead_chacha20poly1305$(EXEEXT) \
+	aead_xchacha20poly1305$(EXEEXT) auth$(EXEEXT) auth2$(EXEEXT) \
+	auth3$(EXEEXT) auth5$(EXEEXT) auth6$(EXEEXT) auth7$(EXEEXT) \
+	box$(EXEEXT) box2$(EXEEXT) box7$(EXEEXT) box8$(EXEEXT) \
+	box_easy$(EXEEXT) box_easy2$(EXEEXT) box_seal$(EXEEXT) \
+	box_seed$(EXEEXT) chacha20$(EXEEXT) core1$(EXEEXT) \
+	core2$(EXEEXT) core3$(EXEEXT) core4$(EXEEXT) core5$(EXEEXT) \
+	core6$(EXEEXT) ed25519_convert$(EXEEXT) generichash$(EXEEXT) \
 	generichash2$(EXEEXT) generichash3$(EXEEXT) hash$(EXEEXT) \
-	hash3$(EXEEXT) onetimeauth$(EXEEXT) onetimeauth2$(EXEEXT) \
-	onetimeauth7$(EXEEXT) pwhash$(EXEEXT) pwhash_scrypt$(EXEEXT) \
-	pwhash_scrypt_ll$(EXEEXT) randombytes$(EXEEXT) \
-	scalarmult$(EXEEXT) scalarmult2$(EXEEXT) scalarmult5$(EXEEXT) \
-	scalarmult6$(EXEEXT) scalarmult7$(EXEEXT) secretbox$(EXEEXT) \
-	secretbox2$(EXEEXT) secretbox7$(EXEEXT) secretbox8$(EXEEXT) \
-	secretbox_easy$(EXEEXT) secretbox_easy2$(EXEEXT) \
-	shorthash$(EXEEXT) sign$(EXEEXT) sodium_core$(EXEEXT) \
-	sodium_utils$(EXEEXT) sodium_version$(EXEEXT) stream$(EXEEXT) \
-	stream2$(EXEEXT) stream3$(EXEEXT) stream4$(EXEEXT) \
-	verify1$(EXEEXT) $(am__EXEEXT_1)
+	hash3$(EXEEXT) kdf$(EXEEXT) keygen$(EXEEXT) kx$(EXEEXT) \
+	onetimeauth$(EXEEXT) onetimeauth2$(EXEEXT) \
+	onetimeauth7$(EXEEXT) pwhash$(EXEEXT) pwhash_argon2id$(EXEEXT) \
+	randombytes$(EXEEXT) scalarmult$(EXEEXT) scalarmult2$(EXEEXT) \
+	scalarmult5$(EXEEXT) scalarmult6$(EXEEXT) scalarmult7$(EXEEXT) \
+	secretbox$(EXEEXT) secretbox2$(EXEEXT) secretbox7$(EXEEXT) \
+	secretbox8$(EXEEXT) secretbox_easy$(EXEEXT) \
+	secretbox_easy2$(EXEEXT) shorthash$(EXEEXT) sign$(EXEEXT) \
+	sodium_core$(EXEEXT) sodium_utils$(EXEEXT) \
+	sodium_version$(EXEEXT) stream$(EXEEXT) stream2$(EXEEXT) \
+	stream3$(EXEEXT) stream4$(EXEEXT) verify1$(EXEEXT) \
+	$(am__EXEEXT_1) $(am__EXEEXT_2)
 aead_aes256gcm_SOURCES = aead_aes256gcm.c
 aead_aes256gcm_OBJECTS = aead_aes256gcm.$(OBJEXT)
 aead_aes256gcm_DEPENDENCIES = $(TESTS_LDADD)
@@ -143,6 +154,9 @@ am__v_lt_1 =
 aead_chacha20poly1305_SOURCES = aead_chacha20poly1305.c
 aead_chacha20poly1305_OBJECTS = aead_chacha20poly1305.$(OBJEXT)
 aead_chacha20poly1305_DEPENDENCIES = $(TESTS_LDADD)
+aead_xchacha20poly1305_SOURCES = aead_xchacha20poly1305.c
+aead_xchacha20poly1305_OBJECTS = aead_xchacha20poly1305.$(OBJEXT)
+aead_xchacha20poly1305_DEPENDENCIES = $(TESTS_LDADD)
 auth_SOURCES = auth.c
 auth_OBJECTS = auth.$(OBJEXT)
 auth_DEPENDENCIES = $(TESTS_LDADD)
@@ -224,6 +238,15 @@ hash_DEPENDENCIES = $(TESTS_LDADD)
 hash3_SOURCES = hash3.c
 hash3_OBJECTS = hash3.$(OBJEXT)
 hash3_DEPENDENCIES = $(TESTS_LDADD)
+kdf_SOURCES = kdf.c
+kdf_OBJECTS = kdf.$(OBJEXT)
+kdf_DEPENDENCIES = $(TESTS_LDADD)
+keygen_SOURCES = keygen.c
+keygen_OBJECTS = keygen.$(OBJEXT)
+keygen_DEPENDENCIES = $(TESTS_LDADD)
+kx_SOURCES = kx.c
+kx_OBJECTS = kx.$(OBJEXT)
+kx_DEPENDENCIES = $(TESTS_LDADD)
 onetimeauth_SOURCES = onetimeauth.c
 onetimeauth_OBJECTS = onetimeauth.$(OBJEXT)
 onetimeauth_DEPENDENCIES = $(TESTS_LDADD)
@@ -236,6 +259,9 @@ onetimeauth7_DEPENDENCIES = $(TESTS_LDADD)
 pwhash_SOURCES = pwhash.c
 pwhash_OBJECTS = pwhash.$(OBJEXT)
 pwhash_DEPENDENCIES = $(TESTS_LDADD)
+pwhash_argon2id_SOURCES = pwhash_argon2id.c
+pwhash_argon2id_OBJECTS = pwhash_argon2id.$(OBJEXT)
+pwhash_argon2id_DEPENDENCIES = $(TESTS_LDADD)
 pwhash_scrypt_SOURCES = pwhash_scrypt.c
 pwhash_scrypt_OBJECTS = pwhash_scrypt.$(OBJEXT)
 pwhash_scrypt_DEPENDENCIES = $(TESTS_LDADD)
@@ -284,6 +310,9 @@ shorthash_DEPENDENCIES = $(TESTS_LDADD)
 sign_SOURCES = sign.c
 sign_OBJECTS = sign.$(OBJEXT)
 sign_DEPENDENCIES = $(TESTS_LDADD)
+siphashx24_SOURCES = siphashx24.c
+siphashx24_OBJECTS = siphashx24.$(OBJEXT)
+siphashx24_DEPENDENCIES = $(TESTS_LDADD)
 sodium_core_SOURCES = sodium_core.c
 sodium_core_OBJECTS = sodium_core.$(OBJEXT)
 sodium_core_DEPENDENCIES = $(TESTS_LDADD)
@@ -314,6 +343,9 @@ stream4_DEPENDENCIES = $(TESTS_LDADD)
 verify1_SOURCES = verify1.c
 verify1_OBJECTS = verify1.$(OBJEXT)
 verify1_DEPENDENCIES = $(TESTS_LDADD)
+xchacha20_SOURCES = xchacha20.c
+xchacha20_OBJECTS = xchacha20.$(OBJEXT)
+xchacha20_DEPENDENCIES = $(TESTS_LDADD)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -348,32 +380,36 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = aead_aes256gcm.c aead_chacha20poly1305.c auth.c auth2.c \
-	auth3.c auth5.c auth6.c auth7.c box.c box2.c box7.c box8.c \
-	box_easy.c box_easy2.c box_seal.c box_seed.c chacha20.c \
-	core1.c core2.c core3.c core4.c core5.c core6.c \
-	ed25519_convert.c generichash.c generichash2.c generichash3.c \
-	hash.c hash3.c onetimeauth.c onetimeauth2.c onetimeauth7.c \
-	pwhash.c pwhash_scrypt.c pwhash_scrypt_ll.c randombytes.c \
-	scalarmult.c scalarmult2.c scalarmult5.c scalarmult6.c \
-	scalarmult7.c secretbox.c secretbox2.c secretbox7.c \
-	secretbox8.c secretbox_easy.c secretbox_easy2.c shorthash.c \
-	sign.c sodium_core.c sodium_utils.c sodium_utils2.c \
-	sodium_utils3.c sodium_version.c stream.c stream2.c stream3.c \
-	stream4.c verify1.c
-DIST_SOURCES = aead_aes256gcm.c aead_chacha20poly1305.c auth.c auth2.c \
-	auth3.c auth5.c auth6.c auth7.c box.c box2.c box7.c box8.c \
-	box_easy.c box_easy2.c box_seal.c box_seed.c chacha20.c \
-	core1.c core2.c core3.c core4.c core5.c core6.c \
-	ed25519_convert.c generichash.c generichash2.c generichash3.c \
-	hash.c hash3.c onetimeauth.c onetimeauth2.c onetimeauth7.c \
-	pwhash.c pwhash_scrypt.c pwhash_scrypt_ll.c randombytes.c \
-	scalarmult.c scalarmult2.c scalarmult5.c scalarmult6.c \
-	scalarmult7.c secretbox.c secretbox2.c secretbox7.c \
-	secretbox8.c secretbox_easy.c secretbox_easy2.c shorthash.c \
-	sign.c sodium_core.c sodium_utils.c sodium_utils2.c \
-	sodium_utils3.c sodium_version.c stream.c stream2.c stream3.c \
-	stream4.c verify1.c
+SOURCES = aead_aes256gcm.c aead_chacha20poly1305.c \
+	aead_xchacha20poly1305.c auth.c auth2.c auth3.c auth5.c \
+	auth6.c auth7.c box.c box2.c box7.c box8.c box_easy.c \
+	box_easy2.c box_seal.c box_seed.c chacha20.c core1.c core2.c \
+	core3.c core4.c core5.c core6.c ed25519_convert.c \
+	generichash.c generichash2.c generichash3.c hash.c hash3.c \
+	kdf.c keygen.c kx.c onetimeauth.c onetimeauth2.c \
+	onetimeauth7.c pwhash.c pwhash_argon2id.c pwhash_scrypt.c \
+	pwhash_scrypt_ll.c randombytes.c scalarmult.c scalarmult2.c \
+	scalarmult5.c scalarmult6.c scalarmult7.c secretbox.c \
+	secretbox2.c secretbox7.c secretbox8.c secretbox_easy.c \
+	secretbox_easy2.c shorthash.c sign.c siphashx24.c \
+	sodium_core.c sodium_utils.c sodium_utils2.c sodium_utils3.c \
+	sodium_version.c stream.c stream2.c stream3.c stream4.c \
+	verify1.c xchacha20.c
+DIST_SOURCES = aead_aes256gcm.c aead_chacha20poly1305.c \
+	aead_xchacha20poly1305.c auth.c auth2.c auth3.c auth5.c \
+	auth6.c auth7.c box.c box2.c box7.c box8.c box_easy.c \
+	box_easy2.c box_seal.c box_seed.c chacha20.c core1.c core2.c \
+	core3.c core4.c core5.c core6.c ed25519_convert.c \
+	generichash.c generichash2.c generichash3.c hash.c hash3.c \
+	kdf.c keygen.c kx.c onetimeauth.c onetimeauth2.c \
+	onetimeauth7.c pwhash.c pwhash_argon2id.c pwhash_scrypt.c \
+	pwhash_scrypt_ll.c randombytes.c scalarmult.c scalarmult2.c \
+	scalarmult5.c scalarmult6.c scalarmult7.c secretbox.c \
+	secretbox2.c secretbox7.c secretbox8.c secretbox_easy.c \
+	secretbox_easy2.c shorthash.c sign.c siphashx24.c \
+	sodium_core.c sodium_utils.c sodium_utils2.c sodium_utils3.c \
+	sodium_version.c stream.c stream2.c stream3.c stream4.c \
+	verify1.c xchacha20.c
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -644,6 +680,10 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ENABLE_VALGRIND_drd = @ENABLE_VALGRIND_drd@
+ENABLE_VALGRIND_helgrind = @ENABLE_VALGRIND_helgrind@
+ENABLE_VALGRIND_memcheck = @ENABLE_VALGRIND_memcheck@
+ENABLE_VALGRIND_sgcheck = @ENABLE_VALGRIND_sgcheck@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
@@ -694,6 +734,7 @@ SAFECODE_HOME = @SAFECODE_HOME@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SODIUM_LIBRARY_MINIMAL_DEF = @SODIUM_LIBRARY_MINIMAL_DEF@
 SODIUM_LIBRARY_VERSION = @SODIUM_LIBRARY_VERSION@
 SODIUM_LIBRARY_VERSION_MAJOR = @SODIUM_LIBRARY_VERSION_MAJOR@
 SODIUM_LIBRARY_VERSION_MINOR = @SODIUM_LIBRARY_VERSION_MINOR@
@@ -701,10 +742,6 @@ STRIP = @STRIP@
 TEST_LDFLAGS = @TEST_LDFLAGS@
 VALGRIND = @VALGRIND@
 VALGRIND_ENABLED = @VALGRIND_ENABLED@
-VALGRIND_HAVE_TOOL_drd = @VALGRIND_HAVE_TOOL_drd@
-VALGRIND_HAVE_TOOL_exp_sgcheck = @VALGRIND_HAVE_TOOL_exp_sgcheck@
-VALGRIND_HAVE_TOOL_helgrind = @VALGRIND_HAVE_TOOL_helgrind@
-VALGRIND_HAVE_TOOL_memcheck = @VALGRIND_HAVE_TOOL_memcheck@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -759,12 +796,15 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+valgrind_enabled_tools = @valgrind_enabled_tools@
+valgrind_tools = @valgrind_tools@
 EXTRA_DIST = \
 	cmptest.h \
 	wintest.bat \
 	pre.js.inc \
 	aead_aes256gcm.exp \
 	aead_chacha20poly1305.exp \
+	aead_xchacha20poly1305.exp \
 	auth.exp \
 	auth2.exp \
 	auth3.exp \
@@ -793,10 +833,14 @@ EXTRA_DIST = \
 	hash.exp \
 	hash2.exp \
 	hash3.exp \
+	kdf.exp \
+	keygen.exp \
+	kx.exp \
 	onetimeauth.exp \
 	onetimeauth2.exp \
 	onetimeauth7.exp \
 	pwhash.exp \
+	pwhash_argon2id.exp \
 	pwhash_scrypt.exp \
 	pwhash_scrypt_ll.exp \
 	randombytes.exp \
@@ -813,6 +857,7 @@ EXTRA_DIST = \
 	secretbox_easy2.exp \
 	shorthash.exp \
 	sign.exp \
+	siphashx24.exp \
 	sodium_core.exp \
 	sodium_utils.exp \
 	sodium_utils2.exp \
@@ -822,11 +867,13 @@ EXTRA_DIST = \
 	stream2.exp \
 	stream3.exp \
 	stream4.exp \
-	verify1.exp
+	verify1.exp \
+	xchacha20.exp
 
 DISTCLEANFILES = \
 	aead_aes256gcm.res \
 	aead_chacha20poly1305.res \
+	aead_xchacha20poly1305.res \
 	auth.res \
 	auth2.res \
 	auth3.res \
@@ -855,10 +902,14 @@ DISTCLEANFILES = \
 	hash.res \
 	hash2.res \
 	hash3.res \
+	kdf.res \
+	keygen.res \
+	kx.res \
 	onetimeauth.res \
 	onetimeauth2.res \
 	onetimeauth7.res \
 	pwhash.res \
+	pwhash_argon2id.res \
 	pwhash_scrypt.res \
 	pwhash_scrypt_ll.res \
 	randombytes.res \
@@ -875,6 +926,7 @@ DISTCLEANFILES = \
 	secretbox_easy2.res \
 	shorthash.res \
 	sign.res \
+	siphashx24.res \
 	sodium_core.res \
 	sodium_utils.res \
 	sodium_utils2.res \
@@ -884,11 +936,13 @@ DISTCLEANFILES = \
 	stream2.res \
 	stream3.res \
 	stream4.res \
-	verify1.res
+	verify1.res \
+	xchacha20.res
 
 @NATIVECLIENT_TRUE@CLEANFILES = \
 @NATIVECLIENT_TRUE@	aead_aes256gcm.final \
 @NATIVECLIENT_TRUE@	aead_chacha20poly1305.final \
+@NATIVECLIENT_TRUE@	aead_xchacha20poly1305.final \
 @NATIVECLIENT_TRUE@	auth.final \
 @NATIVECLIENT_TRUE@	auth2.final \
 @NATIVECLIENT_TRUE@	auth3.final \
@@ -917,10 +971,14 @@ DISTCLEANFILES = \
 @NATIVECLIENT_TRUE@	hash.final \
 @NATIVECLIENT_TRUE@	hash2.final \
 @NATIVECLIENT_TRUE@	hash3.final \
+@NATIVECLIENT_TRUE@	kdf.final \
+@NATIVECLIENT_TRUE@	keygen.final \
+@NATIVECLIENT_TRUE@	kx.final \
 @NATIVECLIENT_TRUE@	onetimeauth.final \
 @NATIVECLIENT_TRUE@	onetimeauth2.final \
 @NATIVECLIENT_TRUE@	onetimeauth7.final \
 @NATIVECLIENT_TRUE@	pwhash.final \
+@NATIVECLIENT_TRUE@	pwhash_argon2id.final \
 @NATIVECLIENT_TRUE@	pwhash_scrypt.final \
 @NATIVECLIENT_TRUE@	pwhash_scrypt_ll.final \
 @NATIVECLIENT_TRUE@	randombytes.final \
@@ -937,6 +995,7 @@ DISTCLEANFILES = \
 @NATIVECLIENT_TRUE@	secretbox_easy2.final \
 @NATIVECLIENT_TRUE@	shorthash.final \
 @NATIVECLIENT_TRUE@	sign.final \
+@NATIVECLIENT_TRUE@	siphashx24.final \
 @NATIVECLIENT_TRUE@	sodium_core.final \
 @NATIVECLIENT_TRUE@	sodium_utils.final \
 @NATIVECLIENT_TRUE@	sodium_version.final \
@@ -945,8 +1004,10 @@ DISTCLEANFILES = \
 @NATIVECLIENT_TRUE@	stream3.final \
 @NATIVECLIENT_TRUE@	stream4.final \
 @NATIVECLIENT_TRUE@	verify1.final \
+@NATIVECLIENT_TRUE@	xchacha20.final \
 @NATIVECLIENT_TRUE@	aead_aes256gcm.nexe \
 @NATIVECLIENT_TRUE@	aead_chacha20poly1305.nexe \
+@NATIVECLIENT_TRUE@	aead_xchacha20poly1305.nexe \
 @NATIVECLIENT_TRUE@	auth.nexe \
 @NATIVECLIENT_TRUE@	auth2.nexe \
 @NATIVECLIENT_TRUE@	auth3.nexe \
@@ -975,10 +1036,14 @@ DISTCLEANFILES = \
 @NATIVECLIENT_TRUE@	hash.nexe \
 @NATIVECLIENT_TRUE@	hash2.nexe \
 @NATIVECLIENT_TRUE@	hash3.nexe \
+@NATIVECLIENT_TRUE@	kdf.nexe \
+@NATIVECLIENT_TRUE@	keygen.nexe \
+@NATIVECLIENT_TRUE@	kx.nexe \
 @NATIVECLIENT_TRUE@	onetimeauth.nexe \
 @NATIVECLIENT_TRUE@	onetimeauth2.nexe \
 @NATIVECLIENT_TRUE@	onetimeauth7.nexe \
 @NATIVECLIENT_TRUE@	pwhash.nexe \
+@NATIVECLIENT_TRUE@	pwhash_argon2id.nexe \
 @NATIVECLIENT_TRUE@	pwhash_scrypt.nexe \
 @NATIVECLIENT_TRUE@	pwhash_scrypt_ll.nexe \
 @NATIVECLIENT_TRUE@	randombytes.nexe \
@@ -995,6 +1060,7 @@ DISTCLEANFILES = \
 @NATIVECLIENT_TRUE@	secretbox_easy2.nexe \
 @NATIVECLIENT_TRUE@	shorthash.nexe \
 @NATIVECLIENT_TRUE@	sign.nexe \
+@NATIVECLIENT_TRUE@	siphashx24.nexe \
 @NATIVECLIENT_TRUE@	sodium_core.nexe \
 @NATIVECLIENT_TRUE@	sodium_utils.nexe \
 @NATIVECLIENT_TRUE@	sodium_version.nexe \
@@ -1002,7 +1068,8 @@ DISTCLEANFILES = \
 @NATIVECLIENT_TRUE@	stream2.nexe \
 @NATIVECLIENT_TRUE@	stream3.nexe \
 @NATIVECLIENT_TRUE@	stream4.nexe \
-@NATIVECLIENT_TRUE@	verify1.nexe
+@NATIVECLIENT_TRUE@	verify1.nexe \
+@NATIVECLIENT_TRUE@	xchacha20.nexe
 
 AM_CPPFLAGS = \
 	-DTEST_SRCDIR=\"@srcdir@\" \
@@ -1013,17 +1080,17 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/test/quirks
 
 AM_LDFLAGS = @TEST_LDFLAGS@
-TESTS_TARGETS = aead_aes256gcm aead_chacha20poly1305 auth auth2 auth3 \
-	auth5 auth6 auth7 box box2 box7 box8 box_easy box_easy2 \
-	box_seal box_seed chacha20 core1 core2 core3 core4 core5 core6 \
-	ed25519_convert generichash generichash2 generichash3 hash \
-	hash3 onetimeauth onetimeauth2 onetimeauth7 pwhash \
-	pwhash_scrypt pwhash_scrypt_ll randombytes scalarmult \
-	scalarmult2 scalarmult5 scalarmult6 scalarmult7 secretbox \
-	secretbox2 secretbox7 secretbox8 secretbox_easy \
-	secretbox_easy2 shorthash sign sodium_core sodium_utils \
-	sodium_version stream stream2 stream3 stream4 verify1 \
-	$(am__append_1)
+TESTS_TARGETS = aead_aes256gcm aead_chacha20poly1305 \
+	aead_xchacha20poly1305 auth auth2 auth3 auth5 auth6 auth7 box \
+	box2 box7 box8 box_easy box_easy2 box_seal box_seed chacha20 \
+	core1 core2 core3 core4 core5 core6 ed25519_convert \
+	generichash generichash2 generichash3 hash hash3 kdf keygen kx \
+	onetimeauth onetimeauth2 onetimeauth7 pwhash pwhash_argon2id \
+	randombytes scalarmult scalarmult2 scalarmult5 scalarmult6 \
+	scalarmult7 secretbox secretbox2 secretbox7 secretbox8 \
+	secretbox_easy secretbox_easy2 shorthash sign sodium_core \
+	sodium_utils sodium_version stream stream2 stream3 stream4 \
+	verify1 $(am__append_1) $(am__append_2)
 TESTS_LDADD = \
 	${top_builddir}/src/libsodium/libsodium.la
 
@@ -1031,6 +1098,8 @@ aead_aes256gcm_SOURCE = cmptest.h aead_aes256gcm.c
 aead_aes256gcm_LDADD = $(TESTS_LDADD)
 aead_chacha20poly1305_SOURCE = cmptest.h aead_chacha20poly1305.c
 aead_chacha20poly1305_LDADD = $(TESTS_LDADD)
+aead_xchacha20poly1305_SOURCE = cmptest.h aead_xchacha20poly1305.c
+aead_xchacha20poly1305_LDADD = $(TESTS_LDADD)
 auth_SOURCE = cmptest.h auth.c
 auth_LDADD = $(TESTS_LDADD)
 auth2_SOURCE = cmptest.h auth2.c
@@ -1085,6 +1154,12 @@ hash_SOURCE = cmptest.h hash.c
 hash_LDADD = $(TESTS_LDADD)
 hash3_SOURCE = cmptest.h hash3.c
 hash3_LDADD = $(TESTS_LDADD)
+kdf_SOURCE = cmptest.h kdf.c
+kdf_LDADD = $(TESTS_LDADD)
+keygen_SOURCE = cmptest.h keygen.c
+keygen_LDADD = $(TESTS_LDADD)
+kx_SOURCE = cmptest.h kx.c
+kx_LDADD = $(TESTS_LDADD)
 onetimeauth_SOURCE = cmptest.h onetimeauth.c
 onetimeauth_LDADD = $(TESTS_LDADD)
 onetimeauth2_SOURCE = cmptest.h onetimeauth2.c
@@ -1093,6 +1168,8 @@ onetimeauth7_SOURCE = cmptest.h onetimeauth7.c
 onetimeauth7_LDADD = $(TESTS_LDADD)
 pwhash_SOURCE = cmptest.h pwhash.c
 pwhash_LDADD = $(TESTS_LDADD)
+pwhash_argon2id_SOURCE = cmptest.h pwhash_argon2id.c
+pwhash_argon2id_LDADD = $(TESTS_LDADD)
 pwhash_scrypt_SOURCE = cmptest.h pwhash_scrypt.c
 pwhash_scrypt_LDADD = $(TESTS_LDADD)
 pwhash_scrypt_ll_SOURCE = cmptest.h pwhash_scrypt_ll.c
@@ -1125,6 +1202,8 @@ shorthash_SOURCE = cmptest.h shorthash.c
 shorthash_LDADD = $(TESTS_LDADD)
 sign_SOURCE = cmptest.h sign.c
 sign_LDADD = $(TESTS_LDADD)
+siphashx24_SOURCE = cmptest.h siphashx24.c
+siphashx24_LDADD = $(TESTS_LDADD)
 sodium_core_SOURCE = cmptest.h sodium_core.c
 sodium_core_LDADD = $(TESTS_LDADD)
 sodium_utils_SOURCE = cmptest.h sodium_utils.c
@@ -1145,6 +1224,8 @@ stream4_SOURCE = cmptest.h stream4.c
 stream4_LDADD = $(TESTS_LDADD)
 verify1_SOURCE = cmptest.h verify1.c
 verify1_LDADD = $(TESTS_LDADD)
+xchacha20_SOURCE = cmptest.h xchacha20.c
+xchacha20_LDADD = $(TESTS_LDADD)
 @NATIVECLIENT_TRUE@LOG_COMPILER = ./nacl-test-wrapper.sh
 all: all-am
 
@@ -1197,6 +1278,10 @@ aead_chacha20poly1305$(EXEEXT): $(aead_chacha20poly1305_OBJECTS) $(aead_chacha20
 	@rm -f aead_chacha20poly1305$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(aead_chacha20poly1305_OBJECTS) $(aead_chacha20poly1305_LDADD) $(LIBS)
 
+aead_xchacha20poly1305$(EXEEXT): $(aead_xchacha20poly1305_OBJECTS) $(aead_xchacha20poly1305_DEPENDENCIES) $(EXTRA_aead_xchacha20poly1305_DEPENDENCIES) 
+	@rm -f aead_xchacha20poly1305$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(aead_xchacha20poly1305_OBJECTS) $(aead_xchacha20poly1305_LDADD) $(LIBS)
+
 auth$(EXEEXT): $(auth_OBJECTS) $(auth_DEPENDENCIES) $(EXTRA_auth_DEPENDENCIES) 
 	@rm -f auth$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(auth_OBJECTS) $(auth_LDADD) $(LIBS)
@@ -1305,6 +1390,18 @@ hash3$(EXEEXT): $(hash3_OBJECTS) $(hash3_DEPENDENCIES) $(EXTRA_hash3_DEPENDENCIE
 	@rm -f hash3$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(hash3_OBJECTS) $(hash3_LDADD) $(LIBS)
 
+kdf$(EXEEXT): $(kdf_OBJECTS) $(kdf_DEPENDENCIES) $(EXTRA_kdf_DEPENDENCIES) 
+	@rm -f kdf$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(kdf_OBJECTS) $(kdf_LDADD) $(LIBS)
+
+keygen$(EXEEXT): $(keygen_OBJECTS) $(keygen_DEPENDENCIES) $(EXTRA_keygen_DEPENDENCIES) 
+	@rm -f keygen$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(keygen_OBJECTS) $(keygen_LDADD) $(LIBS)
+
+kx$(EXEEXT): $(kx_OBJECTS) $(kx_DEPENDENCIES) $(EXTRA_kx_DEPENDENCIES) 
+	@rm -f kx$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(kx_OBJECTS) $(kx_LDADD) $(LIBS)
+
 onetimeauth$(EXEEXT): $(onetimeauth_OBJECTS) $(onetimeauth_DEPENDENCIES) $(EXTRA_onetimeauth_DEPENDENCIES) 
 	@rm -f onetimeauth$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(onetimeauth_OBJECTS) $(onetimeauth_LDADD) $(LIBS)
@@ -1321,6 +1418,10 @@ pwhash$(EXEEXT): $(pwhash_OBJECTS) $(pwhash_DEPENDENCIES) $(EXTRA_pwhash_DEPENDE
 	@rm -f pwhash$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(pwhash_OBJECTS) $(pwhash_LDADD) $(LIBS)
 
+pwhash_argon2id$(EXEEXT): $(pwhash_argon2id_OBJECTS) $(pwhash_argon2id_DEPENDENCIES) $(EXTRA_pwhash_argon2id_DEPENDENCIES) 
+	@rm -f pwhash_argon2id$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(pwhash_argon2id_OBJECTS) $(pwhash_argon2id_LDADD) $(LIBS)
+
 pwhash_scrypt$(EXEEXT): $(pwhash_scrypt_OBJECTS) $(pwhash_scrypt_DEPENDENCIES) $(EXTRA_pwhash_scrypt_DEPENDENCIES) 
 	@rm -f pwhash_scrypt$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(pwhash_scrypt_OBJECTS) $(pwhash_scrypt_LDADD) $(LIBS)
@@ -1385,6 +1486,10 @@ sign$(EXEEXT): $(sign_OBJECTS) $(sign_DEPENDENCIES) $(EXTRA_sign_DEPENDENCIES)
 	@rm -f sign$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(sign_OBJECTS) $(sign_LDADD) $(LIBS)
 
+siphashx24$(EXEEXT): $(siphashx24_OBJECTS) $(siphashx24_DEPENDENCIES) $(EXTRA_siphashx24_DEPENDENCIES) 
+	@rm -f siphashx24$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(siphashx24_OBJECTS) $(siphashx24_LDADD) $(LIBS)
+
 sodium_core$(EXEEXT): $(sodium_core_OBJECTS) $(sodium_core_DEPENDENCIES) $(EXTRA_sodium_core_DEPENDENCIES) 
 	@rm -f sodium_core$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(sodium_core_OBJECTS) $(sodium_core_LDADD) $(LIBS)
@@ -1425,6 +1530,10 @@ verify1$(EXEEXT): $(verify1_OBJECTS) $(verify1_DEPENDENCIES) $(EXTRA_verify1_DEP
 	@rm -f verify1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(verify1_OBJECTS) $(verify1_LDADD) $(LIBS)
 
+xchacha20$(EXEEXT): $(xchacha20_OBJECTS) $(xchacha20_DEPENDENCIES) $(EXTRA_xchacha20_DEPENDENCIES) 
+	@rm -f xchacha20$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(xchacha20_OBJECTS) $(xchacha20_LDADD) $(LIBS)
+
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
@@ -1433,6 +1542,7 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aead_aes256gcm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aead_chacha20poly1305.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aead_xchacha20poly1305.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth3.Po@am__quote@
@@ -1460,10 +1570,14 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/generichash3.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash3.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kdf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keygen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kx.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/onetimeauth.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/onetimeauth2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/onetimeauth7.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwhash.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwhash_argon2id.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwhash_scrypt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwhash_scrypt_ll.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/randombytes.Po@am__quote@
@@ -1480,6 +1594,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secretbox_easy2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shorthash.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sign.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/siphashx24.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sodium_core.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sodium_utils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sodium_utils2.Po@am__quote@
@@ -1490,6 +1605,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream3.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream4.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/verify1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xchacha20.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -1728,6 +1844,13 @@ aead_chacha20poly1305.log: aead_chacha20poly1305$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+aead_xchacha20poly1305.log: aead_xchacha20poly1305$(EXEEXT)
+	@p='aead_xchacha20poly1305$(EXEEXT)'; \
+	b='aead_xchacha20poly1305'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 auth.log: auth$(EXEEXT)
 	@p='auth$(EXEEXT)'; \
 	b='auth'; \
@@ -1917,6 +2040,27 @@ hash3.log: hash3$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+kdf.log: kdf$(EXEEXT)
+	@p='kdf$(EXEEXT)'; \
+	b='kdf'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+keygen.log: keygen$(EXEEXT)
+	@p='keygen$(EXEEXT)'; \
+	b='keygen'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+kx.log: kx$(EXEEXT)
+	@p='kx$(EXEEXT)'; \
+	b='kx'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 onetimeauth.log: onetimeauth$(EXEEXT)
 	@p='onetimeauth$(EXEEXT)'; \
 	b='onetimeauth'; \
@@ -1945,16 +2089,9 @@ pwhash.log: pwhash$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-pwhash_scrypt.log: pwhash_scrypt$(EXEEXT)
-	@p='pwhash_scrypt$(EXEEXT)'; \
-	b='pwhash_scrypt'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-pwhash_scrypt_ll.log: pwhash_scrypt_ll$(EXEEXT)
-	@p='pwhash_scrypt_ll$(EXEEXT)'; \
-	b='pwhash_scrypt_ll'; \
+pwhash_argon2id.log: pwhash_argon2id$(EXEEXT)
+	@p='pwhash_argon2id$(EXEEXT)'; \
+	b='pwhash_argon2id'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
@@ -2127,6 +2264,34 @@ sodium_utils3.log: sodium_utils3$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+pwhash_scrypt.log: pwhash_scrypt$(EXEEXT)
+	@p='pwhash_scrypt$(EXEEXT)'; \
+	b='pwhash_scrypt'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+pwhash_scrypt_ll.log: pwhash_scrypt_ll$(EXEEXT)
+	@p='pwhash_scrypt_ll$(EXEEXT)'; \
+	b='pwhash_scrypt_ll'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+siphashx24.log: siphashx24$(EXEEXT)
+	@p='siphashx24$(EXEEXT)'; \
+	b='siphashx24'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+xchacha20.log: xchacha20$(EXEEXT)
+	@p='xchacha20$(EXEEXT)'; \
+	b='xchacha20'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 .test.log:
 	@p='$<'; \
 	$(am__set_b); \