rbnacl-libsodium 0.7.0 → 1.0.0

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

@@ -83,12 +83,12 @@ safe_read(const int fd, void * const buf_, size_t count)
     assert(count > (size_t) 0U);
     do {
         while ((readnb = read(fd, buf, count)) < (ssize_t) 0 &&
-               errno == EINTR);
+               errno == EINTR); /* LCOV_EXCL_LINE */
         if (readnb < (ssize_t) 0) {
-            return readnb;
+            return readnb; /* LCOV_EXCL_LINE */
         }
         if (readnb == (ssize_t) 0) {
-            break;
+            break; /* LCOV_EXCL_LINE */
         }
         count -= (size_t) readnb;
         buf += readnb;
@@ -102,6 +102,7 @@ safe_read(const int fd, void * const buf_, size_t count)
 static int
 randombytes_sysrandom_random_dev_open(void)
 {
+/* LCOV_EXCL_START */
     struct stat        st;
     static const char *devices[] = {
 # ifndef USE_BLOCKING_RANDOM
@@ -123,6 +124,7 @@ randombytes_sysrandom_random_dev_open(void)
     } while (*device != NULL);
 
     return -1;
+/* LCOV_EXCL_STOP */
 }
 
 static void
@@ -132,7 +134,7 @@ randombytes_sysrandom_init(void)
 
     if ((stream.random_data_source_fd =
          randombytes_sysrandom_random_dev_open()) == -1) {
-        abort();
+        abort(); /* LCOV_EXCL_LINE */
     }
     errno = errno_save;
 }
@@ -203,14 +205,14 @@ randombytes_sysrandom_buf(void * const buf, const size_t size)
 #endif
 #ifndef _WIN32
     if (safe_read(stream.random_data_source_fd, buf, size) != (ssize_t) size) {
-        abort();
+        abort(); /* LCOV_EXCL_LINE */
     }
 #else
     if (size > 0xffffffff) {
-        abort();
+        abort(); /* LCOV_EXCL_LINE */
     }
     if (! RtlGenRandom((PVOID) buf, (ULONG) size)) {
-        abort();
+        abort(); /* LCOV_EXCL_LINE */
     }
 #endif
 }
@@ -235,7 +237,7 @@ randombytes_sysrandom_uniform(const uint32_t upper_bound)
         if (r >= min) {
             break;
         }
-    }
+    } /* LCOV_EXCL_LINE */
     return r % upper_bound;
 }
 

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

@@ -15,7 +15,7 @@ sodium_init(void)
     }
     sodium_runtime_get_cpu_features();
     if (crypto_onetimeauth_pick_best_implementation() == NULL) {
-        return -1;
+        return -1; /* LCOV_EXCL_LINE */
     }
     randombytes_stir();
     _sodium_alloc_init();

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

@@ -44,7 +44,7 @@ static void
 _cpuid(unsigned int cpu_info[4U], const unsigned int cpu_info_type)
 {
 #ifdef _MSC_VER
-    __cpuidex((int *) cpu_info, cpu_info_type, 0);
+    __cpuid((int *) cpu_info, cpu_info_type);
 #elif defined(HAVE_CPUID)
     cpu_info[0] = cpu_info[1] = cpu_info[2] = cpu_info[3] = 0;
 # ifdef __i386__
@@ -56,7 +56,7 @@ _cpuid(unsigned int cpu_info[4U], const unsigned int cpu_info_type)
                           "=&r" (cpu_info[0]), "=&r" (cpu_info[1]) :
                           "i" (0x200000));
     if (((cpu_info[0] ^ cpu_info[1]) & 0x200000) == 0x0) {
-        return;
+        return; /* LCOV_EXCL_LINE */
     }
 # endif
 # ifdef __i386__
@@ -88,7 +88,7 @@ _sodium_runtime_intel_cpu_features(CPUFeatures * const cpu_features)
 
     _cpuid(cpu_info, 0x0);
     if ((id = cpu_info[0]) == 0U) {
-        return -1;
+        return -1; /* LCOV_EXCL_LINE */
     }
     _cpuid(cpu_info, 0x00000001);
 #ifndef HAVE_EMMINTRIN_H

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

@@ -61,7 +61,7 @@ sodium_memzero(void * const pnt, const size_t len)
     SecureZeroMemory(pnt, len);
 #elif defined(HAVE_MEMSET_S)
     if (memset_s(pnt, (rsize_t) len, 0, (rsize_t) len) != 0) {
-        abort();
+        abort(); /* LCOV_EXCL_LINE */
     }
 #elif defined(HAVE_EXPLICIT_BZERO)
     explicit_bzero(pnt, len);
@@ -104,7 +104,7 @@ sodium_bin2hex(char * const hex, const size_t hex_maxlen,
     size_t            j = (size_t) 0U;
 
     if (bin_len >= SIZE_MAX / 2 || hex_maxlen < bin_len * 2U) {
-        abort();
+        abort(); /* LCOV_EXCL_LINE */
     }
     while (i < bin_len) {
         hex[j++] = hexdigits[bin[i] >> 4];
@@ -215,7 +215,7 @@ _sodium_alloc_init(void)
     page_size = (size_t) si.dwPageSize;
 #endif
     if (page_size < CANARY_SIZE) {
-        abort();
+        abort(); /* LCOV_EXCL_LINE */
     }
     randombytes_buf(canary, sizeof canary);
 
@@ -287,7 +287,7 @@ _out_of_bounds(void)
     raise(SIGKILL);
 #endif
     abort();
-}
+}  /* LCOV_EXCL_LINE */
 
 static __attribute__((malloc)) unsigned char *
 _alloc_aligned(const size_t size)
@@ -297,12 +297,12 @@ _alloc_aligned(const size_t size)
 #ifdef MAP_ANON
     if ((ptr = mmap(NULL, size, PROT_READ | PROT_WRITE,
                     MAP_ANON | MAP_PRIVATE | MAP_NOCORE, -1, 0)) == MAP_FAILED) {
-        ptr = NULL;
-    }
+        ptr = NULL; /* LCOV_EXCL_LINE */
+    } /* LCOV_EXCL_LINE */
 #elif defined(HAVE_POSIX_MEMALIGN)
     if (posix_memalign(&ptr, page_size, size) != 0) {
-        ptr = NULL;
-    }
+        ptr = NULL; /* LCOV_EXCL_LINE */
+    } /* LCOV_EXCL_LINE */
 #elif defined(_WIN32)
     ptr = VirtualAlloc(NULL, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
 #elif !defined(HAVE_ALIGNED_MALLOC)
@@ -338,7 +338,7 @@ _unprotected_ptr_from_user_ptr(const void *ptr)
     page_mask = page_size - 1U;
     unprotected_ptr_u = ((uintptr_t) canary_ptr & (uintptr_t) ~page_mask);
     if (unprotected_ptr_u <= page_size * 2U) {
-        abort();
+        abort(); /* LCOV_EXCL_LINE */
     }
     return (unsigned char *) unprotected_ptr_u;
 }
@@ -360,13 +360,13 @@ _sodium_malloc(const size_t size)
         return NULL;
     }
     if (page_size <= sizeof canary || page_size < sizeof unprotected_size) {
-        abort();
+        abort(); /* LCOV_EXCL_LINE */
     }
     size_with_canary = (sizeof canary) + size;
     unprotected_size = _page_round(size_with_canary);
     total_size = page_size + page_size + unprotected_size + page_size;
     if ((base_ptr = _alloc_aligned(total_size)) == NULL) {
-        return NULL;
+        return NULL; /* LCOV_EXCL_LINE */
     }
     unprotected_ptr = base_ptr + page_size * 2U;
     _mprotect_noaccess(base_ptr + page_size, page_size);
@@ -393,7 +393,7 @@ sodium_malloc(const size_t size)
     void *ptr;
 
     if ((ptr = _sodium_malloc(size)) == NULL) {
-        return NULL;
+        return NULL; /* LCOV_EXCL_LINE */
     }
     memset(ptr, (int) GARBAGE_VALUE, size);
 

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

@@ -35,10 +35,12 @@ EXTRA_DIST = \
 	onetimeauth7.exp \
 	pwhash.exp \
 	pwhash_scrypt_ll.exp \
+	randombytes.exp \
 	scalarmult.exp \
 	scalarmult2.exp \
 	scalarmult5.exp \
 	scalarmult6.exp \
+	scalarmult7.exp \
 	secretbox.exp \
 	secretbox2.exp \
 	secretbox7.exp \
@@ -92,10 +94,12 @@ DISTCLEANFILES = \
 	onetimeauth7.res \
 	pwhash.res \
 	pwhash_scrypt_ll.res \
+	randombytes.res \
 	scalarmult.res \
 	scalarmult2.res \
 	scalarmult5.res \
 	scalarmult6.res \
+	scalarmult7.res \
 	secretbox.res \
 	secretbox2.res \
 	secretbox7.res \
@@ -161,6 +165,7 @@ TESTS_TARGETS = \
 	scalarmult2 \
 	scalarmult5 \
 	scalarmult6 \
+	scalarmult7 \
 	secretbox \
 	secretbox2 \
 	secretbox7 \
@@ -283,7 +288,7 @@ pwhash_LDADD              = $(TESTS_LDADD)
 pwhash_scrypt_ll_SOURCE   = cmptest.h pwhash_scrypt_ll.c
 pwhash_scrypt_ll_LDADD    = $(TESTS_LDADD)
 
-randombytes_SOURCE        = randombytes.c
+randombytes_SOURCE        = cmptest.h randombytes.c
 randombytes_LDADD         = $(TESTS_LDADD)
 
 scalarmult_SOURCE         = cmptest.h scalarmult.c
@@ -298,6 +303,9 @@ scalarmult5_LDADD         = $(TESTS_LDADD)
 scalarmult6_SOURCE        = cmptest.h scalarmult6.c
 scalarmult6_LDADD         = $(TESTS_LDADD)
 
+scalarmult7_SOURCE        = cmptest.h scalarmult7.c
+scalarmult7_LDADD         = $(TESTS_LDADD)
+
 secretbox_SOURCE          = cmptest.h secretbox.c
 secretbox_LDADD           = $(TESTS_LDADD)
 

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

@@ -106,8 +106,8 @@ am__EXEEXT_1 = aead_chacha20poly1305$(EXEEXT) auth$(EXEEXT) \
 	onetimeauth7$(EXEEXT) pwhash$(EXEEXT) \
 	pwhash_scrypt_ll$(EXEEXT) randombytes$(EXEEXT) \
 	scalarmult$(EXEEXT) scalarmult2$(EXEEXT) scalarmult5$(EXEEXT) \
-	scalarmult6$(EXEEXT) secretbox$(EXEEXT) secretbox2$(EXEEXT) \
-	secretbox7$(EXEEXT) secretbox8$(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_utils2$(EXEEXT) \
@@ -229,6 +229,9 @@ scalarmult5_DEPENDENCIES = $(TESTS_LDADD)
 scalarmult6_SOURCES = scalarmult6.c
 scalarmult6_OBJECTS = scalarmult6.$(OBJEXT)
 scalarmult6_DEPENDENCIES = $(TESTS_LDADD)
+scalarmult7_SOURCES = scalarmult7.c
+scalarmult7_OBJECTS = scalarmult7.$(OBJEXT)
+scalarmult7_DEPENDENCIES = $(TESTS_LDADD)
 secretbox_SOURCES = secretbox.c
 secretbox_OBJECTS = secretbox.$(OBJEXT)
 secretbox_DEPENDENCIES = $(TESTS_LDADD)
@@ -324,11 +327,11 @@ SOURCES = aead_chacha20poly1305.c auth.c auth2.c auth3.c auth5.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 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
+	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 \
@@ -336,11 +339,11 @@ DIST_SOURCES = aead_chacha20poly1305.c auth.c auth2.c auth3.c auth5.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 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
+	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;; \
@@ -737,10 +740,12 @@ EXTRA_DIST = \
 	onetimeauth7.exp \
 	pwhash.exp \
 	pwhash_scrypt_ll.exp \
+	randombytes.exp \
 	scalarmult.exp \
 	scalarmult2.exp \
 	scalarmult5.exp \
 	scalarmult6.exp \
+	scalarmult7.exp \
 	secretbox.exp \
 	secretbox2.exp \
 	secretbox7.exp \
@@ -794,10 +799,12 @@ DISTCLEANFILES = \
 	onetimeauth7.res \
 	pwhash.res \
 	pwhash_scrypt_ll.res \
+	randombytes.res \
 	scalarmult.res \
 	scalarmult2.res \
 	scalarmult5.res \
 	scalarmult6.res \
+	scalarmult7.res \
 	secretbox.res \
 	secretbox2.res \
 	secretbox7.res \
@@ -863,6 +870,7 @@ TESTS_TARGETS = \
 	scalarmult2 \
 	scalarmult5 \
 	scalarmult6 \
+	scalarmult7 \
 	secretbox \
 	secretbox2 \
 	secretbox7 \
@@ -949,7 +957,7 @@ pwhash_SOURCE = cmptest.h pwhash.c
 pwhash_LDADD = $(TESTS_LDADD)
 pwhash_scrypt_ll_SOURCE = cmptest.h pwhash_scrypt_ll.c
 pwhash_scrypt_ll_LDADD = $(TESTS_LDADD)
-randombytes_SOURCE = randombytes.c
+randombytes_SOURCE = cmptest.h randombytes.c
 randombytes_LDADD = $(TESTS_LDADD)
 scalarmult_SOURCE = cmptest.h scalarmult.c
 scalarmult_LDADD = $(TESTS_LDADD)
@@ -959,6 +967,8 @@ scalarmult5_SOURCE = cmptest.h scalarmult5.c
 scalarmult5_LDADD = $(TESTS_LDADD)
 scalarmult6_SOURCE = cmptest.h scalarmult6.c
 scalarmult6_LDADD = $(TESTS_LDADD)
+scalarmult7_SOURCE = cmptest.h scalarmult7.c
+scalarmult7_LDADD = $(TESTS_LDADD)
 secretbox_SOURCE = cmptest.h secretbox.c
 secretbox_LDADD = $(TESTS_LDADD)
 secretbox2_SOURCE = cmptest.h secretbox2.c
@@ -1187,6 +1197,10 @@ scalarmult6$(EXEEXT): $(scalarmult6_OBJECTS) $(scalarmult6_DEPENDENCIES) $(EXTRA
 	@rm -f scalarmult6$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(scalarmult6_OBJECTS) $(scalarmult6_LDADD) $(LIBS)
 
+scalarmult7$(EXEEXT): $(scalarmult7_OBJECTS) $(scalarmult7_DEPENDENCIES) $(EXTRA_scalarmult7_DEPENDENCIES) 
+	@rm -f scalarmult7$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(scalarmult7_OBJECTS) $(scalarmult7_LDADD) $(LIBS)
+
 secretbox$(EXEEXT): $(secretbox_OBJECTS) $(secretbox_DEPENDENCIES) $(EXTRA_secretbox_DEPENDENCIES) 
 	@rm -f secretbox$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(secretbox_OBJECTS) $(secretbox_LDADD) $(LIBS)
@@ -1302,6 +1316,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scalarmult2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scalarmult5.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scalarmult6.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scalarmult7.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secretbox.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secretbox2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secretbox7.Po@am__quote@
@@ -1803,6 +1818,13 @@ scalarmult6.log: scalarmult6$(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)
+scalarmult7.log: scalarmult7$(EXEEXT)
+	@p='scalarmult7$(EXEEXT)'; \
+	b='scalarmult7'; \
+	$(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)
 secretbox.log: secretbox$(EXEEXT)
 	@p='secretbox$(EXEEXT)'; \
 	b='secretbox'; \

data/vendor/libsodium/test/default/aead_chacha20poly1305.c

@@ -1,36 +1,29 @@
-#include <stdio.h>
-#include <string.h>
 
 #define TEST_NAME "aead_chacha20poly1305"
 #include "cmptest.h"
 
-static unsigned char firstkey[crypto_aead_chacha20poly1305_KEYBYTES] = {
-    0x42, 0x90, 0xbc, 0xb1, 0x54, 0x17, 0x35, 0x31,
-    0xf3, 0x14, 0xaf, 0x57, 0xf3, 0xbe, 0x3b, 0x50,
-    0x06, 0xda, 0x37, 0x1e, 0xce, 0x27, 0x2a, 0xfa,
-    0x1b, 0x5d, 0xbd, 0xd1, 0x10, 0x0a, 0x10, 0x07
-};
+static unsigned char firstkey[crypto_aead_chacha20poly1305_KEYBYTES]
+    = { 0x42, 0x90, 0xbc, 0xb1, 0x54, 0x17, 0x35, 0x31, 0xf3, 0x14, 0xaf,
+        0x57, 0xf3, 0xbe, 0x3b, 0x50, 0x06, 0xda, 0x37, 0x1e, 0xce, 0x27,
+        0x2a, 0xfa, 0x1b, 0x5d, 0xbd, 0xd1, 0x10, 0x0a, 0x10, 0x07 };
 
-static unsigned char m[10U] = {
-    0x86, 0xd0, 0x99, 0x74, 0x84, 0x0b, 0xde, 0xd2, 0xa5, 0xca
-};
+static unsigned char m[10U]
+    = { 0x86, 0xd0, 0x99, 0x74, 0x84, 0x0b, 0xde, 0xd2, 0xa5, 0xca };
 
-static unsigned char nonce[crypto_aead_chacha20poly1305_NPUBBYTES] = {
-    0xcd, 0x7c, 0xf6, 0x7b, 0xe3, 0x9c, 0x79, 0x4a
-};
+static unsigned char nonce[crypto_aead_chacha20poly1305_NPUBBYTES]
+    = { 0xcd, 0x7c, 0xf6, 0x7b, 0xe3, 0x9c, 0x79, 0x4a };
 
-static unsigned char ad[10U] = {
-    0x87, 0xe2, 0x29, 0xd4, 0x50, 0x08, 0x45, 0xa0, 0x79, 0xc0
-};
+static unsigned char ad[10U]
+    = { 0x87, 0xe2, 0x29, 0xd4, 0x50, 0x08, 0x45, 0xa0, 0x79, 0xc0 };
 
 static unsigned char c[10U + crypto_aead_chacha20poly1305_ABYTES];
 
 int main(void)
 {
-    unsigned char      m2[10U];
+    unsigned char m2[10U];
     unsigned long long clen;
     unsigned long long m2len;
-    size_t             i;
+    size_t i;
 
     crypto_aead_chacha20poly1305_encrypt(c, &clen, m, sizeof m, ad, sizeof ad,
                                          NULL, nonce, firstkey);
@@ -38,16 +31,15 @@ int main(void)
         printf("clen is not properly set\n");
     }
     for (i = 0U; i < sizeof c; ++i) {
-        printf(",0x%02x", (unsigned int) c[i]);
+        printf(",0x%02x", (unsigned int)c[i]);
         if (i % 8 == 7) {
             printf("\n");
         }
     }
     printf("\n");
 
-    if (crypto_aead_chacha20poly1305_decrypt(m2, &m2len, NULL, c, sizeof c,
-                                             ad, sizeof ad,
-                                             nonce, firstkey) != 0) {
+    if (crypto_aead_chacha20poly1305_decrypt(m2, &m2len, NULL, c, sizeof c, ad,
+                                             sizeof ad, nonce, firstkey) != 0) {
         printf("crypto_aead_chacha20poly1305_decrypt() failed\n");
     }
     if (m2len != sizeof c - crypto_aead_chacha20poly1305_abytes()) {
@@ -60,21 +52,20 @@ int main(void)
     for (i = 0U; i < sizeof c; i++) {
         c[i] ^= (i + 1U);
         if (crypto_aead_chacha20poly1305_decrypt(m2, NULL, NULL, c, sizeof c,
-                                                 ad, sizeof ad,
-                                                 nonce, firstkey) == 0 ||
-            memcmp(m, m2, sizeof m) == 0) {
+                                                 ad, sizeof ad, nonce, firstkey)
+            == 0 || memcmp(m, m2, sizeof m) == 0) {
             printf("message can be forged\n");
         }
         c[i] ^= (i + 1U);
     }
 
-    crypto_aead_chacha20poly1305_encrypt(c, &clen, m, sizeof m, NULL, 0U,
-                                         NULL, nonce, firstkey);
+    crypto_aead_chacha20poly1305_encrypt(c, &clen, m, sizeof m, NULL, 0U, NULL,
+                                         nonce, firstkey);
     if (clen != sizeof m + crypto_aead_chacha20poly1305_abytes()) {
         printf("clen is not properly set (adlen=0)\n");
     }
     for (i = 0U; i < sizeof c; ++i) {
-        printf(",0x%02x", (unsigned int) c[i]);
+        printf(",0x%02x", (unsigned int)c[i]);
         if (i % 8 == 7) {
             printf("\n");
         }
@@ -82,8 +73,7 @@ int main(void)
     printf("\n");
 
     if (crypto_aead_chacha20poly1305_decrypt(m2, &m2len, NULL, c, sizeof c,
-                                             NULL, 0U,
-                                             nonce, firstkey) != 0) {
+                                             NULL, 0U, nonce, firstkey) != 0) {
         printf("crypto_aead_chacha20poly1305_decrypt() failed (adlen=0)\n");
     }
     if (m2len != sizeof c - crypto_aead_chacha20poly1305_abytes()) {
@@ -93,5 +83,21 @@ int main(void)
         printf("m != m2 (adlen=0)\n");
     }
 
+    if (crypto_aead_chacha20poly1305_decrypt(
+            m2, &m2len, NULL, c, crypto_aead_chacha20poly1305_ABYTES / 2, NULL,
+            0U, nonce, firstkey) != -1) {
+        printf("crypto_aead_chacha20poly1305_decrypt() worked with a short "
+               "ciphertext\n");
+    }
+    if (crypto_aead_chacha20poly1305_decrypt(m2, &m2len, NULL, c, 0U, NULL, 0U,
+                                             nonce, firstkey) != -1) {
+        printf("crypto_aead_chacha20poly1305_decrypt() worked with an empty "
+               "ciphertext\n");
+    }
+
+    assert(crypto_aead_chacha20poly1305_keybytes() > 0U);
+    assert(crypto_aead_chacha20poly1305_npubbytes() > 0U);
+    assert(crypto_aead_chacha20poly1305_nsecbytes() == 0U);
+
     return 0;
 }