rbnacl-libsodium 1.0.2 → 1.0.3

data/vendor/libsodium/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c

@@ -4,6 +4,9 @@
 # include <sys/stat.h>
 # include <sys/time.h>
 #endif
+#ifdef __linux__
+# include <sys/syscall.h>
+#endif
 
 #include <assert.h>
 #include <errno.h>
@@ -43,12 +46,6 @@ randombytes_sysrandom_stir(void)
 {
 }
 
-uint32_t
-randombytes_sysrandom_uniform(const uint32_t upper_bound)
-{
-    return arc4random_uniform(upper_bound);
-}
-
 void
 randombytes_sysrandom_buf(void * const buf, const size_t size)
 {
@@ -64,25 +61,27 @@ randombytes_sysrandom_close(void)
 #else /* __OpenBSD__ */
 
 typedef struct SysRandom_ {
-    int        random_data_source_fd;
-    int        initialized;
+    int random_data_source_fd;
+    int initialized;
+    int getrandom_available;
 } SysRandom;
 
 static SysRandom stream = {
     SODIUM_C99(.random_data_source_fd =) -1,
-    SODIUM_C99(.initialized =) 0
+    SODIUM_C99(.initialized =) 0,
+    SODIUM_C99(.getrandom_available =) 0
 };
 
 #ifndef _WIN32
 static ssize_t
-safe_read(const int fd, void * const buf_, size_t count)
+safe_read(const int fd, void * const buf_, size_t size)
 {
     unsigned char *buf = (unsigned char *) buf_;
     ssize_t        readnb;
 
-    assert(count > (size_t) 0U);
+    assert(size > (size_t) 0U);
     do {
-        while ((readnb = read(fd, buf, count)) < (ssize_t) 0 &&
+        while ((readnb = read(fd, buf, size)) < (ssize_t) 0 &&
                (errno == EINTR || errno == EAGAIN)); /* LCOV_EXCL_LINE */
         if (readnb < (ssize_t) 0) {
             return readnb; /* LCOV_EXCL_LINE */
@@ -90,9 +89,9 @@ safe_read(const int fd, void * const buf_, size_t count)
         if (readnb == (ssize_t) 0) {
             break; /* LCOV_EXCL_LINE */
         }
-        count -= (size_t) readnb;
+        size -= (size_t) readnb;
         buf += readnb;
-    } while (count > (ssize_t) 0);
+    } while (size > (ssize_t) 0);
 
     return (ssize_t) (buf - (unsigned char *) buf_);
 }
@@ -134,10 +133,59 @@ randombytes_sysrandom_random_dev_open(void)
 /* LCOV_EXCL_STOP */
 }
 
+# ifdef SYS_getrandom
+static int
+_randombytes_linux_getrandom(void * const buf, const size_t size)
+{
+    int readnb;
+
+    assert(size <= 256U);
+    do {
+        readnb = syscall(SYS_getrandom, buf, (int) size, 0);
+    } while (readnb < 0 && (errno == EINTR || errno == EAGAIN));
+
+    return (readnb == (int) size) - 1;
+}
+
+static int
+randombytes_linux_getrandom(void * const buf_, size_t size)
+{
+    unsigned char *buf = (unsigned char *) buf_;
+    size_t         chunk_size = 256U;
+
+    do {
+        if (size < chunk_size) {
+            chunk_size = size;
+            assert(chunk_size > (size_t) 0U);
+        }
+        if (_randombytes_linux_getrandom(buf, chunk_size) != 0) {
+            return -1;
+        }
+        size -= chunk_size;
+        buf += chunk_size;
+    } while (size > (size_t) 0U);
+
+    return 0;
+}
+# endif
+
 static void
 randombytes_sysrandom_init(void)
 {
-    const int errno_save = errno;
+    const int     errno_save = errno;
+
+# ifdef SYS_getrandom
+    {
+	unsigned char fodder[16];
+
+	if (randombytes_linux_getrandom(fodder, sizeof fodder) == 0) {
+	    stream.getrandom_available = 1;
+	    errno = errno_save;
+	    return;
+	}
+	stream.getrandom_available = 0;
+    }
+# endif
 
     if ((stream.random_data_source_fd =
          randombytes_sysrandom_random_dev_open()) == -1) {
@@ -183,6 +231,11 @@ randombytes_sysrandom_close(void)
         stream.initialized = 0;
         ret = 0;
     }
+# ifdef SYS_getrandom
+    if (stream.getrandom_available != 0) {
+        ret = 0;
+    }
+# endif
 #else /* _WIN32 */
     if (stream.initialized != 0) {
         stream.initialized = 0;
@@ -211,7 +264,16 @@ randombytes_sysrandom_buf(void * const buf, const size_t size)
     assert(size <= ULONG_LONG_MAX);
 #endif
 #ifndef _WIN32
-    if (safe_read(stream.random_data_source_fd, buf, size) != (ssize_t) size) {
+# ifdef SYS_getrandom
+    if (stream.getrandom_available != 0) {
+        if (randombytes_linux_getrandom(buf, size) != 0) {
+            abort();
+        }
+        return;
+    }
+# endif
+    if (stream.random_data_source_fd == -1 ||
+        safe_read(stream.random_data_source_fd, buf, size) != (ssize_t) size) {
         abort(); /* LCOV_EXCL_LINE */
     }
 #else
@@ -224,31 +286,7 @@ randombytes_sysrandom_buf(void * const buf, const size_t size)
 #endif
 }
 
-/*
- * randombytes_sysrandom_uniform() derives from OpenBSD's arc4random_uniform()
- * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
- */
-
-uint32_t
-randombytes_sysrandom_uniform(const uint32_t upper_bound)
-{
-    uint32_t min;
-    uint32_t r;
-
-    if (upper_bound < 2) {
-        return 0;
-    }
-    min = (uint32_t) (-upper_bound % upper_bound);
-    for (;;) {
-        r = randombytes_sysrandom();
-        if (r >= min) {
-            break;
-        }
-    } /* LCOV_EXCL_LINE */
-    return r % upper_bound;
-}
-
-#endif
+#endif /* __OpenBSD__ */
 
 const char *
 randombytes_sysrandom_implementation_name(void)
@@ -260,7 +298,7 @@ struct randombytes_implementation randombytes_sysrandom_implementation = {
     SODIUM_C99(.implementation_name =) randombytes_sysrandom_implementation_name,
     SODIUM_C99(.random =) randombytes_sysrandom,
     SODIUM_C99(.stir =) randombytes_sysrandom_stir,
-    SODIUM_C99(.uniform =) randombytes_sysrandom_uniform,
+    SODIUM_C99(.uniform =) NULL,
     SODIUM_C99(.buf =) randombytes_sysrandom_buf,
     SODIUM_C99(.close =) randombytes_sysrandom_close
 };

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

@@ -108,14 +108,14 @@ sodium_bin2hex(char * const hex, const size_t hex_maxlen,
     while (i < bin_len) {
         c = bin[i] & 0xf;
         b = bin[i] >> 4;
-        x = (unsigned char) (87 + c + (((c - 10) >> 31) & -39)) << 8 |
-            (unsigned char) (87 + b + (((b - 10) >> 31) & -39));
+        x = (unsigned char) (87U + c + (((c - 10U) >> 8) & ~38U)) << 8 |
+            (unsigned char) (87U + b + (((b - 10U) >> 8) & ~38U));
         hex[i * 2U] = (char) x;
         x >>= 8;
         hex[i * 2U + 1U] = (char) x;
         i++;
     }
-    hex[i * 2U] = 0;
+    hex[i * 2U] = 0U;
 
     return hex;
 }
@@ -131,22 +131,25 @@ sodium_hex2bin(unsigned char * const bin, const size_t bin_maxlen,
     int           ret = 0;
     unsigned char c;
     unsigned char c_acc = 0U;
-    unsigned char c_num;
+    unsigned char c_alpha0, c_alpha;
+    unsigned char c_num0, c_num;
     unsigned char c_val;
     unsigned char state = 0U;
 
     while (hex_pos < hex_len) {
         c = (unsigned char) hex[hex_pos];
-        if ((c_num = c ^ 48U) < 10U) {
-            c_val = c_num;
-        } else if ((c_num = (c & ~32U)) > 64 && c_num < 71U) {
-            c_val = c_num - 55U;
-        } else if (ignore != NULL && strchr(ignore, c) != NULL && state == 0U) {
-            hex_pos++;
-            continue;
-        } else {
+        c_num = c ^ 48U;
+        c_num0 = (c_num - 10U) >> 8;
+        c_alpha = (c & ~32U) - 55U;
+        c_alpha0 = ((c_alpha - 10U) ^ (c_alpha - 16U)) >> 8;
+        if ((c_num0 | c_alpha0) == 0U) {
+            if (ignore != NULL && state == 0U && strchr(ignore, c) != NULL) {
+                hex_pos++;
+                continue;
+            }
             break;
         }
+        c_val = (c_num0 & c_num) | (c_alpha0 & c_alpha);
         if (bin_pos >= bin_maxlen) {
             ret = -1;
             errno = ERANGE;
@@ -413,7 +416,7 @@ sodium_allocarray(size_t count, size_t size)
 {
     size_t total_size;
 
-    if (size >= (size_t) SIZE_MAX / count) {
+    if (count > (size_t) 0U && size >= (size_t) SIZE_MAX / count) {
         errno = ENOMEM;
         return NULL;
     }

data/vendor/libsodium/test/Makefile.am

@@ -2,4 +2,4 @@ SUBDIRS = \
 	default
 
 EXTRA_DIST = \
-	quirks/windows/windows-quirks.h
+	quirks/quirks.h

data/vendor/libsodium/test/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -78,7 +88,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = test
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_check_link_flag.m4 \
@@ -88,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -146,6 +156,7 @@ am__define_uniq_tagged_files = \
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -308,7 +319,7 @@ SUBDIRS = \
 	default
 
 EXTRA_DIST = \
-	quirks/windows/windows-quirks.h
+	quirks/quirks.h
 
 all: all-recursive
 
@@ -325,7 +336,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign test/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -620,6 +630,8 @@ uninstall-am:
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 	ps ps-am tags tags-am uninstall uninstall-am
 
+.PRECIOUS: Makefile
+
 
 # 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.

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

@@ -16,6 +16,7 @@ EXTRA_DIST = \
 	box8.exp \
 	box_easy.exp \
 	box_easy2.exp \
+	box_seal.exp \
 	box_seed.exp \
 	chacha20.exp \
 	core1.exp \
@@ -75,6 +76,7 @@ DISTCLEANFILES = \
 	box8.res \
 	box_easy.res \
 	box_easy2.res \
+	box_seal.res \
 	box_seed.res \
 	chacha20.res \
 	core1.res \
@@ -144,6 +146,7 @@ TESTS_TARGETS = \
 	box8 \
 	box_easy \
 	box_easy2 \
+	box_seal \
 	box_seed \
 	chacha20 \
 	core1 \
@@ -211,13 +214,13 @@ auth2_LDADD               = $(TESTS_LDADD)
 auth3_SOURCE              = cmptest.h auth3.c
 auth3_LDADD               = $(TESTS_LDADD)
 
-auth5_SOURCE              = cmptest.h auth5.c windows/windows-quirks.h
+auth5_SOURCE              = cmptest.h auth5.c quirks.h
 auth5_LDADD               = $(TESTS_LDADD)
 
-auth6_SOURCE              = cmptest.h auth6.c windows/windows-quirks.h
+auth6_SOURCE              = cmptest.h auth6.c quirks.h
 auth6_LDADD               = $(TESTS_LDADD)
 
-auth7_SOURCE              = cmptest.h auth7.c windows/windows-quirks.h
+auth7_SOURCE              = cmptest.h auth7.c quirks.h
 auth7_LDADD               = $(TESTS_LDADD)
 
 box_SOURCE                = cmptest.h box.c
@@ -238,6 +241,9 @@ box_easy_LDADD            = $(TESTS_LDADD)
 box_easy2_SOURCE          = cmptest.h box_easy2.c
 box_easy2_LDADD           = $(TESTS_LDADD)
 
+box_seal_SOURCE           = cmptest.h box_seal.c
+box_seal_LDADD            = $(TESTS_LDADD)
+
 box_seed_SOURCE           = cmptest.h box_seed.c
 box_seed_LDADD            = $(TESTS_LDADD)
 

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

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -84,9 +94,6 @@ host_triplet = @host@
 check_PROGRAMS = $(am__EXEEXT_2)
 TESTS = $(am__EXEEXT_2)
 subdir = test/default
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/build-aux/depcomp \
-	$(top_srcdir)/build-aux/test-driver
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_check_link_flag.m4 \
@@ -96,6 +103,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -105,11 +113,12 @@ 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) \
-	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) \
+	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_ll$(EXEEXT) randombytes$(EXEEXT) \
 	scalarmult$(EXEEXT) scalarmult2$(EXEEXT) scalarmult5$(EXEEXT) \
@@ -163,6 +172,9 @@ box_easy_DEPENDENCIES = $(TESTS_LDADD)
 box_easy2_SOURCES = box_easy2.c
 box_easy2_OBJECTS = box_easy2.$(OBJEXT)
 box_easy2_DEPENDENCIES = $(TESTS_LDADD)
+box_seal_SOURCES = box_seal.c
+box_seal_OBJECTS = box_seal.$(OBJEXT)
+box_seal_DEPENDENCIES = $(TESTS_LDADD)
 box_seed_SOURCES = box_seed.c
 box_seed_OBJECTS = box_seed.$(OBJEXT)
 box_seed_DEPENDENCIES = $(TESTS_LDADD)
@@ -328,28 +340,30 @@ am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = 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_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
+	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
 DIST_SOURCES = 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_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
+	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
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -578,6 +592,9 @@ TEST_LOGS = $(am__test_logs2:.test.log=.log)
 TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
 TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 	$(TEST_LOG_FLAGS)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(top_srcdir)/build-aux/depcomp \
+	$(top_srcdir)/build-aux/test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -728,6 +745,7 @@ EXTRA_DIST = \
 	box8.exp \
 	box_easy.exp \
 	box_easy2.exp \
+	box_seal.exp \
 	box_seed.exp \
 	chacha20.exp \
 	core1.exp \
@@ -787,6 +805,7 @@ DISTCLEANFILES = \
 	box8.res \
 	box_easy.res \
 	box_easy2.res \
+	box_seal.res \
 	box_seed.res \
 	chacha20.res \
 	core1.res \
@@ -842,8 +861,8 @@ AM_CPPFLAGS = \
 
 AM_LDFLAGS = @TEST_LDFLAGS@
 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 ed25519_convert \
+	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_ll randombytes \
 	scalarmult scalarmult2 scalarmult5 scalarmult6 scalarmult7 \
@@ -862,11 +881,11 @@ auth2_SOURCE = cmptest.h auth2.c
 auth2_LDADD = $(TESTS_LDADD)
 auth3_SOURCE = cmptest.h auth3.c
 auth3_LDADD = $(TESTS_LDADD)
-auth5_SOURCE = cmptest.h auth5.c windows/windows-quirks.h
+auth5_SOURCE = cmptest.h auth5.c quirks.h
 auth5_LDADD = $(TESTS_LDADD)
-auth6_SOURCE = cmptest.h auth6.c windows/windows-quirks.h
+auth6_SOURCE = cmptest.h auth6.c quirks.h
 auth6_LDADD = $(TESTS_LDADD)
-auth7_SOURCE = cmptest.h auth7.c windows/windows-quirks.h
+auth7_SOURCE = cmptest.h auth7.c quirks.h
 auth7_LDADD = $(TESTS_LDADD)
 box_SOURCE = cmptest.h box.c
 box_LDADD = $(TESTS_LDADD)
@@ -880,6 +899,8 @@ box_easy_SOURCE = cmptest.h box_easy.c
 box_easy_LDADD = $(TESTS_LDADD)
 box_easy2_SOURCE = cmptest.h box_easy2.c
 box_easy2_LDADD = $(TESTS_LDADD)
+box_seal_SOURCE = cmptest.h box_seal.c
+box_seal_LDADD = $(TESTS_LDADD)
 box_seed_SOURCE = cmptest.h box_seed.c
 box_seed_LDADD = $(TESTS_LDADD)
 chacha20_SOURCE = cmptest.h chacha20.c
@@ -982,7 +1003,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/default/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign test/default/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -1062,6 +1082,10 @@ box_easy2$(EXEEXT): $(box_easy2_OBJECTS) $(box_easy2_DEPENDENCIES) $(EXTRA_box_e
 	@rm -f box_easy2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(box_easy2_OBJECTS) $(box_easy2_LDADD) $(LIBS)
 
+box_seal$(EXEEXT): $(box_seal_OBJECTS) $(box_seal_DEPENDENCIES) $(EXTRA_box_seal_DEPENDENCIES) 
+	@rm -f box_seal$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(box_seal_OBJECTS) $(box_seal_LDADD) $(LIBS)
+
 box_seed$(EXEEXT): $(box_seed_OBJECTS) $(box_seed_DEPENDENCIES) $(EXTRA_box_seed_DEPENDENCIES) 
 	@rm -f box_seed$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(box_seed_OBJECTS) $(box_seed_LDADD) $(LIBS)
@@ -1253,6 +1277,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/box8.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/box_easy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/box_easy2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/box_seal.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/box_seed.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chacha20.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/core1.Po@am__quote@
@@ -1409,7 +1434,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 	if test -n "$$am__remaking_logs"; then \
 	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
 	       "recursion detected" >&2; \
-	else \
+	elif test -n "$$redo_logs"; then \
 	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
 	fi; \
 	if $(am__make_dryrun); then :; else \
@@ -1611,6 +1636,13 @@ box_easy2.log: box_easy2$(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)
+box_seal.log: box_seal$(EXEEXT)
+	@p='box_seal$(EXEEXT)'; \
+	b='box_seal'; \
+	$(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)
 box_seed.log: box_seed$(EXEEXT)
 	@p='box_seed$(EXEEXT)'; \
 	b='box_seed'; \
@@ -2084,6 +2116,8 @@ uninstall-am:
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	recheck tags tags-am uninstall uninstall-am
 
+.PRECIOUS: Makefile
+
 
 verify: check