rbnacl-libsodium 0.6.0 → 0.6.1

data/vendor/libsodium/src/libsodium/crypto_sign/crypto_sign.c

@@ -59,3 +59,18 @@ crypto_sign_open(unsigned char *m, unsigned long long *mlen,
 {
     return crypto_sign_ed25519_open(m, mlen, sm, smlen, pk);
 }
+
+int
+crypto_sign_detached(unsigned char *sig, unsigned long long *siglen,
+                     const unsigned char *m, unsigned long long mlen,
+                     const unsigned char *sk)
+{
+    return crypto_sign_ed25519_detached(sig, siglen, m, mlen, sk);
+}
+
+int
+crypto_sign_verify_detached(const unsigned char *sig, const unsigned char *m,
+                            unsigned long long mlen, const unsigned char *pk)
+{
+    return crypto_sign_ed25519_verify_detached(sig, m, mlen, pk);
+}

data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/api.h

@@ -2,7 +2,9 @@
 #include "crypto_sign_ed25519.h"
 
 #define crypto_sign crypto_sign_ed25519
+#define crypto_sign_detached crypto_sign_ed25519_detached
 #define crypto_sign_open crypto_sign_ed25519_open
+#define crypto_sign_verify_detached crypto_sign_ed25519_verify_detached
 #define crypto_sign_keypair crypto_sign_ed25519_keypair
 #define crypto_sign_seed_keypair crypto_sign_ed25519_seed_keypair
 #define crypto_sign_BYTES crypto_sign_ed25519_BYTES

data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/open.c

@@ -1,4 +1,5 @@
 
+#include <limits.h>
 #include <string.h>
 
 #include "api.h"
@@ -6,45 +7,72 @@
 #include "crypto_verify_32.h"
 #include "ge.h"
 #include "sc.h"
+#include "utils.h"
 
-int crypto_sign_open(
-  unsigned char *m,unsigned long long *mlen,
-  const unsigned char *sm,unsigned long long smlen,
-  const unsigned char *pk
-)
+int
+crypto_sign_verify_detached(const unsigned char *sig, const unsigned char *m,
+                            unsigned long long mlen, const unsigned char *pk)
 {
-  crypto_hash_sha512_state hs;
-  unsigned char h[64];
-  unsigned char rcheck[32];
-  unsigned int  i;
-  unsigned char d = 0;
-  ge_p3 A;
-  ge_p2 R;
-
-  if (smlen < 64) goto badsig;
-  if (sm[63] & 224) goto badsig;
-  if (ge_frombytes_negate_vartime(&A,pk) != 0) goto badsig;
-
-  for (i = 0; i < 32; ++i) d |= pk[i];
-  if (d == 0) return -1;
-
-  crypto_hash_sha512_init(&hs);
-  crypto_hash_sha512_update(&hs, sm, 32);
-  crypto_hash_sha512_update(&hs, pk, 32);
-  crypto_hash_sha512_update(&hs, sm + 64, smlen - 64);
-  crypto_hash_sha512_final(&hs, h);
-  sc_reduce(h);
-
-  ge_double_scalarmult_vartime(&R,h,&A,sm+32);
-  ge_tobytes(rcheck,&R);
-  if (crypto_verify_32(rcheck,sm) == 0) {
-    memmove(m, sm + 64,smlen - 64);
+    crypto_hash_sha512_state hs;
+    unsigned char h[64];
+    unsigned char rcheck[32];
+    unsigned int  i;
+    unsigned char d = 0;
+    ge_p3 A;
+    ge_p2 R;
+
+    if (sig[63] & 224) {
+        return -1;
+    }
+    if (ge_frombytes_negate_vartime(&A, pk) != 0) {
+        return -1;
+    }
+    for (i = 0; i < 32; ++i) {
+        d |= pk[i];
+    }
+    if (d == 0) {
+        return -1;
+    }
+    crypto_hash_sha512_init(&hs);
+    crypto_hash_sha512_update(&hs, sig, 32);
+    crypto_hash_sha512_update(&hs, pk, 32);
+    crypto_hash_sha512_update(&hs, m, mlen);
+    crypto_hash_sha512_final(&hs, h);
+    sc_reduce(h);
+
+    ge_double_scalarmult_vartime(&R, h, &A, sig + 32);
+    ge_tobytes(rcheck, &R);
+
+    if (crypto_verify_32(rcheck, sig) != 0) {
+        return -1;
+    }
+    if (sig == rcheck) {
+        return -1;
+    }
+    if (sodium_memcmp(sig, rcheck, 32) != 0) {
+        return -1;
+    }
+    return 0;
+}
+
+int
+crypto_sign_open(unsigned char *m, unsigned long long *mlen,
+                 const unsigned char *sm, unsigned long long smlen,
+                 const unsigned char *pk)
+{
+    if (smlen < 64 || smlen > SIZE_MAX) {
+        goto badsig;
+    }
+    if (crypto_sign_verify_detached(sm, sm + 64, smlen - 64, pk) != 0) {
+        memset(m, 0, smlen - 64);
+        goto badsig;
+    }
     *mlen = smlen - 64;
+    memmove(m, sm + 64, *mlen);
+
     return 0;
-  }
 
 badsig:
-  *mlen = 0;
-  memset(m, 0, smlen - 64);
-  return -1;
+    *mlen = 0;
+    return -1;
 }

data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/sign.c

@@ -6,38 +6,66 @@
 #include "ge.h"
 #include "sc.h"
 
-int crypto_sign(
-  unsigned char *sm,unsigned long long *smlen,
-  const unsigned char *m,unsigned long long mlen,
-  const unsigned char *sk
-)
+int
+crypto_sign_detached(unsigned char *sig, unsigned long long *siglen,
+                     const unsigned char *m, unsigned long long mlen,
+                     const unsigned char *sk)
 {
-  unsigned char pk[32];
-  unsigned char az[64];
-  unsigned char nonce[64];
-  unsigned char hram[64];
-  ge_p3 R;
-
-  memmove(pk,sk + 32,32);
-
-  crypto_hash_sha512(az,sk,32);
-  az[0] &= 248;
-  az[31] &= 63;
-  az[31] |= 64;
-
-  *smlen = mlen + 64;
-  memmove(sm + 64,m,mlen);
-  memmove(sm + 32,az + 32,32);
-  crypto_hash_sha512(nonce,sm + 32,mlen + 32);
-  memmove(sm + 32,pk,32);
-
-  sc_reduce(nonce);
-  ge_scalarmult_base(&R,nonce);
-  ge_p3_tobytes(sm,&R);
-
-  crypto_hash_sha512(hram,sm,mlen + 64);
-  sc_reduce(hram);
-  sc_muladd(sm + 32,hram,az,nonce);
-
-  return 0;
+    crypto_hash_sha512_state hs;
+    unsigned char pk[32];
+    unsigned char az[64];
+    unsigned char nonce[64];
+    unsigned char hram[64];
+    ge_p3 R;
+
+    memmove(pk, sk + 32, 32);
+
+    crypto_hash_sha512(az, sk, 32);
+    az[0] &= 248;
+    az[31] &= 63;
+    az[31] |= 64;
+
+    crypto_hash_sha512_init(&hs);
+    crypto_hash_sha512_update(&hs, az + 32, 32);
+    crypto_hash_sha512_update(&hs, m, mlen);
+    crypto_hash_sha512_final(&hs, nonce);
+
+    memmove(sig + 32, pk, 32);
+
+    sc_reduce(nonce);
+    ge_scalarmult_base(&R, nonce);
+    ge_p3_tobytes(sig, &R);
+
+    crypto_hash_sha512_init(&hs);
+    crypto_hash_sha512_update(&hs, sig, 64);
+    crypto_hash_sha512_update(&hs, m, mlen);
+    crypto_hash_sha512_final(&hs, hram);
+
+    sc_reduce(hram);
+    sc_muladd(sig + 32, hram, az, nonce);
+
+    if (siglen != NULL) {
+        *siglen = 64U;
+    }
+    return 0;
+}
+
+int
+crypto_sign(unsigned char *sm, unsigned long long *smlen,
+            const unsigned char *m, unsigned long long mlen,
+            const unsigned char *sk)
+{
+    unsigned long long siglen;
+
+    if (crypto_sign_detached(sm, &siglen, m, mlen, sk) != 0 ||
+        siglen > crypto_sign_ed25519_BYTES) {
+        *smlen = 0;
+        memset(sm, 0, mlen + crypto_sign_ed25519_BYTES);
+        return -1;
+    }
+    memmove(sm + siglen, m, mlen);
+    if (smlen != NULL) {
+        *smlen = mlen + siglen;
+    }
+    return 0;
 }

data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/aes-table-be.h

@@ -2,7 +2,7 @@
 #ifndef __AES_TABLE_BE_H__
 #define __AES_TABLE_BE_H__
 
-static unsigned int T0[256] = {
+ALIGN(64) static unsigned int T0[256] = {
     0xc66363a5, 0xf87c7c84, 0xee777799, 0xf67b7b8d,
     0xfff2f20d, 0xd66b6bbd, 0xde6f6fb1, 0x91c5c554,
     0x60303050, 0x02010103, 0xce6767a9, 0x562b2b7d,
@@ -69,8 +69,7 @@ static unsigned int T0[256] = {
     0x7bb0b0cb, 0xa85454fc, 0x6dbbbbd6, 0x2c16163a
 };
 
-
-static unsigned int T1[256] = {
+ALIGN(64) static unsigned int T1[256] = {
     0xa5c66363, 0x84f87c7c, 0x99ee7777, 0x8df67b7b,
     0x0dfff2f2, 0xbdd66b6b, 0xb1de6f6f, 0x5491c5c5,
     0x50603030, 0x03020101, 0xa9ce6767, 0x7d562b2b,
@@ -137,7 +136,7 @@ static unsigned int T1[256] = {
     0xcb7bb0b0, 0xfca85454, 0xd66dbbbb, 0x3a2c1616
 };
 
-static unsigned int T2[256] = {
+ALIGN(64) static unsigned int T2[256] = {
     0x63a5c663, 0x7c84f87c, 0x7799ee77, 0x7b8df67b,
     0xf20dfff2, 0x6bbdd66b, 0x6fb1de6f, 0xc55491c5,
     0x30506030, 0x01030201, 0x67a9ce67, 0x2b7d562b,
@@ -204,7 +203,7 @@ static unsigned int T2[256] = {
     0xb0cb7bb0, 0x54fca854, 0xbbd66dbb, 0x163a2c16
 };
 
-static unsigned int T3[256] = {
+ALIGN(64) static unsigned int T3[256] = {
     0x6363a5c6, 0x7c7c84f8, 0x777799ee, 0x7b7b8df6,
     0xf2f20dff, 0x6b6bbdd6, 0x6f6fb1de, 0xc5c55491,
     0x30305060, 0x01010302, 0x6767a9ce, 0x2b2b7d56,

data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/aes-table-le.h

@@ -2,7 +2,7 @@
 #ifndef __AES_TABLE_LE_H__
 #define __AES_TABLE_LE_H__
 
-static unsigned int T0[256] = {
+ALIGN(64) static unsigned int T0[256] = {
     0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6,
     0x0df2f2ff, 0xbd6b6bd6, 0xb16f6fde, 0x54c5c591,
     0x50303060, 0x03010102, 0xa96767ce, 0x7d2b2b56,
@@ -70,7 +70,7 @@ static unsigned int T0[256] = {
 };
 
 
-static unsigned int T1[256] = {
+ALIGN(64) static unsigned int T1[256] = {
     0x6363c6a5, 0x7c7cf884, 0x7777ee99, 0x7b7bf68d,
     0xf2f2ff0d, 0x6b6bd6bd, 0x6f6fdeb1, 0xc5c59154,
     0x30306050, 0x01010203, 0x6767cea9, 0x2b2b567d,
@@ -137,7 +137,7 @@ static unsigned int T1[256] = {
     0xb0b07bcb, 0x5454a8fc, 0xbbbb6dd6, 0x16162c3a
 };
 
-static unsigned int T2[256] = {
+ALIGN(64) static unsigned int T2[256] = {
     0x63c6a563, 0x7cf8847c, 0x77ee9977, 0x7bf68d7b,
     0xf2ff0df2, 0x6bd6bd6b, 0x6fdeb16f, 0xc59154c5,
     0x30605030, 0x01020301, 0x67cea967, 0x2b567d2b,
@@ -204,7 +204,7 @@ static unsigned int T2[256] = {
     0xb07bcbb0, 0x54a8fc54, 0xbb6dd6bb, 0x162c3a16
 };
 
-static unsigned int T3[256] = {
+ALIGN(64) static unsigned int T3[256] = {
     0xc6a56363, 0xf8847c7c, 0xee997777, 0xf68d7b7b,
     0xff0df2f2, 0xd6bd6b6b, 0xdeb16f6f, 0x9154c5c5,
     0x60503030, 0x02030101, 0xcea96767, 0x567d2b2b,

data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/aes-table.h

@@ -2,6 +2,12 @@
 #ifndef __AES_TABLE_H__
 #define __AES_TABLE_H__
 
+#if defined(_MSC_VER)
+# define ALIGN(x) __declspec(align(x))
+#else
+# define ALIGN(x) __attribute__((aligned(x)))
+#endif
+
 #ifdef NATIVE_LITTLE_ENDIAN
 # include "aes-table-le.h"
 #elif defined(NATIVE_BIG_ENDIAN)
@@ -20,7 +26,7 @@ static const unsigned char Rcon[31] =
 };
 
 
-static const unsigned char Sbox[256] = {
+ALIGN(64) static const unsigned char Sbox[256] = {
         0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5,
         0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
         0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,

data/vendor/libsodium/src/libsodium/include/Makefile.in

@@ -87,7 +87,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.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 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -195,7 +195,6 @@ FGREP = @FGREP@
 GREP = @GREP@
 HAVE_AMD64_ASM_V = @HAVE_AMD64_ASM_V@
 HAVE_CPUID_V = @HAVE_CPUID_V@
-HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 HAVE_TI_MODE_V = @HAVE_TI_MODE_V@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -231,9 +230,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SAFECODE_HOME = @SAFECODE_HOME@
 SED = @SED@

data/vendor/libsodium/src/libsodium/include/sodium/crypto_sign.h

@@ -57,6 +57,16 @@ int crypto_sign_open(unsigned char *m, unsigned long long *mlen,
                      const unsigned char *sm, unsigned long long smlen,
                      const unsigned char *pk);
 
+SODIUM_EXPORT
+int crypto_sign_detached(unsigned char *sig, unsigned long long *siglen,
+                         const unsigned char *m, unsigned long long mlen,
+                         const unsigned char *sk);
+
+SODIUM_EXPORT
+int crypto_sign_verify_detached(const unsigned char *sig,
+                                const unsigned char *m,
+                                unsigned long long mlen,
+                                const unsigned char *pk);
 #ifdef __cplusplus
 }
 #endif

data/vendor/libsodium/src/libsodium/include/sodium/crypto_sign_ed25519.h

@@ -37,6 +37,19 @@ int crypto_sign_ed25519_open(unsigned char *m, unsigned long long *mlen,
                              const unsigned char *sm, unsigned long long smlen,
                              const unsigned char *pk);
 
+SODIUM_EXPORT
+int crypto_sign_ed25519_detached(unsigned char *sig,
+                                 unsigned long long *siglen,
+                                 const unsigned char *m,
+                                 unsigned long long mlen,
+                                 const unsigned char *sk);
+
+SODIUM_EXPORT
+int crypto_sign_ed25519_verify_detached(const unsigned char *sig,
+                                        const unsigned char *m,
+                                        unsigned long long mlen,
+                                        const unsigned char *pk);
+
 SODIUM_EXPORT
 int crypto_sign_ed25519_keypair(unsigned char *pk, unsigned char *sk);
 

data/vendor/libsodium/test/Makefile.in

@@ -85,7 +85,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.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 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -206,7 +206,6 @@ FGREP = @FGREP@
 GREP = @GREP@
 HAVE_AMD64_ASM_V = @HAVE_AMD64_ASM_V@
 HAVE_CPUID_V = @HAVE_CPUID_V@
-HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 HAVE_TI_MODE_V = @HAVE_TI_MODE_V@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -242,9 +241,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SAFECODE_HOME = @SAFECODE_HOME@
 SED = @SED@

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

@@ -173,10 +173,14 @@ TESTS_TARGETS = \
 	stream2 \
 	stream3 \
 	stream4 \
-	stream5 \
-	stream6 \
 	verify1
 
+if !MINIMAL
+TESTS_TARGETS += \
+	stream5 \
+	stream6
+endif
+
 check_PROGRAMS = $(TESTS_TARGETS)
 
 TESTS = $(TESTS_TARGETS)

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

@@ -77,8 +77,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-check_PROGRAMS = $(am__EXEEXT_1)
-TESTS = $(am__EXEEXT_1)
+@MINIMAL_FALSE@am__append_1 = \
+@MINIMAL_FALSE@	stream5 \
+@MINIMAL_FALSE@	stream6
+
+check_PROGRAMS = $(am__EXEEXT_2)
+TESTS = $(am__EXEEXT_2)
 subdir = test/default
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/depcomp $(top_srcdir)/test-driver
@@ -88,13 +92,14 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.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 \
-	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__EXEEXT_1 = aead_chacha20poly1305$(EXEEXT) auth$(EXEEXT) \
+@MINIMAL_FALSE@am__EXEEXT_1 = stream5$(EXEEXT) stream6$(EXEEXT)
+am__EXEEXT_2 = 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) \
@@ -112,7 +117,7 @@ am__EXEEXT_1 = aead_chacha20poly1305$(EXEEXT) auth$(EXEEXT) \
 	shorthash$(EXEEXT) sign$(EXEEXT) sodium_core$(EXEEXT) \
 	sodium_utils$(EXEEXT) sodium_version$(EXEEXT) stream$(EXEEXT) \
 	stream2$(EXEEXT) stream3$(EXEEXT) stream4$(EXEEXT) \
-	stream5$(EXEEXT) stream6$(EXEEXT) verify1$(EXEEXT)
+	verify1$(EXEEXT) $(am__EXEEXT_1)
 aead_chacha20poly1305_SOURCES = aead_chacha20poly1305.c
 aead_chacha20poly1305_OBJECTS = aead_chacha20poly1305.$(OBJEXT)
 aead_chacha20poly1305_DEPENDENCIES = $(TESTS_LDADD)
@@ -598,7 +603,6 @@ FGREP = @FGREP@
 GREP = @GREP@
 HAVE_AMD64_ASM_V = @HAVE_AMD64_ASM_V@
 HAVE_CPUID_V = @HAVE_CPUID_V@
-HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 HAVE_TI_MODE_V = @HAVE_TI_MODE_V@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -634,9 +638,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SAFECODE_HOME = @SAFECODE_HOME@
 SED = @SED@
@@ -821,62 +822,15 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/src/libsodium/include/sodium \
 	-I$(top_srcdir)/test/quirks
 
-TESTS_TARGETS = \
-	aead_chacha20poly1305 \
-	auth \
-	auth2 \
-	auth3 \
-	auth5 \
-	auth6 \
-	auth7 \
-	box \
-	box2 \
-	box7 \
-	box8 \
-	box_easy \
-	box_easy2 \
-	box_seed \
-	chacha20 \
-	core1 \
-	core2 \
-	core3 \
-	core4 \
-	core5 \
-	core6 \
-	generichash \
-	generichash2 \
-	generichash3 \
-	hash \
-	hash3 \
-	onetimeauth \
-	onetimeauth2 \
-	onetimeauth7 \
-	pwhash \
-	pwhash_scrypt_ll \
-	randombytes \
-	scalarmult \
-	scalarmult2 \
-	scalarmult5 \
-	scalarmult6 \
-	secretbox \
-	secretbox2 \
-	secretbox7 \
-	secretbox8 \
-	secretbox_easy \
-	secretbox_easy2 \
-	shorthash \
-	sign \
-	sodium_core \
-	sodium_utils \
-	sodium_version \
-	stream \
-	stream2 \
-	stream3 \
-	stream4 \
-	stream5 \
-	stream6 \
-	verify1
-
+TESTS_TARGETS = aead_chacha20poly1305 auth auth2 auth3 auth5 auth6 \
+	auth7 box box2 box7 box8 box_easy box_easy2 box_seed chacha20 \
+	core1 core2 core3 core4 core5 core6 generichash generichash2 \
+	generichash3 hash hash3 onetimeauth onetimeauth2 onetimeauth7 \
+	pwhash pwhash_scrypt_ll randombytes scalarmult scalarmult2 \
+	scalarmult5 scalarmult6 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
 
@@ -1889,6 +1843,13 @@ stream4.log: stream4$(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)
+verify1.log: verify1$(EXEEXT)
+	@p='verify1$(EXEEXT)'; \
+	b='verify1'; \
+	$(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)
 stream5.log: stream5$(EXEEXT)
 	@p='stream5$(EXEEXT)'; \
 	b='stream5'; \
@@ -1903,13 +1864,6 @@ stream6.log: stream6$(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)
-verify1.log: verify1$(EXEEXT)
-	@p='verify1$(EXEEXT)'; \
-	b='verify1'; \
-	$(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); \