rbnacl-libsodium 1.0.6 → 1.0.7

data/vendor/libsodium/src/libsodium/crypto_stream/chacha20/vec/stream_chacha20_vec.h

@@ -0,0 +1,27 @@
+
+#include <stdint.h>
+
+#include "crypto_stream_chacha20.h"
+
+extern struct crypto_stream_chacha20_implementation
+    crypto_stream_chacha20_vec_implementation;
+
+int
+crypto_stream_chacha20_vec(unsigned char *c, unsigned long long clen,
+                           const unsigned char *n, const unsigned char *k);
+
+int
+crypto_stream_chacha20_vec_xor_ic(unsigned char *c, const unsigned char *m,
+                                  unsigned long long mlen,
+                                  const unsigned char *n, uint64_t ic,
+                                  const unsigned char *k);
+
+int
+crypto_stream_chacha20_ietf_vec(unsigned char *c, unsigned long long clen,
+                                const unsigned char *n, const unsigned char *k);
+
+int
+crypto_stream_chacha20_ietf_vec_xor_ic(unsigned char *c, const unsigned char *m,
+                                       unsigned long long mlen,
+                                       const unsigned char *n, uint32_t ic,
+                                       const unsigned char *k);

data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/amd64_xmm6/stream_salsa20_amd64_xmm6.S

@@ -1,4 +1,4 @@
-#if defined(__amd64) || defined(__amd64__) || defined(__x86_64__)
+#ifdef HAVE_AMD64_ASM
 
 .text
 .p2align 5

data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/ref/stream_salsa20_ref.c

@@ -4,8 +4,8 @@ D. J. Bernstein
 Public domain.
 */
 
-#include "api.h"
 #include "crypto_core_salsa20.h"
+#include "crypto_stream_salsa20.h"
 #include "utils.h"
 
 #ifndef HAVE_AMD64_ASM
@@ -16,7 +16,7 @@ static const unsigned char sigma[16] = {
     'e', 'x', 'p', 'a', 'n', 'd', ' ', '3', '2', '-', 'b', 'y', 't', 'e', ' ', 'k'
 };
 
-int crypto_stream(
+int crypto_stream_salsa20(
         unsigned char *c,unsigned long long clen,
   const unsigned char *n,
   const unsigned char *k

data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/ref/xor_salsa20_ref.c

@@ -6,8 +6,8 @@ Public domain.
 
 #include <stdint.h>
 
-#include "api.h"
 #include "crypto_core_salsa20.h"
+#include "crypto_stream_salsa20.h"
 #include "utils.h"
 
 #ifndef HAVE_AMD64_ASM

data/vendor/libsodium/src/libsodium/crypto_stream/salsa2012/ref/stream_salsa2012.c

@@ -4,8 +4,8 @@ D. J. Bernstein
 Public domain.
 */
 
-#include "api.h"
 #include "crypto_core_salsa2012.h"
+#include "crypto_stream_salsa2012.h"
 #include "utils.h"
 
 typedef unsigned int uint32;
@@ -14,7 +14,7 @@ static const unsigned char sigma[16] = {
     'e', 'x', 'p', 'a', 'n', 'd', ' ', '3', '2', '-', 'b', 'y', 't', 'e', ' ', 'k'
 };
 
-int crypto_stream(
+int crypto_stream_salsa2012(
         unsigned char *c,unsigned long long clen,
   const unsigned char *n,
   const unsigned char *k

data/vendor/libsodium/src/libsodium/crypto_stream/salsa2012/ref/xor_salsa2012.c

@@ -4,8 +4,8 @@ D. J. Bernstein
 Public domain.
 */
 
-#include "api.h"
 #include "crypto_core_salsa2012.h"
+#include "crypto_stream_salsa2012.h"
 #include "utils.h"
 
 typedef unsigned int uint32;
@@ -14,7 +14,7 @@ static const unsigned char sigma[16] = {
     'e', 'x', 'p', 'a', 'n', 'd', ' ', '3', '2', '-', 'b', 'y', 't', 'e', ' ', 'k'
 };
 
-int crypto_stream_xor(
+int crypto_stream_salsa2012_xor(
         unsigned char *c,
   const unsigned char *m,unsigned long long mlen,
   const unsigned char *n,

data/vendor/libsodium/src/libsodium/crypto_stream/salsa208/ref/stream_salsa208.c

@@ -4,8 +4,8 @@ D. J. Bernstein
 Public domain.
 */
 
-#include "api.h"
 #include "crypto_core_salsa208.h"
+#include "crypto_stream_salsa208.h"
 #include "utils.h"
 
 typedef unsigned int uint32;
@@ -14,7 +14,7 @@ static const unsigned char sigma[16] = {
         'e', 'x', 'p', 'a', 'n', 'd', ' ', '3', '2', '-', 'b', 'y', 't', 'e', ' ', 'k'
 };
 
-int crypto_stream(
+int crypto_stream_salsa208(
         unsigned char *c,unsigned long long clen,
   const unsigned char *n,
   const unsigned char *k

data/vendor/libsodium/src/libsodium/crypto_stream/salsa208/ref/xor_salsa208.c

@@ -4,8 +4,8 @@ D. J. Bernstein
 Public domain.
 */
 
-#include "api.h"
 #include "crypto_core_salsa208.h"
+#include "crypto_stream_salsa208.h"
 #include "utils.h"
 
 typedef unsigned int uint32;
@@ -14,7 +14,7 @@ static const unsigned char sigma[16] = {
     'e', 'x', 'p', 'a', 'n', 'd', ' ', '3', '2', '-', 'b', 'y', 't', 'e', ' ', 'k'
 };
 
-int crypto_stream_xor(
+int crypto_stream_salsa208_xor(
         unsigned char *c,
   const unsigned char *m,unsigned long long mlen,
   const unsigned char *n,

data/vendor/libsodium/src/libsodium/crypto_stream/xsalsa20/ref/stream_xsalsa20.c

@@ -4,16 +4,16 @@ D. J. Bernstein
 Public domain.
 */
 
-#include "api.h"
 #include "crypto_core_hsalsa20.h"
 #include "crypto_stream_salsa20.h"
+#include "crypto_stream_xsalsa20.h"
 #include "utils.h"
 
 static const unsigned char sigma[16] = {
     'e', 'x', 'p', 'a', 'n', 'd', ' ', '3', '2', '-', 'b', 'y', 't', 'e', ' ', 'k'
 };
 
-int crypto_stream(
+int crypto_stream_xsalsa20(
         unsigned char *c,unsigned long long clen,
   const unsigned char *n,
   const unsigned char *k

data/vendor/libsodium/src/libsodium/crypto_stream/xsalsa20/ref/xor_xsalsa20.c

@@ -4,16 +4,16 @@ D. J. Bernstein
 Public domain.
 */
 
-#include "api.h"
 #include "crypto_core_hsalsa20.h"
 #include "crypto_stream_salsa20.h"
+#include "crypto_stream_xsalsa20.h"
 #include "utils.h"
 
 static const unsigned char sigma[16] = {
     'e', 'x', 'p', 'a', 'n', 'd', ' ', '3', '2', '-', 'b', 'y', 't', 'e', ' ', 'k'
 };
 
-int crypto_stream_xor_ic(
+int crypto_stream_xsalsa20_xor_ic(
         unsigned char *c,
   const unsigned char *m,unsigned long long mlen,
   const unsigned char *n,uint64_t ic,
@@ -28,12 +28,12 @@ int crypto_stream_xor_ic(
   return ret;
 }
 
-int crypto_stream_xor(
+int crypto_stream_xsalsa20_xor(
         unsigned char *c,
   const unsigned char *m,unsigned long long mlen,
   const unsigned char *n,
   const unsigned char *k
 )
 {
-  return crypto_stream_xor_ic(c, m, mlen, n, 0ULL, k);
+  return crypto_stream_xsalsa20_xor_ic(c, m, mlen, n, 0ULL, k);
 }

data/vendor/libsodium/src/libsodium/crypto_verify/16/ref/verify_16.c

@@ -1,24 +1,17 @@
-#include "api.h"
 
-int crypto_verify_16(const unsigned char *x,const unsigned char *y)
+#include <stddef.h>
+#include <stdint.h>
+
+#include "crypto_verify_16.h"
+
+int
+crypto_verify_16(const unsigned char *x, const unsigned char *y)
 {
-  unsigned int differentbits = 0;
-#define F(i) differentbits |= x[i] ^ y[i];
-  F(0)
-  F(1)
-  F(2)
-  F(3)
-  F(4)
-  F(5)
-  F(6)
-  F(7)
-  F(8)
-  F(9)
-  F(10)
-  F(11)
-  F(12)
-  F(13)
-  F(14)
-  F(15)
-  return (1 & ((differentbits - 1) >> 8)) - 1;
+    uint_fast16_t d = 0U;
+    int           i;
+
+    for (i = 0; i < 16; i++) {
+        d |= x[i] ^ y[i];
+    }
+    return (1 & ((d - 1) >> 8)) - 1;
 }

data/vendor/libsodium/src/libsodium/crypto_verify/32/ref/verify_32.c

@@ -1,40 +1,17 @@
-#include "api.h"
 
-int crypto_verify_32(const unsigned char *x,const unsigned char *y)
+#include <stddef.h>
+#include <stdint.h>
+
+#include "crypto_verify_32.h"
+
+int
+crypto_verify_32(const unsigned char *x, const unsigned char *y)
 {
-  unsigned int differentbits = 0;
-#define F(i) differentbits |= x[i] ^ y[i];
-  F(0)
-  F(1)
-  F(2)
-  F(3)
-  F(4)
-  F(5)
-  F(6)
-  F(7)
-  F(8)
-  F(9)
-  F(10)
-  F(11)
-  F(12)
-  F(13)
-  F(14)
-  F(15)
-  F(16)
-  F(17)
-  F(18)
-  F(19)
-  F(20)
-  F(21)
-  F(22)
-  F(23)
-  F(24)
-  F(25)
-  F(26)
-  F(27)
-  F(28)
-  F(29)
-  F(30)
-  F(31)
-  return (1 & ((differentbits - 1) >> 8)) - 1;
+    uint_fast16_t d = 0U;
+    int           i;
+
+    for (i = 0; i < 32; i++) {
+        d |= x[i] ^ y[i];
+    }
+    return (1 & ((d - 1) >> 8)) - 1;
 }

data/vendor/libsodium/src/libsodium/crypto_verify/64/ref/verify_64.c

@@ -1,72 +1,17 @@
-#include "api.h"
 
-int crypto_verify_64(const unsigned char *x,const unsigned char *y)
+#include <stddef.h>
+#include <stdint.h>
+
+#include "crypto_verify_64.h"
+
+int
+crypto_verify_64(const unsigned char *x, const unsigned char *y)
 {
-  unsigned int differentbits = 0;
-#define F(i) differentbits |= x[i] ^ y[i];
-  F(0)
-  F(1)
-  F(2)
-  F(3)
-  F(4)
-  F(5)
-  F(6)
-  F(7)
-  F(8)
-  F(9)
-  F(10)
-  F(11)
-  F(12)
-  F(13)
-  F(14)
-  F(15)
-  F(16)
-  F(17)
-  F(18)
-  F(19)
-  F(20)
-  F(21)
-  F(22)
-  F(23)
-  F(24)
-  F(25)
-  F(26)
-  F(27)
-  F(28)
-  F(29)
-  F(30)
-  F(31)
-  F(32)
-  F(33)
-  F(34)
-  F(35)
-  F(36)
-  F(37)
-  F(38)
-  F(39)
-  F(40)
-  F(41)
-  F(42)
-  F(43)
-  F(44)
-  F(45)
-  F(46)
-  F(47)
-  F(48)
-  F(49)
-  F(50)
-  F(51)
-  F(52)
-  F(53)
-  F(54)
-  F(55)
-  F(56)
-  F(57)
-  F(58)
-  F(59)
-  F(60)
-  F(61)
-  F(62)
-  F(63)
-  return (1 & ((differentbits - 1) >> 8)) - 1;
+    uint_fast16_t d = 0U;
+    int           i;
+
+    for (i = 0; i < 64; i++) {
+        d |= x[i] ^ y[i];
+    }
+    return (1 & ((d - 1) >> 8)) - 1;
 }

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

@@ -251,6 +251,7 @@ EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 HAVE_AMD64_ASM_V = @HAVE_AMD64_ASM_V@
+HAVE_AVX_ASM_V = @HAVE_AVX_ASM_V@
 HAVE_CPUID_V = @HAVE_CPUID_V@
 HAVE_TI_MODE_V = @HAVE_TI_MODE_V@
 INSTALL = @INSTALL@

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

@@ -54,7 +54,8 @@ int crypto_box_keypair(unsigned char *pk, unsigned char *sk);
 SODIUM_EXPORT
 int crypto_box_easy(unsigned char *c, const unsigned char *m,
                     unsigned long long mlen, const unsigned char *n,
-                    const unsigned char *pk, const unsigned char *sk);
+                    const unsigned char *pk, const unsigned char *sk)
+            __attribute__ ((warn_unused_result));
 
 SODIUM_EXPORT
 int crypto_box_open_easy(unsigned char *m, const unsigned char *c,
@@ -66,7 +67,8 @@ SODIUM_EXPORT
 int crypto_box_detached(unsigned char *c, unsigned char *mac,
                         const unsigned char *m, unsigned long long mlen,
                         const unsigned char *n, const unsigned char *pk,
-                        const unsigned char *sk);
+                        const unsigned char *sk)
+            __attribute__ ((warn_unused_result));
 
 SODIUM_EXPORT
 int crypto_box_open_detached(unsigned char *m, const unsigned char *c,
@@ -85,7 +87,8 @@ size_t  crypto_box_beforenmbytes(void);
 
 SODIUM_EXPORT
 int crypto_box_beforenm(unsigned char *k, const unsigned char *pk,
-                        const unsigned char *sk);
+                        const unsigned char *sk)
+            __attribute__ ((warn_unused_result));
 
 SODIUM_EXPORT
 int crypto_box_easy_afternm(unsigned char *c, const unsigned char *m,
@@ -139,7 +142,8 @@ size_t  crypto_box_boxzerobytes(void);
 SODIUM_EXPORT
 int crypto_box(unsigned char *c, const unsigned char *m,
                unsigned long long mlen, const unsigned char *n,
-               const unsigned char *pk, const unsigned char *sk);
+               const unsigned char *pk, const unsigned char *sk)
+            __attribute__ ((warn_unused_result));
 
 SODIUM_EXPORT
 int crypto_box_open(unsigned char *m, const unsigned char *c,

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

@@ -51,7 +51,8 @@ int crypto_box_curve25519xsalsa20poly1305(unsigned char *c,
                                           unsigned long long mlen,
                                           const unsigned char *n,
                                           const unsigned char *pk,
-                                          const unsigned char *sk);
+                                          const unsigned char *sk)
+            __attribute__ ((warn_unused_result));
 
 SODIUM_EXPORT
 int crypto_box_curve25519xsalsa20poly1305_open(unsigned char *m,
@@ -74,7 +75,8 @@ int crypto_box_curve25519xsalsa20poly1305_keypair(unsigned char *pk,
 SODIUM_EXPORT
 int crypto_box_curve25519xsalsa20poly1305_beforenm(unsigned char *k,
                                                    const unsigned char *pk,
-                                                   const unsigned char *sk);
+                                                   const unsigned char *sk)
+            __attribute__ ((warn_unused_result));
 
 SODIUM_EXPORT
 int crypto_box_curve25519xsalsa20poly1305_afternm(unsigned char *c,

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

@@ -14,7 +14,7 @@
 extern "C" {
 #endif
 
-#ifdef __SUNPRO_C
+#if defined(__IBMC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 # pragma pack(1)
 #else
 # pragma pack(push, 1)
@@ -29,7 +29,7 @@ typedef CRYPTO_ALIGN(64) struct crypto_generichash_blake2b_state {
     uint8_t  last_node;
 } crypto_generichash_blake2b_state;
 
-#ifdef __SUNPRO_C
+#if defined(__IBMC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 # pragma pack()
 #else
 # pragma pack(pop)