rbnacl-libsodium 1.0.8 → 1.0.9

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

@@ -2,13 +2,14 @@
 #include "core.h"
 #include "crypto_generichash.h"
 #include "crypto_onetimeauth.h"
+#include "crypto_pwhash_argon2i.h"
 #include "crypto_scalarmult.h"
 #include "crypto_stream_chacha20.h"
 #include "randombytes.h"
 #include "runtime.h"
 #include "utils.h"
 
-#if 0
+#if !defined(_MSC_VER) && 0
 # warning This is unstable, untested, development code.
 # warning It might not compile. It might not work as expected.
 # warning It might be totally insecure.
@@ -28,6 +29,7 @@ sodium_init(void)
     _sodium_runtime_get_cpu_features();
     randombytes_stir();
     _sodium_alloc_init();
+    _crypto_pwhash_argon2i_pick_best_implementation();
     _crypto_generichash_blake2b_pick_best_implementation();
     _crypto_onetimeauth_poly1305_pick_best_implementation();
     _crypto_scalarmult_curve25519_pick_best_implementation();

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

@@ -15,24 +15,28 @@ typedef struct CPUFeatures_ {
     int has_ssse3;
     int has_sse41;
     int has_avx;
+    int has_avx2;
     int has_pclmul;
     int has_aesni;
 } CPUFeatures;
 
 static CPUFeatures _cpu_features;
 
-#define CPUID_SSE2       0x04000000
-#define CPUIDECX_SSE3    0x00000001
-#define CPUIDECX_SSSE3   0x00000200
-#define CPUIDECX_SSE41   0x00080000
-#define CPUIDECX_AVX     0x10000000
-#define CPUIDECX_PCLMUL  0x00000002
-#define CPUIDECX_AESNI   0x02000000
-#define CPUIDECX_XSAVE   0x04000000
-#define CPUIDECX_OSXSAVE 0x08000000
+#define CPUID_EBX_AVX2    0x00000020
 
-#define XCR0_SSE         0x00000002
-#define XCR0_AVX         0x00000004
+#define CPUID_ECX_SSE3    0x00000001
+#define CPUID_ECX_PCLMUL  0x00000002
+#define CPUID_ECX_SSSE3   0x00000200
+#define CPUID_ECX_SSE41   0x00080000
+#define CPUID_ECX_AESNI   0x02000000
+#define CPUID_ECX_XSAVE   0x04000000
+#define CPUID_ECX_OSXSAVE 0x08000000
+#define CPUID_ECX_AVX     0x10000000
+
+#define CPUID_EDX_SSE2    0x04000000
+
+#define XCR0_SSE          0x00000002
+#define XCR0_AVX          0x00000004
 
 static int
 _sodium_runtime_arm_cpu_features(CPUFeatures * const cpu_features)
@@ -94,6 +98,7 @@ _cpuid(unsigned int cpu_info[4U], const unsigned int cpu_info_type)
                           "0" (cpu_info_type), "2" (0U));
 # endif
 #else
+    (void) cpu_info_type;
     cpu_info[0] = cpu_info[1] = cpu_info[2] = cpu_info[3] = 0;
 #endif
 }
@@ -111,28 +116,28 @@ _sodium_runtime_intel_cpu_features(CPUFeatures * const cpu_features)
     _cpuid(cpu_info, 0x00000001);
 #if defined(HAVE_EMMINTRIN_H) || \
     (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86)))
-    cpu_features->has_sse2 = ((cpu_info[3] & CPUID_SSE2) != 0x0);
+    cpu_features->has_sse2 = ((cpu_info[3] & CPUID_EDX_SSE2) != 0x0);
 #else
     cpu_features->has_sse2 = 0;
 #endif
 
 #if defined(HAVE_PMMINTRIN_H) || \
     (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86)))
-    cpu_features->has_sse3 = ((cpu_info[2] & CPUIDECX_SSE3) != 0x0);
+    cpu_features->has_sse3 = ((cpu_info[2] & CPUID_ECX_SSE3) != 0x0);
 #else
     cpu_features->has_sse3 = 0;
 #endif
 
 #if defined(HAVE_TMMINTRIN_H) || \
     (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86)))
-    cpu_features->has_ssse3 = ((cpu_info[2] & CPUIDECX_SSSE3) != 0x0);
+    cpu_features->has_ssse3 = ((cpu_info[2] & CPUID_ECX_SSSE3) != 0x0);
 #else
     cpu_features->has_ssse3 = 0;
 #endif
 
 #if defined(HAVE_SMMINTRIN_H) || \
     (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86)))
-    cpu_features->has_sse41 = ((cpu_info[2] & CPUIDECX_SSE41) != 0x0);
+    cpu_features->has_sse41 = ((cpu_info[2] & CPUID_ECX_SSE41) != 0x0);
 #else
     cpu_features->has_sse41 = 0;
 #endif
@@ -140,8 +145,8 @@ _sodium_runtime_intel_cpu_features(CPUFeatures * const cpu_features)
     cpu_features->has_avx = 0;
 #if defined(HAVE_AVXINTRIN_H) || \
     (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86)))
-    if ((cpu_info[2] & (CPUIDECX_AVX | CPUIDECX_XSAVE | CPUIDECX_OSXSAVE))
-        == (CPUIDECX_AVX | CPUIDECX_XSAVE | CPUIDECX_OSXSAVE)) {
+    if ((cpu_info[2] & (CPUID_ECX_AVX | CPUID_ECX_XSAVE | CPUID_ECX_OSXSAVE))
+        == (CPUID_ECX_AVX | CPUID_ECX_XSAVE | CPUID_ECX_OSXSAVE)) {
         uint32_t xcr0 = 0U;
 # ifdef MSC_VER
         __asm {
@@ -159,10 +164,18 @@ _sodium_runtime_intel_cpu_features(CPUFeatures * const cpu_features)
     }
 #endif
 
+    cpu_features->has_avx2 = 0;
+#if defined(HAVE_AVX2INTRIN_H) || \
+    (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86)))
+    if (cpu_features->has_avx) {
+        cpu_features->has_avx2 = ((cpu_info[1] & CPUID_EBX_AVX2) != 0x0);
+    }
+#endif
+
 #if defined(HAVE_WMMINTRIN_H) || \
     (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86)))
-    cpu_features->has_pclmul = ((cpu_info[2] & CPUIDECX_PCLMUL) != 0x0);
-    cpu_features->has_aesni = ((cpu_info[2] & CPUIDECX_AESNI) != 0x0);
+    cpu_features->has_pclmul = ((cpu_info[2] & CPUID_ECX_PCLMUL) != 0x0);
+    cpu_features->has_aesni = ((cpu_info[2] & CPUID_ECX_AESNI) != 0x0);
 #else
     cpu_features->has_pclmul = 0;
     cpu_features->has_aesni = 0;
@@ -213,6 +226,11 @@ sodium_runtime_has_avx(void) {
     return _cpu_features.has_avx;
 }
 
+int
+sodium_runtime_has_avx2(void) {
+    return _cpu_features.has_avx2;
+}
+
 int
 sodium_runtime_has_pclmul(void) {
     return _cpu_features.has_pclmul;

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

@@ -23,6 +23,10 @@
 # include <unistd.h>
 #endif
 
+#ifndef ENOSYS
+# define ENOSYS ENXIO
+#endif
+
 #if defined(_WIN32) && (!defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP)
 # define WINAPI_DESKTOP
 #endif
@@ -73,8 +77,9 @@ sodium_memzero(void * const pnt, const size_t len)
     memset(pnt, 0, len);
     _sodium_dummy_symbol_to_prevent_memzero_lto(pnt, len);
 #else
-    volatile unsigned char *pnt_ = (volatile unsigned char *) pnt;
-    size_t                     i = (size_t) 0U;
+    volatile unsigned char *volatile pnt_ =
+        (volatile unsigned char * volatile) pnt;
+    size_t i = (size_t) 0U;
 
     while (i < len) {
         pnt_[i++] = 0U;
@@ -101,8 +106,10 @@ sodium_memcmp(const void * const b1_, const void * const b2_, size_t len)
     const unsigned char *b1 = (const unsigned char *) b1_;
     const unsigned char *b2 = (const unsigned char *) b2_;
 #else
-    const volatile unsigned char *b1 = (const volatile unsigned char *) b1_;
-    const volatile unsigned char *b2 = (const volatile unsigned char *) b2_;
+    const volatile unsigned char *volatile b1 =
+        (const volatile unsigned char * volatile) b1_;
+    const volatile unsigned char *volatile b2 =
+        (const volatile unsigned char * volatile) b2_;
 #endif
     size_t               i;
     unsigned char        d = (unsigned char) 0U;
@@ -135,8 +142,10 @@ sodium_compare(const unsigned char *b1_, const unsigned char *b2_, size_t len)
     const unsigned char *b1 = b1_;
     const unsigned char *b2 = b2_;
 #else
-    const volatile unsigned char *b1 = (const volatile unsigned char *) b1_;
-    const volatile unsigned char *b2 = (const volatile unsigned char *) b2_;
+    const volatile unsigned char * volatile b1 =
+        (const volatile unsigned char * volatile) b1_;
+    const volatile unsigned char * volatile b2 =
+        (const volatile unsigned char * volatile) b2_;
 #endif
     unsigned char gt = 0U;
     unsigned char eq = 1U;
@@ -440,7 +449,7 @@ _mprotect_readwrite(void *ptr, size_t size)
 
 #ifdef HAVE_ALIGNED_MALLOC
 
-static void
+__attribute__ ((noreturn)) static void
 _out_of_bounds(void)
 {
 # ifdef SIGSEGV
@@ -517,7 +526,7 @@ _unprotected_ptr_from_user_ptr(void * const ptr)
 static __attribute__ ((malloc)) void *
 _sodium_malloc(const size_t size)
 {
-    return malloc(size);
+    return malloc(size > (size_t) 0U ? size : (size_t) 1U);
 }
 #else
 static __attribute__ ((malloc)) void *
@@ -569,7 +578,7 @@ sodium_malloc(const size_t size)
     void *ptr;
 
     if ((ptr = _sodium_malloc(size)) == NULL) {
-        return NULL; /* LCOV_EXCL_LINE */
+        return NULL;
     }
     memset(ptr, (int) GARBAGE_VALUE, size);
 

data/vendor/libsodium/test/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_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 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
@@ -200,6 +201,8 @@ CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CFLAGS_AESNI = @CFLAGS_AESNI@
+CFLAGS_AVX = @CFLAGS_AVX@
+CFLAGS_AVX2 = @CFLAGS_AVX2@
 CFLAGS_MMX = @CFLAGS_MMX@
 CFLAGS_PCLMUL = @CFLAGS_PCLMUL@
 CFLAGS_SSE2 = @CFLAGS_SSE2@
@@ -272,6 +275,12 @@ SODIUM_LIBRARY_VERSION_MAJOR = @SODIUM_LIBRARY_VERSION_MAJOR@
 SODIUM_LIBRARY_VERSION_MINOR = @SODIUM_LIBRARY_VERSION_MINOR@
 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@

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

@@ -37,6 +37,7 @@ EXTRA_DIST = \
 	onetimeauth2.exp \
 	onetimeauth7.exp \
 	pwhash.exp \
+	pwhash_scrypt.exp \
 	pwhash_scrypt_ll.exp \
 	randombytes.exp \
 	scalarmult.exp \
@@ -98,6 +99,7 @@ DISTCLEANFILES = \
 	onetimeauth2.res \
 	onetimeauth7.res \
 	pwhash.res \
+	pwhash_scrypt.res \
 	pwhash_scrypt_ll.res \
 	randombytes.res \
 	scalarmult.res \
@@ -160,6 +162,7 @@ CLEANFILES = \
 	onetimeauth2.final \
 	onetimeauth7.final \
 	pwhash.final \
+	pwhash_scrypt.final \
 	pwhash_scrypt_ll.final \
 	randombytes.final \
 	scalarmult.final \
@@ -217,6 +220,7 @@ CLEANFILES = \
 	onetimeauth2.nexe \
 	onetimeauth7.nexe \
 	pwhash.nexe \
+	pwhash_scrypt.nexe \
 	pwhash_scrypt_ll.nexe \
 	randombytes.nexe \
 	scalarmult.nexe \
@@ -286,6 +290,7 @@ TESTS_TARGETS = \
 	onetimeauth2 \
 	onetimeauth7 \
 	pwhash \
+	pwhash_scrypt \
 	pwhash_scrypt_ll \
 	randombytes \
 	scalarmult \
@@ -424,6 +429,9 @@ onetimeauth7_LDADD        = $(TESTS_LDADD)
 pwhash_SOURCE             = cmptest.h pwhash.c
 pwhash_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
 pwhash_scrypt_ll_LDADD    = $(TESTS_LDADD)
 
@@ -504,3 +512,5 @@ LOG_COMPILER = ./nacl-test-wrapper.sh
 endif
 
 verify: check
+
+@VALGRIND_CHECK_RULES@

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

@@ -98,6 +98,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_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 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
@@ -121,7 +122,7 @@ am__EXEEXT_2 = aead_aes256gcm$(EXEEXT) aead_chacha20poly1305$(EXEEXT) \
 	ed25519_convert$(EXEEXT) generichash$(EXEEXT) \
 	generichash2$(EXEEXT) generichash3$(EXEEXT) hash$(EXEEXT) \
 	hash3$(EXEEXT) onetimeauth$(EXEEXT) onetimeauth2$(EXEEXT) \
-	onetimeauth7$(EXEEXT) pwhash$(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) \
@@ -234,6 +235,9 @@ onetimeauth7_DEPENDENCIES = $(TESTS_LDADD)
 pwhash_SOURCES = pwhash.c
 pwhash_OBJECTS = pwhash.$(OBJEXT)
 pwhash_DEPENDENCIES = $(TESTS_LDADD)
+pwhash_scrypt_SOURCES = pwhash_scrypt.c
+pwhash_scrypt_OBJECTS = pwhash_scrypt.$(OBJEXT)
+pwhash_scrypt_DEPENDENCIES = $(TESTS_LDADD)
 pwhash_scrypt_ll_SOURCES = pwhash_scrypt_ll.c
 pwhash_scrypt_ll_OBJECTS = pwhash_scrypt_ll.$(OBJEXT)
 pwhash_scrypt_ll_DEPENDENCIES = $(TESTS_LDADD)
@@ -349,26 +353,26 @@ SOURCES = aead_aes256gcm.c aead_chacha20poly1305.c auth.c auth2.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_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
+	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_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
+	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
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -617,6 +621,8 @@ CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CFLAGS_AESNI = @CFLAGS_AESNI@
+CFLAGS_AVX = @CFLAGS_AVX@
+CFLAGS_AVX2 = @CFLAGS_AVX2@
 CFLAGS_MMX = @CFLAGS_MMX@
 CFLAGS_PCLMUL = @CFLAGS_PCLMUL@
 CFLAGS_SSE2 = @CFLAGS_SSE2@
@@ -689,6 +695,12 @@ SODIUM_LIBRARY_VERSION_MAJOR = @SODIUM_LIBRARY_VERSION_MAJOR@
 SODIUM_LIBRARY_VERSION_MINOR = @SODIUM_LIBRARY_VERSION_MINOR@
 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@
@@ -780,6 +792,7 @@ EXTRA_DIST = \
 	onetimeauth2.exp \
 	onetimeauth7.exp \
 	pwhash.exp \
+	pwhash_scrypt.exp \
 	pwhash_scrypt_ll.exp \
 	randombytes.exp \
 	scalarmult.exp \
@@ -841,6 +854,7 @@ DISTCLEANFILES = \
 	onetimeauth2.res \
 	onetimeauth7.res \
 	pwhash.res \
+	pwhash_scrypt.res \
 	pwhash_scrypt_ll.res \
 	randombytes.res \
 	scalarmult.res \
@@ -902,6 +916,7 @@ DISTCLEANFILES = \
 @NATIVECLIENT_TRUE@	onetimeauth2.final \
 @NATIVECLIENT_TRUE@	onetimeauth7.final \
 @NATIVECLIENT_TRUE@	pwhash.final \
+@NATIVECLIENT_TRUE@	pwhash_scrypt.final \
 @NATIVECLIENT_TRUE@	pwhash_scrypt_ll.final \
 @NATIVECLIENT_TRUE@	randombytes.final \
 @NATIVECLIENT_TRUE@	scalarmult.final \
@@ -959,6 +974,7 @@ DISTCLEANFILES = \
 @NATIVECLIENT_TRUE@	onetimeauth2.nexe \
 @NATIVECLIENT_TRUE@	onetimeauth7.nexe \
 @NATIVECLIENT_TRUE@	pwhash.nexe \
+@NATIVECLIENT_TRUE@	pwhash_scrypt.nexe \
 @NATIVECLIENT_TRUE@	pwhash_scrypt_ll.nexe \
 @NATIVECLIENT_TRUE@	randombytes.nexe \
 @NATIVECLIENT_TRUE@	scalarmult.nexe \
@@ -997,11 +1013,12 @@ TESTS_TARGETS = aead_aes256gcm aead_chacha20poly1305 auth auth2 auth3 \
 	box_seal box_seed chacha20 core1 core2 core3 core4 core5 core6 \
 	ed25519_convert generichash generichash2 generichash3 hash \
 	hash3 onetimeauth onetimeauth2 onetimeauth7 pwhash \
-	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)
+	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_LDADD = \
 	${top_builddir}/src/libsodium/libsodium.la
 
@@ -1071,6 +1088,8 @@ onetimeauth7_SOURCE = cmptest.h onetimeauth7.c
 onetimeauth7_LDADD = $(TESTS_LDADD)
 pwhash_SOURCE = cmptest.h pwhash.c
 pwhash_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
 pwhash_scrypt_ll_LDADD = $(TESTS_LDADD)
 randombytes_SOURCE = cmptest.h randombytes.c
@@ -1297,6 +1316,10 @@ pwhash$(EXEEXT): $(pwhash_OBJECTS) $(pwhash_DEPENDENCIES) $(EXTRA_pwhash_DEPENDE
 	@rm -f pwhash$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(pwhash_OBJECTS) $(pwhash_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)
+
 pwhash_scrypt_ll$(EXEEXT): $(pwhash_scrypt_ll_OBJECTS) $(pwhash_scrypt_ll_DEPENDENCIES) $(EXTRA_pwhash_scrypt_ll_DEPENDENCIES) 
 	@rm -f pwhash_scrypt_ll$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(pwhash_scrypt_ll_OBJECTS) $(pwhash_scrypt_ll_LDADD) $(LIBS)
@@ -1436,6 +1459,7 @@ distclean-compile:
 @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_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@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scalarmult.Po@am__quote@
@@ -1916,6 +1940,13 @@ 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'; \
@@ -2269,6 +2300,8 @@ uninstall-am:
 
 verify: check
 
+@VALGRIND_CHECK_RULES@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: