rbnacl-libsodium 1.0.3 → 1.0.4

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

@@ -33,7 +33,11 @@ BOOLEAN NTAPI RtlGenRandom(PVOID RandomBuffer, ULONG RandomBufferLength);
 # pragma comment(lib, "advapi32.lib")
 #endif
 
-#ifdef __OpenBSD__
+#if defined(__OpenBSD__) || defined(__CloudABI__)
+# define HAVE_SAFE_ARC4RANDOM 1
+#endif
+
+#ifdef HAVE_SAFE_ARC4RANDOM
 
 uint32_t
 randombytes_sysrandom(void)
@@ -115,7 +119,13 @@ randombytes_sysrandom_random_dev_open(void)
     do {
         fd = open(*device, O_RDONLY);
         if (fd != -1) {
-            if (fstat(fd, &st) == 0 && S_ISCHR(st.st_mode)) {
+            if (fstat(fd, &st) == 0 &&
+# ifdef S_ISNAM
+                (S_ISNAM(st.st_mode) || S_ISCHR(st.st_mode))
+# else
+                S_ISCHR(st.st_mode)
+# endif
+               ) {
 # if defined(F_SETFD) && defined(FD_CLOEXEC)
                 (void) fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
 # endif

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

@@ -10,12 +10,16 @@ typedef struct CPUFeatures_ {
     int has_neon;
     int has_sse2;
     int has_sse3;
+    int has_pclmul;
+    int has_aesni;
 } CPUFeatures;
 
 static CPUFeatures _cpu_features;
 
-#define CPUID_SSE2     0x04000000
-#define CPUIDECX_SSE3  0x00000001
+#define CPUID_SSE2      0x04000000
+#define CPUIDECX_SSE3   0x00000001
+#define CPUIDECX_PCLMUL 0x00000002
+#define CPUIDECX_AESNI  0x02000000
 
 static int
 _sodium_runtime_arm_cpu_features(CPUFeatures * const cpu_features)
@@ -43,7 +47,8 @@ _sodium_runtime_arm_cpu_features(CPUFeatures * const cpu_features)
 static void
 _cpuid(unsigned int cpu_info[4U], const unsigned int cpu_info_type)
 {
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && \
+    (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86))
     __cpuid((int *) cpu_info, cpu_info_type);
 #elif defined(HAVE_CPUID)
     cpu_info[0] = cpu_info[1] = cpu_info[2] = cpu_info[3] = 0;
@@ -103,6 +108,14 @@ _sodium_runtime_intel_cpu_features(CPUFeatures * const cpu_features)
     cpu_features->has_sse3 = ((cpu_info[2] & CPUIDECX_SSE3) != 0x0);
 #endif
 
+#ifndef HAVE_WMMINTRIN_H
+    cpu_features->has_pclmul = 0;
+    cpu_features->has_aesni = 0;
+#else
+    cpu_features->has_pclmul = ((cpu_info[2] & CPUIDECX_PCLMUL) != 0x0);
+    cpu_features->has_aesni = ((cpu_info[2] & CPUIDECX_AESNI) != 0x0);
+#endif
+
     return 0;
 }
 
@@ -132,3 +145,13 @@ int
 sodium_runtime_has_sse3(void) {
     return _cpu_features.has_sse3;
 }
+
+int
+sodium_runtime_has_pclmul(void) {
+    return _cpu_features.has_pclmul;
+}
+
+int
+sodium_runtime_has_aesni(void) {
+    return _cpu_features.has_aesni;
+}

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

@@ -23,6 +23,10 @@
 # include <unistd.h>
 #endif
 
+#if defined(_WIN32) && (!defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP)
+# define WINAPI_DESKTOP
+#endif
+
 #define CANARY_SIZE 16U
 #define GARBAGE_VALUE 0xd0
 
@@ -32,13 +36,13 @@
 #if !defined(MAP_ANON) && defined(MAP_ANONYMOUS)
 # define MAP_ANON MAP_ANONYMOUS
 #endif
-#if defined(_WIN32) || (defined(MAP_ANON) && defined(HAVE_MMAP)) || defined(HAVE_POSIX_MEMALIGN)
+#if defined(WINAPI_DESKTOP) || (defined(MAP_ANON) && defined(HAVE_MMAP)) || defined(HAVE_POSIX_MEMALIGN)
 # define HAVE_ALIGNED_MALLOC
 #endif
 #if defined(HAVE_MPROTECT) && !(defined(PROT_NONE) && defined(PROT_READ) && defined(PROT_WRITE))
 # undef HAVE_MPROTECT
 #endif
-#if defined(HAVE_ALIGNED_MALLOC) && (defined(_WIN32) || defined(HAVE_MPROTECT))
+#if defined(HAVE_ALIGNED_MALLOC) && (defined(WINAPI_DESKTOP) || defined(HAVE_MPROTECT))
 # define HAVE_PAGE_PROTECTION
 #endif
 
@@ -47,7 +51,7 @@ static unsigned char canary[CANARY_SIZE];
 
 #ifdef HAVE_WEAK_SYMBOLS
 __attribute__((weak)) void
-_sodium_dummy_symbol_to_prevent_lto(void * const pnt, const size_t len)
+_sodium_dummy_symbol_to_prevent_memzero_lto(void * const pnt, const size_t len)
 {
     (void) pnt;
     (void) len;
@@ -67,7 +71,7 @@ sodium_memzero(void * const pnt, const size_t len)
     explicit_bzero(pnt, len);
 #elif HAVE_WEAK_SYMBOLS
     memset(pnt, 0, len);
-    _sodium_dummy_symbol_to_prevent_lto(pnt, 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;
@@ -78,20 +82,76 @@ sodium_memzero(void * const pnt, const size_t len)
 #endif
 }
 
+#ifdef HAVE_WEAK_SYMBOLS
+__attribute__((weak)) void
+_sodium_dummy_symbol_to_prevent_memcmp_lto(const unsigned char *b1,
+                                           const unsigned char *b2,
+                                           const size_t len)
+{
+    (void) b1;
+    (void) b2;
+    (void) len;
+}
+#endif
+
 int
 sodium_memcmp(const void * const b1_, const void * const b2_, size_t len)
 {
+#ifdef HAVE_WEAK_SYMBOLS
     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_;
+#endif
     size_t               i;
     unsigned char        d = (unsigned char) 0U;
 
+#if HAVE_WEAK_SYMBOLS
+    _sodium_dummy_symbol_to_prevent_memcmp_lto(b1, b2, len);
+#endif
     for (i = 0U; i < len; i++) {
         d |= b1[i] ^ b2[i];
     }
     return (int) ((1 & ((d - 1) >> 8)) - 1);
 }
 
+#ifdef HAVE_WEAK_SYMBOLS
+__attribute__((weak)) void
+_sodium_dummy_symbol_to_prevent_compare_lto(const unsigned char *b1,
+                                            const unsigned char *b2,
+                                            const size_t len)
+{
+    (void) b1;
+    (void) b2;
+    (void) len;
+}
+#endif
+
+int
+sodium_compare(const unsigned char *b1_, const unsigned char *b2_, size_t len)
+{
+#ifdef HAVE_WEAK_SYMBOLS
+    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_;
+#endif
+    unsigned char gt = 0U;
+    unsigned char eq = 1U;
+    size_t        i;
+
+#if HAVE_WEAK_SYMBOLS
+    _sodium_dummy_symbol_to_prevent_compare_lto(b1, b2, len);
+#endif
+    for (i = (size_t) 0U; i < len; i++) {
+        gt |= ((b2[i] - b1[i]) >> 8) & eq;
+        eq &= ((b2[i] ^ b1[i]) - 1) >> 8;
+    }
+    return (int) (gt + gt + eq) - 1;
+}
+
 /* Derived from original code by CodesInChaos */
 char *
 sodium_bin2hex(char * const hex, const size_t hex_maxlen,
@@ -102,7 +162,7 @@ sodium_bin2hex(char * const hex, const size_t hex_maxlen,
     int          b;
     int          c;
 
-    if (bin_len >= SIZE_MAX / 2 || hex_maxlen < bin_len * 2U) {
+    if (bin_len >= SIZE_MAX / 2 || hex_maxlen <= bin_len * 2U) {
         abort(); /* LCOV_EXCL_LINE */
     }
     while (i < bin_len) {
@@ -184,7 +244,7 @@ _sodium_alloc_init(void)
     if (page_size_ > 0L) {
         page_size = (size_t) page_size_;
     }
-# elif defined(_WIN32)
+# elif defined(WINAPI_DESKTOP)
     SYSTEM_INFO si;
     GetSystemInfo(&si);
     page_size = (size_t) si.dwPageSize;
@@ -206,7 +266,7 @@ sodium_mlock(void * const addr, const size_t len)
 #endif
 #ifdef HAVE_MLOCK
     return mlock(addr, len);
-#elif defined(_WIN32)
+#elif defined(WINAPI_DESKTOP)
     return -(VirtualLock(addr, len) == 0);
 #else
     errno = ENOSYS;
@@ -223,7 +283,7 @@ sodium_munlock(void * const addr, const size_t len)
 #endif
 #ifdef HAVE_MLOCK
     return munlock(addr, len);
-#elif defined(_WIN32)
+#elif defined(WINAPI_DESKTOP)
     return -(VirtualUnlock(addr, len) == 0);
 #else
     errno = ENOSYS;
@@ -236,7 +296,7 @@ _mprotect_noaccess(void *ptr, size_t size)
 {
 #ifdef HAVE_MPROTECT
     return mprotect(ptr, size, PROT_NONE);
-#elif defined(_WIN32)
+#elif defined(WINAPI_DESKTOP)
     DWORD old;
     return -(VirtualProtect(ptr, size, PAGE_NOACCESS, &old) == 0);
 #else
@@ -250,7 +310,7 @@ _mprotect_readonly(void *ptr, size_t size)
 {
 #ifdef HAVE_MPROTECT
     return mprotect(ptr, size, PROT_READ);
-#elif defined(_WIN32)
+#elif defined(WINAPI_DESKTOP)
     DWORD old;
     return -(VirtualProtect(ptr, size, PAGE_READONLY, &old) == 0);
 #else
@@ -264,7 +324,7 @@ _mprotect_readwrite(void *ptr, size_t size)
 {
 #ifdef HAVE_MPROTECT
     return mprotect(ptr, size, PROT_READ | PROT_WRITE);
-#elif defined(_WIN32)
+#elif defined(WINAPI_DESKTOP)
     DWORD old;
     return -(VirtualProtect(ptr, size, PAGE_READWRITE, &old) == 0);
 #else
@@ -308,7 +368,7 @@ _alloc_aligned(const size_t size)
     if (posix_memalign(&ptr, page_size, size) != 0) {
         ptr = NULL; /* LCOV_EXCL_LINE */
     } /* LCOV_EXCL_LINE */
-# elif defined(_WIN32)
+# elif defined(WINAPI_DESKTOP)
     ptr = VirtualAlloc(NULL, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
 # else
 #  error Bug
@@ -323,7 +383,7 @@ _free_aligned(unsigned char * const ptr, const size_t size)
     (void) munmap(ptr, size);
 # elif defined(HAVE_POSIX_MEMALIGN)
     free(ptr);
-# elif defined(_WIN32)
+# elif defined(WINAPI_DESKTOP)
     VirtualFree(ptr, 0U, MEM_RELEASE);
 # else
 #  error Bug
@@ -506,3 +566,16 @@ sodium_mprotect_readwrite(void *ptr)
 {
     return _sodium_mprotect(ptr, _mprotect_readwrite);
 }
+
+void
+sodium_increment(unsigned char *n, const size_t nlen)
+{
+    size_t       i;
+    unsigned int c = 1U << 8;
+
+    for (i = (size_t) 0U; i < nlen; i++) {
+        c >>= 8;
+        c += n[i];
+        n[i] = (unsigned char) c;
+    }
+}

data/vendor/libsodium/test/Makefile.in

@@ -90,6 +90,7 @@ host_triplet = @host@
 subdir = test
 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/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -198,6 +199,13 @@ CCASDEPMODE = @CCASDEPMODE@
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CFLAGS_AESNI = @CFLAGS_AESNI@
+CFLAGS_MMX = @CFLAGS_MMX@
+CFLAGS_PCLMUL = @CFLAGS_PCLMUL@
+CFLAGS_SSE2 = @CFLAGS_SSE2@
+CFLAGS_SSE3 = @CFLAGS_SSE3@
+CFLAGS_SSE4_1 = @CFLAGS_SSE4_1@
+CFLAGS_SSSE3 = @CFLAGS_SSSE3@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWFLAGS = @CWFLAGS@
@@ -234,6 +242,7 @@ LIBTOOL_EXTRA_FLAGS = @LIBTOOL_EXTRA_FLAGS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

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

@@ -3,6 +3,7 @@ EXTRA_DIST = \
 	cmptest.h \
 	wintest.bat \
 	pre.js.inc \
+	aead_aes256gcm.exp \
 	aead_chacha20poly1305.exp \
 	auth.exp \
 	auth2.exp \
@@ -63,6 +64,7 @@ EXTRA_DIST = \
 	verify1.exp
 
 DISTCLEANFILES = \
+	aead_aes256gcm.res \
 	aead_chacha20poly1305.res \
 	auth.res \
 	auth2.res \
@@ -122,6 +124,124 @@ DISTCLEANFILES = \
 	stream4.res \
 	verify1.res
 
+if NATIVECLIENT
+CLEANFILES = \
+	aead_aes256gcm.final \
+	aead_chacha20poly1305.final \
+	auth.final \
+	auth2.final \
+	auth3.final \
+	auth5.final \
+	auth6.final \
+	auth7.final \
+	box.final \
+	box2.final \
+	box7.final \
+	box8.final \
+	box_easy.final \
+	box_easy2.final \
+	box_seal.final \
+	box_seed.final \
+	chacha20.final \
+	core1.final \
+	core2.final \
+	core3.final \
+	core4.final \
+	core5.final \
+	core6.final \
+	ed25519_convert.final \
+	generichash.final \
+	generichash2.final \
+	generichash3.final \
+	hash.final \
+	hash2.final \
+	hash3.final \
+	onetimeauth.final \
+	onetimeauth2.final \
+	onetimeauth7.final \
+	pwhash.final \
+	pwhash_scrypt_ll.final \
+	randombytes.final \
+	scalarmult.final \
+	scalarmult2.final \
+	scalarmult5.final \
+	scalarmult6.final \
+	scalarmult7.final \
+	secretbox.final \
+	secretbox2.final \
+	secretbox7.final \
+	secretbox8.final \
+	secretbox_easy.final \
+	secretbox_easy2.final \
+	shorthash.final \
+	sign.final \
+	sodium_core.final \
+	sodium_utils.final \
+	sodium_version.final \
+	stream.final \
+	stream2.final \
+	stream3.final \
+	stream4.final \
+	verify1.final \
+	aead_aes256gcm.nexe \
+	aead_chacha20poly1305.nexe \
+	auth.nexe \
+	auth2.nexe \
+	auth3.nexe \
+	auth5.nexe \
+	auth6.nexe \
+	auth7.nexe \
+	box.nexe \
+	box2.nexe \
+	box7.nexe \
+	box8.nexe \
+	box_easy.nexe \
+	box_easy2.nexe \
+	box_seal.nexe \
+	box_seed.nexe \
+	chacha20.nexe \
+	core1.nexe \
+	core2.nexe \
+	core3.nexe \
+	core4.nexe \
+	core5.nexe \
+	core6.nexe \
+	ed25519_convert.nexe \
+	generichash.nexe \
+	generichash2.nexe \
+	generichash3.nexe \
+	hash.nexe \
+	hash2.nexe \
+	hash3.nexe \
+	onetimeauth.nexe \
+	onetimeauth2.nexe \
+	onetimeauth7.nexe \
+	pwhash.nexe \
+	pwhash_scrypt_ll.nexe \
+	randombytes.nexe \
+	scalarmult.nexe \
+	scalarmult2.nexe \
+	scalarmult5.nexe \
+	scalarmult6.nexe \
+	scalarmult7.nexe \
+	secretbox.nexe \
+	secretbox2.nexe \
+	secretbox7.nexe \
+	secretbox8.nexe \
+	secretbox_easy.nexe \
+	secretbox_easy2.nexe \
+	shorthash.nexe \
+	sign.nexe \
+	sodium_core.nexe \
+	sodium_utils.nexe \
+	sodium_version.nexe \
+	stream.nexe \
+	stream2.nexe \
+	stream3.nexe \
+	stream4.nexe \
+	verify1.nexe
+endif
+
 AM_CPPFLAGS = \
 	-DTEST_SRCDIR=\"@srcdir@\" \
 	-I$(top_srcdir)/src/libsodium/include \
@@ -133,6 +253,7 @@ AM_CPPFLAGS = \
 AM_LDFLAGS = @TEST_LDFLAGS@
 
 TESTS_TARGETS = \
+	aead_aes256gcm \
 	aead_chacha20poly1305 \
 	auth \
 	auth2 \
@@ -190,10 +311,12 @@ TESTS_TARGETS = \
 	verify1
 
 if !EMSCRIPTEN
+if !NATIVECLIENT
 TESTS_TARGETS += \
 	sodium_utils2 \
 	sodium_utils3
 endif
+endif
 
 check_PROGRAMS = $(TESTS_TARGETS)
 
@@ -202,6 +325,9 @@ TESTS = $(TESTS_TARGETS)
 TESTS_LDADD = \
 	${top_builddir}/src/libsodium/libsodium.la
 
+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)
 
@@ -373,4 +499,8 @@ stream4_LDADD             = $(TESTS_LDADD)
 verify1_SOURCE            = cmptest.h verify1.c
 verify1_LDADD             = $(TESTS_LDADD)
 
+if NATIVECLIENT
+LOG_COMPILER = ./nacl-test-wrapper.sh
+endif
+
 verify: check