rbnacl-libsodium 1.0.5 → 1.0.6

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

@@ -13,7 +13,8 @@ SODIUM_EXPORT
 size_t crypto_verify_16_bytes(void);
 
 SODIUM_EXPORT
-int crypto_verify_16(const unsigned char *x, const unsigned char *y);
+int crypto_verify_16(const unsigned char *x, const unsigned char *y)
+            __attribute__ ((warn_unused_result));
 
 #ifdef __cplusplus
 }

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

@@ -13,7 +13,8 @@ SODIUM_EXPORT
 size_t crypto_verify_32_bytes(void);
 
 SODIUM_EXPORT
-int crypto_verify_32(const unsigned char *x, const unsigned char *y);
+int crypto_verify_32(const unsigned char *x, const unsigned char *y)
+            __attribute__ ((warn_unused_result));
 
 #ifdef __cplusplus
 }

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

@@ -13,7 +13,8 @@ SODIUM_EXPORT
 size_t crypto_verify_64_bytes(void);
 
 SODIUM_EXPORT
-int crypto_verify_64(const unsigned char *x, const unsigned char *y);
+int crypto_verify_64(const unsigned char *x, const unsigned char *y)
+            __attribute__ ((warn_unused_result));
 
 #ifdef __cplusplus
 }

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

@@ -8,9 +8,6 @@
 extern "C" {
 #endif
 
-SODIUM_EXPORT
-int sodium_runtime_get_cpu_features(void);
-
 SODIUM_EXPORT
 int sodium_runtime_has_neon(void);
 
@@ -20,12 +17,22 @@ int sodium_runtime_has_sse2(void);
 SODIUM_EXPORT
 int sodium_runtime_has_sse3(void);
 
+SODIUM_EXPORT
+int sodium_runtime_has_ssse3(void);
+
+SODIUM_EXPORT
+int sodium_runtime_has_sse41(void);
+
 SODIUM_EXPORT
 int sodium_runtime_has_pclmul(void);
 
 SODIUM_EXPORT
 int sodium_runtime_has_aesni(void);
 
+/* ------------------------------------------------------------------------- */
+
+int _sodium_runtime_get_cpu_features(void);
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -26,7 +26,8 @@ void sodium_memzero(void * const pnt, const size_t len);
  * This function is not designed for lexicographical comparisons.
  */
 SODIUM_EXPORT
-int sodium_memcmp(const void * const b1_, const void * const b2_, size_t len);
+int sodium_memcmp(const void * const b1_, const void * const b2_, size_t len)
+            __attribute__ ((warn_unused_result));
 
 /*
  * sodium_compare() returns -1 if b1_ < b2_, 1 if b1_ > b2_ and 0 if b1_ == b2_
@@ -36,7 +37,8 @@ int sodium_memcmp(const void * const b1_, const void * const b2_, size_t len);
  */
 SODIUM_EXPORT
 int sodium_compare(const unsigned char *b1_, const unsigned char *b2_,
-                   size_t len);
+                   size_t len)
+            __attribute__ ((warn_unused_result));
 
 SODIUM_EXPORT
 void sodium_increment(unsigned char *n, const size_t nlen);
@@ -92,10 +94,12 @@ int sodium_munlock(void * const addr, const size_t len);
  */
 
 SODIUM_EXPORT
-void *sodium_malloc(const size_t size);
+void *sodium_malloc(const size_t size)
+            __attribute__ ((malloc));
 
 SODIUM_EXPORT
-void *sodium_allocarray(size_t count, size_t size);
+void *sodium_allocarray(size_t count, size_t size)
+            __attribute__ ((malloc));
 
 SODIUM_EXPORT
 void sodium_free(void *ptr);

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

@@ -1,4 +1,5 @@
 
+#include <stdlib.h>
 #include <sys/types.h>
 
 #include <assert.h>
@@ -106,9 +107,15 @@ randombytes_uniform(const uint32_t upper_bound)
     uint32_t min;
     uint32_t r;
 
+#ifdef __EMSCRIPTEN__
     if (implementation != NULL && implementation->uniform != NULL) {
         return implementation->uniform(upper_bound);
     }
+#else
+    if (implementation->uniform != NULL) {
+        return implementation->uniform(upper_bound);
+    }
+#endif
     if (upper_bound < 2) {
         return 0;
     }

data/vendor/libsodium/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c

@@ -1,4 +1,5 @@
 
+#include <stdlib.h>
 #include <sys/types.h>
 #ifndef _WIN32
 # include <sys/stat.h>
@@ -13,7 +14,6 @@
 #include <fcntl.h>
 #include <limits.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 #ifndef _MSC_VER
 # include <unistd.h>
@@ -135,7 +135,9 @@ randombytes_salsa20_random_random_dev_open(void)
         fd = open(*device, O_RDONLY);
         if (fd != -1) {
             if (fstat(fd, &st) == 0 &&
-# ifdef S_ISNAM
+# ifdef __COMPCERT__
+                1
+# elif defined(S_ISNAM)
                 (S_ISNAM(st.st_mode) || S_ISCHR(st.st_mode))
 # else
                 S_ISCHR(st.st_mode)

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

@@ -1,4 +1,5 @@
 
+#include <stdlib.h>
 #include <sys/types.h>
 #ifndef _WIN32
 # include <sys/stat.h>
@@ -13,7 +14,6 @@
 #include <fcntl.h>
 #include <limits.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 #ifndef _WIN32
 # include <unistd.h>
@@ -120,7 +120,9 @@ randombytes_sysrandom_random_dev_open(void)
         fd = open(*device, O_RDONLY);
         if (fd != -1) {
             if (fstat(fd, &st) == 0 &&
-# ifdef S_ISNAM
+# ifdef __COMPCERT__
+                1
+# elif defined(S_ISNAM)
                 (S_ISNAM(st.st_mode) || S_ISCHR(st.st_mode))
 # else
                 S_ISCHR(st.st_mode)
@@ -186,14 +188,14 @@ randombytes_sysrandom_init(void)
 
 # 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;
+        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
 

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

@@ -1,5 +1,6 @@
 
 #include "core.h"
+#include "crypto_generichash.h"
 #include "crypto_onetimeauth.h"
 #include "randombytes.h"
 #include "runtime.h"
@@ -13,12 +14,11 @@ sodium_init(void)
     if (initialized != 0) {
         return 1;
     }
-    sodium_runtime_get_cpu_features();
-    if (crypto_onetimeauth_pick_best_implementation() == NULL) {
-        return -1; /* LCOV_EXCL_LINE */
-    }
+    _sodium_runtime_get_cpu_features();
     randombytes_stir();
     _sodium_alloc_init();
+    _crypto_generichash_blake2b_pick_best_implementation();
+    _crypto_onetimeauth_poly1305_pick_best_implementation();
     initialized = 1;
 
     return 0;

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

@@ -10,6 +10,8 @@ typedef struct CPUFeatures_ {
     int has_neon;
     int has_sse2;
     int has_sse3;
+    int has_ssse3;
+    int has_sse41;
     int has_pclmul;
     int has_aesni;
 } CPUFeatures;
@@ -18,6 +20,8 @@ static CPUFeatures _cpu_features;
 
 #define CPUID_SSE2      0x04000000
 #define CPUIDECX_SSE3   0x00000001
+#define CPUIDECX_SSSE3  0x00000200
+#define CPUIDECX_SSE41  0x00080000
 #define CPUIDECX_PCLMUL 0x00000002
 #define CPUIDECX_AESNI  0x02000000
 
@@ -108,6 +112,18 @@ _sodium_runtime_intel_cpu_features(CPUFeatures * const cpu_features)
     cpu_features->has_sse3 = ((cpu_info[2] & CPUIDECX_SSE3) != 0x0);
 #endif
 
+#ifndef HAVE_TMMINTRIN_H
+    cpu_features->has_ssse3 = 0;
+#else
+    cpu_features->has_ssse3 = ((cpu_info[2] & CPUIDECX_SSSE3) != 0x0);
+#endif
+
+#ifndef HAVE_SMMINTRIN_H
+    cpu_features->has_sse41 = 0;
+#else
+    cpu_features->has_sse41 = ((cpu_info[2] & CPUIDECX_SSE41) != 0x0);
+#endif
+
 #ifndef HAVE_WMMINTRIN_H
     cpu_features->has_pclmul = 0;
     cpu_features->has_aesni = 0;
@@ -120,7 +136,7 @@ _sodium_runtime_intel_cpu_features(CPUFeatures * const cpu_features)
 }
 
 int
-sodium_runtime_get_cpu_features(void)
+_sodium_runtime_get_cpu_features(void)
 {
     int ret = -1;
 
@@ -146,6 +162,16 @@ sodium_runtime_has_sse3(void) {
     return _cpu_features.has_sse3;
 }
 
+int
+sodium_runtime_has_ssse3(void) {
+    return _cpu_features.has_ssse3;
+}
+
+int
+sodium_runtime_has_sse41(void) {
+    return _cpu_features.has_sse41;
+}
+
 int
 sodium_runtime_has_pclmul(void) {
     return _cpu_features.has_pclmul;

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

@@ -145,7 +145,9 @@ sodium_compare(const unsigned char *b1_, const unsigned char *b2_, size_t len)
 #if HAVE_WEAK_SYMBOLS
     _sodium_dummy_symbol_to_prevent_compare_lto(b1, b2, len);
 #endif
-    for (i = (size_t) 0U; i < len; i++) {
+    i = len;
+    while (i != 0U) {
+        i--;
         gt |= ((b2[i] - b1[i]) >> 8) & eq;
         eq &= ((b2[i] ^ b1[i]) - 1) >> 8;
     }
@@ -391,7 +393,7 @@ _free_aligned(unsigned char * const ptr, const size_t size)
 }
 
 static unsigned char *
-_unprotected_ptr_from_user_ptr(const void *ptr)
+_unprotected_ptr_from_user_ptr(void * const ptr)
 {
     uintptr_t      unprotected_ptr_u;
     unsigned char *canary_ptr;

data/vendor/libsodium/test/Makefile.in

@@ -204,7 +204,7 @@ CFLAGS_MMX = @CFLAGS_MMX@
 CFLAGS_PCLMUL = @CFLAGS_PCLMUL@
 CFLAGS_SSE2 = @CFLAGS_SSE2@
 CFLAGS_SSE3 = @CFLAGS_SSE3@
-CFLAGS_SSE4_1 = @CFLAGS_SSE4_1@
+CFLAGS_SSE41 = @CFLAGS_SSE41@
 CFLAGS_SSSE3 = @CFLAGS_SSSE3@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@

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

@@ -621,7 +621,7 @@ CFLAGS_MMX = @CFLAGS_MMX@
 CFLAGS_PCLMUL = @CFLAGS_PCLMUL@
 CFLAGS_SSE2 = @CFLAGS_SSE2@
 CFLAGS_SSE3 = @CFLAGS_SSE3@
-CFLAGS_SSE4_1 = @CFLAGS_SSE4_1@
+CFLAGS_SSE41 = @CFLAGS_SSE41@
 CFLAGS_SSSE3 = @CFLAGS_SSSE3@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@

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

@@ -3145,6 +3145,20 @@ tv(void)
             sodium_free(hex);
         }
         decrypted = (unsigned char *) sodium_malloc(message_len);
+        if (crypto_aead_aes256gcm_decrypt(decrypted, &found_message_len,
+                                          NULL, ciphertext,
+                                          randombytes_uniform(ciphertext_len),
+                                          ad, ad_len, nonce, key) != -1) {
+            printf("Verification of test vector #%u after truncation succeeded\n",
+                   (unsigned int) i);
+        }
+        if (crypto_aead_aes256gcm_decrypt(decrypted, &found_message_len,
+                                          NULL, ciphertext,
+                                          randombytes_uniform(crypto_aead_aes256gcm_ABYTES),
+                                          ad, ad_len, nonce, key) != -1) {
+            printf("Verification of test vector #%u with a truncated tag failed\n",
+                   (unsigned int) i);
+        }
         if (crypto_aead_aes256gcm_decrypt(decrypted, &found_message_len,
                                           NULL, ciphertext, ciphertext_len,
                                           ad, ad_len, nonce, key) != 0) {

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

@@ -68,9 +68,11 @@ int main(void)
         printf("crypto_box_easy_afternm() with a short ciphertext should have failed\n");
     }
     crypto_box_easy_afternm(c, m, (unsigned long long) mlen, nonce, k1);
-    crypto_box_open_easy_afternm(m2, c,
-                                 (unsigned long long) mlen + crypto_box_MACBYTES,
-                                 nonce, k2);
+    if (crypto_box_open_easy_afternm(m2, c,
+                                     (unsigned long long) mlen + crypto_box_MACBYTES,
+                                 nonce, k2) != 0) {
+        printf("crypto_box_open_easy_afternm() failed\n");
+    }
     printf("%d\n", memcmp(m, m2, mlen));
     if (crypto_box_open_easy_afternm(m2, c, crypto_box_MACBYTES - 1U,
                                      nonce, k2) == 0) {
@@ -79,15 +81,19 @@ int main(void)
     memset(m2, 0, sizeof m2);
     crypto_box_detached(c, mac, m, (unsigned long long) mlen,
                         nonce, alicepk, bobsk);
-    crypto_box_open_detached(m2, c, mac, (unsigned long long) mlen,
-                             nonce, bobpk, alicesk);
+    if (crypto_box_open_detached(m2, c, mac, (unsigned long long) mlen,
+                                 nonce, bobpk, alicesk) != 0) {
+        printf("crypto_box_open_detached() failed\n");
+    }
     printf("%d\n", memcmp(m, m2, mlen));
 
     memset(m2, 0, sizeof m2);
     crypto_box_detached_afternm(c, mac, m, (unsigned long long) mlen,
                                 nonce, k1);
-    crypto_box_open_detached_afternm(m2, c, mac, (unsigned long long) mlen,
-                                     nonce, k2);
+    if (crypto_box_open_detached_afternm(m2, c, mac, (unsigned long long) mlen,
+                                         nonce, k2) != 0) {
+        printf("crypto_box_open_detached_afternm() failed\n");
+    }
     printf("%d\n", memcmp(m, m2, mlen));
 
     sodium_free(alicepk);

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

@@ -19,12 +19,16 @@ void tv(void)
             "0100000000000000" },
           { "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f",
             "0001020304050607" } };
-    unsigned char key[crypto_stream_chacha20_KEYBYTES];
-    unsigned char nonce[crypto_stream_chacha20_NONCEBYTES];
-    unsigned char out[160];
-    char          out_hex[160 * 2 + 1];
-    size_t        i = 0U;
-
+    unsigned char  key[crypto_stream_chacha20_KEYBYTES];
+    unsigned char  nonce[crypto_stream_chacha20_NONCEBYTES];
+    unsigned char *part;
+    unsigned char  out[160];
+    unsigned char  zero[160];
+    char           out_hex[160 * 2 + 1];
+    size_t         i = 0U;
+    size_t         plen;
+
+    memset(zero, 0, sizeof zero);
     do {
         sodium_hex2bin((unsigned char *)key, sizeof key, tests[i].key_hex,
                        strlen(tests[i].key_hex), NULL, NULL, NULL);
@@ -33,6 +37,14 @@ void tv(void)
         crypto_stream_chacha20(out, sizeof out, nonce, key);
         sodium_bin2hex(out_hex, sizeof out_hex, out, sizeof out);
         printf("[%s]\n", out_hex);
+        for (plen = 1U; plen < sizeof out; plen++) {
+            part = (unsigned char *) sodium_malloc(plen);
+            crypto_stream_chacha20_xor(part, out, plen, nonce, key);
+            if (memcmp(part, zero, plen) != 0) {
+                printf("Failed with length %lu\n", (unsigned long) plen);
+            }
+            sodium_free(part);
+        }
     } while (++i < (sizeof tests) / (sizeof tests[0]));
 
     randombytes_buf(out, sizeof out);
@@ -85,12 +97,16 @@ void tv_ietf(void)
           { "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f",
             "000000090000004a00000000",
             1U }};
-    unsigned char key[crypto_stream_chacha20_KEYBYTES];
-    unsigned char nonce[crypto_stream_chacha20_IETF_NONCEBYTES];
-    unsigned char out[160];
-    char          out_hex[160 * 2 + 1];
-    size_t        i = 0U;
-
+    unsigned char  key[crypto_stream_chacha20_KEYBYTES];
+    unsigned char  nonce[crypto_stream_chacha20_IETF_NONCEBYTES];
+    unsigned char *part;
+    unsigned char  out[160];
+    unsigned char  zero[160];
+    char           out_hex[160 * 2 + 1];
+    size_t         i = 0U;
+    size_t         plen;
+
+    memset(zero, 0, sizeof zero);
     do {
         sodium_hex2bin((unsigned char *)key, sizeof key, tests[i].key_hex,
                        strlen(tests[i].key_hex), ": ", NULL, NULL);
@@ -100,6 +116,14 @@ void tv_ietf(void)
         crypto_stream_chacha20_ietf_xor_ic(out, out, sizeof out, nonce, tests[i].ic, key);
         sodium_bin2hex(out_hex, sizeof out_hex, out, sizeof out);
         printf("[%s]\n", out_hex);
+        for (plen = 1U; plen < sizeof out; plen++) {
+            part = (unsigned char *) sodium_malloc(plen);
+            crypto_stream_chacha20_ietf_xor_ic(part, out, plen, nonce, tests[i].ic, key);
+            if (memcmp(part, zero, plen) != 0) {
+                printf("Failed with length %lu\n", (unsigned long) plen);
+            }
+            sodium_free(part);
+        }
     } while (++i < (sizeof tests) / (sizeof tests[0]));
 
     randombytes_buf(out, sizeof out);