rbnacl-libsodium 1.0.13 → 1.0.15

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

@@ -2,6 +2,7 @@
 #define crypto_secretbox_xsalsa20poly1305_H
 
 #include <stddef.h>
+#include "crypto_stream_xsalsa20.h"
 #include "export.h"
 
 #ifdef __cplusplus
@@ -23,15 +24,11 @@ size_t crypto_secretbox_xsalsa20poly1305_noncebytes(void);
 SODIUM_EXPORT
 size_t crypto_secretbox_xsalsa20poly1305_macbytes(void);
 
-#define crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES 16U
-SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_boxzerobytes(void);
-
-#define crypto_secretbox_xsalsa20poly1305_ZEROBYTES \
-    (crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES + \
-     crypto_secretbox_xsalsa20poly1305_MACBYTES)
+/* Only for the libsodium API - The NaCl compatibility API would require BOXZEROBYTES extra bytes */
+#define crypto_secretbox_xsalsa20poly1305_MESSAGEBYTES_MAX \
+    (crypto_stream_xsalsa20_MESSAGEBYTES_MAX - crypto_secretbox_xsalsa20poly1305_MACBYTES)
 SODIUM_EXPORT
-size_t crypto_secretbox_xsalsa20poly1305_zerobytes(void);
+size_t crypto_secretbox_xsalsa20poly1305_messagebytes_max(void);
 
 SODIUM_EXPORT
 int crypto_secretbox_xsalsa20poly1305(unsigned char *c,
@@ -51,6 +48,18 @@ int crypto_secretbox_xsalsa20poly1305_open(unsigned char *m,
 SODIUM_EXPORT
 void crypto_secretbox_xsalsa20poly1305_keygen(unsigned char k[crypto_secretbox_xsalsa20poly1305_KEYBYTES]);
 
+/* -- NaCl compatibility interface ; Requires padding -- */
+
+#define crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES 16U
+SODIUM_EXPORT
+size_t crypto_secretbox_xsalsa20poly1305_boxzerobytes(void);
+
+#define crypto_secretbox_xsalsa20poly1305_ZEROBYTES \
+    (crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES + \
+     crypto_secretbox_xsalsa20poly1305_MACBYTES)
+SODIUM_EXPORT
+size_t crypto_secretbox_xsalsa20poly1305_zerobytes(void);
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -0,0 +1,102 @@
+#ifndef crypto_secretstream_xchacha20poly1305_H
+#define crypto_secretstream_xchacha20poly1305_H
+
+#include <stddef.h>
+
+#include "crypto_aead_xchacha20poly1305.h"
+#include "crypto_stream_chacha20.h"
+#include "export.h"
+
+#ifdef __cplusplus
+# ifdef __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
+extern "C" {
+#endif
+
+#define crypto_secretstream_xchacha20poly1305_ABYTES \
+    (1U + crypto_aead_xchacha20poly1305_ietf_ABYTES)
+SODIUM_EXPORT
+size_t crypto_secretstream_xchacha20poly1305_abytes(void);
+
+#define crypto_secretstream_xchacha20poly1305_HEADERBYTES \
+    crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
+SODIUM_EXPORT
+size_t crypto_secretstream_xchacha20poly1305_headerbytes(void);
+
+#define crypto_secretstream_xchacha20poly1305_KEYBYTES \
+    crypto_aead_xchacha20poly1305_ietf_KEYBYTES
+SODIUM_EXPORT
+size_t crypto_secretstream_xchacha20poly1305_keybytes(void);
+
+#define crypto_secretstream_xchacha20poly1305_MESSAGEBYTES_MAX \
+    SODIUM_MIN(SODIUM_SIZE_MAX, ((1ULL << 32) - 2ULL) * 64ULL)
+SODIUM_EXPORT
+size_t crypto_secretstream_xchacha20poly1305_messagebytes_max(void);
+
+#define crypto_secretstream_xchacha20poly1305_TAG_MESSAGE 0x00
+SODIUM_EXPORT
+unsigned char crypto_secretstream_xchacha20poly1305_tag_message(void);
+
+#define crypto_secretstream_xchacha20poly1305_TAG_PUSH    0x01
+SODIUM_EXPORT
+unsigned char crypto_secretstream_xchacha20poly1305_tag_push(void);
+
+#define crypto_secretstream_xchacha20poly1305_TAG_REKEY   0x02
+SODIUM_EXPORT
+unsigned char crypto_secretstream_xchacha20poly1305_tag_rekey(void);
+
+#define crypto_secretstream_xchacha20poly1305_TAG_FINAL \
+    (crypto_secretstream_xchacha20poly1305_TAG_PUSH | \
+     crypto_secretstream_xchacha20poly1305_TAG_REKEY)
+SODIUM_EXPORT
+unsigned char crypto_secretstream_xchacha20poly1305_tag_final(void);
+
+typedef struct crypto_secretstream_xchacha20poly1305_state {
+    unsigned char k[crypto_stream_chacha20_ietf_KEYBYTES];
+    unsigned char nonce[crypto_stream_chacha20_ietf_NONCEBYTES];
+    unsigned char _pad[8];
+} crypto_secretstream_xchacha20poly1305_state;
+
+SODIUM_EXPORT
+size_t crypto_secretstream_xchacha20poly1305_statebytes(void);
+
+SODIUM_EXPORT
+void crypto_secretstream_xchacha20poly1305_keygen
+   (unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES]);
+
+SODIUM_EXPORT
+int crypto_secretstream_xchacha20poly1305_init_push
+   (crypto_secretstream_xchacha20poly1305_state *state,
+    unsigned char header[crypto_secretstream_xchacha20poly1305_HEADERBYTES],
+    const unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES]);
+
+SODIUM_EXPORT
+int crypto_secretstream_xchacha20poly1305_push
+   (crypto_secretstream_xchacha20poly1305_state *state,
+    unsigned char *c, unsigned long long *clen_p,
+    const unsigned char *m, unsigned long long mlen,
+    const unsigned char *ad, unsigned long long adlen, unsigned char tag);
+
+SODIUM_EXPORT
+int crypto_secretstream_xchacha20poly1305_init_pull
+   (crypto_secretstream_xchacha20poly1305_state *state,
+    const unsigned char header[crypto_secretstream_xchacha20poly1305_HEADERBYTES],
+    const unsigned char k[crypto_secretstream_xchacha20poly1305_KEYBYTES]);
+
+SODIUM_EXPORT
+int crypto_secretstream_xchacha20poly1305_pull
+   (crypto_secretstream_xchacha20poly1305_state *state,
+    unsigned char *m, unsigned long long *mlen_p, unsigned char *tag_p,
+    const unsigned char *c, unsigned long long clen,
+    const unsigned char *ad, unsigned long long adlen);
+
+SODIUM_EXPORT
+void crypto_secretstream_xchacha20poly1305_rekey
+    (crypto_secretstream_xchacha20poly1305_state *state);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

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

@@ -41,6 +41,10 @@ size_t  crypto_sign_publickeybytes(void);
 SODIUM_EXPORT
 size_t  crypto_sign_secretkeybytes(void);
 
+#define crypto_sign_MESSAGEBYTES_MAX crypto_sign_ed25519_MESSAGEBYTES_MAX
+SODIUM_EXPORT
+size_t  crypto_sign_messagebytes_max(void);
+
 #define crypto_sign_PRIMITIVE "ed25519"
 SODIUM_EXPORT
 const char *crypto_sign_primitive(void);

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

@@ -35,6 +35,10 @@ size_t crypto_sign_ed25519_publickeybytes(void);
 SODIUM_EXPORT
 size_t crypto_sign_ed25519_secretkeybytes(void);
 
+#define crypto_sign_ed25519_MESSAGEBYTES_MAX (SODIUM_SIZE_MAX - crypto_sign_ed25519_BYTES)
+SODIUM_EXPORT
+size_t crypto_sign_ed25519_messagebytes_max(void);
+
 SODIUM_EXPORT
 int crypto_sign_ed25519(unsigned char *sm, unsigned long long *smlen_p,
                         const unsigned char *m, unsigned long long mlen,

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

@@ -25,6 +25,7 @@ extern "C" {
 #define crypto_sign_edwards25519sha512batch_BYTES 64U
 #define crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES 32U
 #define crypto_sign_edwards25519sha512batch_SECRETKEYBYTES (32U + 32U)
+#define crypto_sign_edwards25519sha512batch_MESSAGEBYTES_MAX (SODIUM_SIZE_MAX - crypto_sign_edwards25519sha512batch_BYTES)
 
 SODIUM_EXPORT
 int crypto_sign_edwards25519sha512batch(unsigned char *sm,

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

@@ -29,6 +29,10 @@ size_t  crypto_stream_keybytes(void);
 SODIUM_EXPORT
 size_t  crypto_stream_noncebytes(void);
 
+#define crypto_stream_MESSAGEBYTES_MAX crypto_stream_xsalsa20_MESSAGEBYTES_MAX
+SODIUM_EXPORT
+size_t  crypto_stream_messagebytes_max(void);
+
 #define crypto_stream_PRIMITIVE "xsalsa20"
 SODIUM_EXPORT
 const char *crypto_stream_primitive(void);

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

@@ -28,6 +28,10 @@ size_t crypto_stream_chacha20_keybytes(void);
 SODIUM_EXPORT
 size_t crypto_stream_chacha20_noncebytes(void);
 
+#define crypto_stream_chacha20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
+SODIUM_EXPORT
+size_t crypto_stream_chacha20_messagebytes_max(void);
+
 /* ChaCha20 with a 64-bit nonce and a 64-bit counter, as originally designed */
 
 SODIUM_EXPORT
@@ -58,6 +62,11 @@ size_t crypto_stream_chacha20_ietf_keybytes(void);
 SODIUM_EXPORT
 size_t crypto_stream_chacha20_ietf_noncebytes(void);
 
+#define crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX \
+    SODIUM_MIN(SODIUM_SIZE_MAX, 64ULL * (1ULL << 32))
+SODIUM_EXPORT
+size_t crypto_stream_chacha20_ietf_messagebytes_max(void);
+
 SODIUM_EXPORT
 int crypto_stream_chacha20_ietf(unsigned char *c, unsigned long long clen,
                                 const unsigned char *n, const unsigned char *k);
@@ -80,6 +89,7 @@ void crypto_stream_chacha20_ietf_keygen(unsigned char k[crypto_stream_chacha20_i
 
 #define crypto_stream_chacha20_IETF_KEYBYTES crypto_stream_chacha20_ietf_KEYBYTES
 #define crypto_stream_chacha20_IETF_NONCEBYTES crypto_stream_chacha20_ietf_NONCEBYTES
+#define crypto_stream_chacha20_IETF_MESSAGEBYTES_MAX crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX
 
 #ifdef __cplusplus
 }

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

@@ -28,6 +28,10 @@ size_t crypto_stream_salsa20_keybytes(void);
 SODIUM_EXPORT
 size_t crypto_stream_salsa20_noncebytes(void);
 
+#define crypto_stream_salsa20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
+SODIUM_EXPORT
+size_t crypto_stream_salsa20_messagebytes_max(void);
+
 SODIUM_EXPORT
 int crypto_stream_salsa20(unsigned char *c, unsigned long long clen,
                           const unsigned char *n, const unsigned char *k);

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

@@ -27,6 +27,10 @@ size_t crypto_stream_salsa2012_keybytes(void);
 SODIUM_EXPORT
 size_t crypto_stream_salsa2012_noncebytes(void);
 
+#define crypto_stream_salsa2012_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
+SODIUM_EXPORT
+size_t crypto_stream_salsa2012_messagebytes_max(void);
+
 SODIUM_EXPORT
 int crypto_stream_salsa2012(unsigned char *c, unsigned long long clen,
                             const unsigned char *n, const unsigned char *k);

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

@@ -21,23 +21,33 @@ extern "C" {
 
 #define crypto_stream_salsa208_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_stream_salsa208_keybytes(void);
+size_t crypto_stream_salsa208_keybytes(void)
+            __attribute__ ((deprecated));
 
 #define crypto_stream_salsa208_NONCEBYTES 8U
 SODIUM_EXPORT
-size_t crypto_stream_salsa208_noncebytes(void);
+size_t crypto_stream_salsa208_noncebytes(void)
+            __attribute__ ((deprecated));
+
+#define crypto_stream_salsa208_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
+    SODIUM_EXPORT
+size_t crypto_stream_salsa208_messagebytes_max(void)
+            __attribute__ ((deprecated));
 
 SODIUM_EXPORT
 int crypto_stream_salsa208(unsigned char *c, unsigned long long clen,
-                           const unsigned char *n, const unsigned char *k);
+                           const unsigned char *n, const unsigned char *k)
+            __attribute__ ((deprecated));
 
 SODIUM_EXPORT
 int crypto_stream_salsa208_xor(unsigned char *c, const unsigned char *m,
                                unsigned long long mlen, const unsigned char *n,
-                               const unsigned char *k);
+                               const unsigned char *k)
+            __attribute__ ((deprecated));
 
 SODIUM_EXPORT
-void crypto_stream_salsa208_keygen(unsigned char k[crypto_stream_salsa208_KEYBYTES]);
+void crypto_stream_salsa208_keygen(unsigned char k[crypto_stream_salsa208_KEYBYTES])
+            __attribute__ ((deprecated));
 
 #ifdef __cplusplus
 }

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

@@ -28,6 +28,10 @@ size_t crypto_stream_xchacha20_keybytes(void);
 SODIUM_EXPORT
 size_t crypto_stream_xchacha20_noncebytes(void);
 
+#define crypto_stream_xchacha20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
+SODIUM_EXPORT
+size_t crypto_stream_xchacha20_messagebytes_max(void);
+
 SODIUM_EXPORT
 int crypto_stream_xchacha20(unsigned char *c, unsigned long long clen,
                             const unsigned char *n, const unsigned char *k);

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

@@ -28,6 +28,10 @@ size_t crypto_stream_xsalsa20_keybytes(void);
 SODIUM_EXPORT
 size_t crypto_stream_xsalsa20_noncebytes(void);
 
+#define crypto_stream_xsalsa20_MESSAGEBYTES_MAX SODIUM_SIZE_MAX
+SODIUM_EXPORT
+size_t crypto_stream_xsalsa20_messagebytes_max(void);
+
 SODIUM_EXPORT
 int crypto_stream_xsalsa20(unsigned char *c, unsigned long long clen,
                            const unsigned char *n, const unsigned char *k);

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

@@ -11,6 +11,7 @@
 
 #ifdef SODIUM_STATIC
 # define SODIUM_EXPORT
+# define SODIUM_EXPORT_WEAK
 #else
 # if defined(_MSC_VER)
 #  ifdef SODIUM_DLL_EXPORT
@@ -31,6 +32,11 @@
 #   define SODIUM_EXPORT __attribute__ ((visibility ("default")))
 #  endif
 # endif
+# if defined(__ELF__) && !defined(SODIUM_DISABLE_WEAK_FUNCTIONS)
+#  define SODIUM_EXPORT_WEAK SODIUM_EXPORT __attribute__((weak))
+# else
+#  define SODIUM_EXPORT_WEAK SODIUM_EXPORT
+# endif
 #endif
 
 #ifndef CRYPTO_ALIGN
@@ -41,4 +47,7 @@
 # endif
 #endif
 
+#define SODIUM_MIN(A, B) ((A) < (B) ? (A) : (B))
+#define SODIUM_SIZE_MAX SODIUM_MIN(UINT64_MAX, SIZE_MAX)
+
 #endif

data/vendor/libsodium/src/libsodium/include/sodium/private/common.h

@@ -177,6 +177,17 @@ store32_be(uint8_t dst[4], uint32_t w)
 #endif
 }
 
+#define XOR_BUF(OUT, IN, N) xor_buf((OUT), (IN), (N))
+static inline void
+xor_buf(unsigned char *out, const unsigned char *in, size_t n)
+{
+    size_t i;
+
+    for (i = 0; i < n; i++) {
+        out[i] ^= in[i];
+    }
+}
+
 #ifndef __GNUC__
 # ifdef __attribute__
 #  undef __attribute__

data/vendor/libsodium/src/libsodium/include/sodium/private/curve25519_ref10.h

@@ -19,36 +19,26 @@ typedef int32_t fe[10];
 #define fe_tobytes crypto_core_curve25519_ref10_fe_tobytes
 #define fe_copy crypto_core_curve25519_ref10_fe_copy
 #define fe_isnonzero crypto_core_curve25519_ref10_fe_isnonzero
-#define fe_isnegative crypto_core_curve25519_ref10_fe_isnegative
 #define fe_0 crypto_core_curve25519_ref10_fe_0
 #define fe_1 crypto_core_curve25519_ref10_fe_1
-#define fe_cmov crypto_core_curve25519_ref10_fe_cmov
 #define fe_add crypto_core_curve25519_ref10_fe_add
 #define fe_sub crypto_core_curve25519_ref10_fe_sub
-#define fe_neg crypto_core_curve25519_ref10_fe_neg
 #define fe_mul crypto_core_curve25519_ref10_fe_mul
 #define fe_sq crypto_core_curve25519_ref10_fe_sq
-#define fe_sq2 crypto_core_curve25519_ref10_fe_sq2
 #define fe_invert crypto_core_curve25519_ref10_fe_invert
-#define fe_pow22523 crypto_core_curve25519_ref10_fe_pow22523
 
 extern void fe_frombytes(fe,const unsigned char *);
 extern void fe_tobytes(unsigned char *,const fe);
 
 extern void fe_copy(fe,const fe);
 extern int fe_isnonzero(const fe);
-extern int fe_isnegative(const fe);
 extern void fe_0(fe);
 extern void fe_1(fe);
-extern void fe_cmov(fe,const fe,unsigned int);
 extern void fe_add(fe,const fe,const fe);
 extern void fe_sub(fe,const fe,const fe);
-extern void fe_neg(fe,const fe);
 extern void fe_mul(fe,const fe,const fe);
 extern void fe_sq(fe,const fe);
-extern void fe_sq2(fe,const fe);
 extern void fe_invert(fe,const fe);
-extern void fe_pow22523(fe,const fe);
 
 /*
  ge means group element.
@@ -106,45 +96,27 @@ typedef struct {
 #define ge_tobytes crypto_core_curve25519_ref10_ge_tobytes
 #define ge_p3_tobytes crypto_core_curve25519_ref10_ge_p3_tobytes
 
-#define ge_p2_0 crypto_core_curve25519_ref10_ge_p2_0
-#define ge_p3_0 crypto_core_curve25519_ref10_ge_p3_0
-#define ge_precomp_0 crypto_core_curve25519_ref10_ge_precomp_0
-#define ge_p3_to_p2 crypto_core_curve25519_ref10_ge_p3_to_p2
 #define ge_p3_to_cached crypto_core_curve25519_ref10_ge_p3_to_cached
 #define ge_p1p1_to_p2 crypto_core_curve25519_ref10_ge_p1p1_to_p2
-#define ge_p1p1_to_p3 crypto_core_curve25519_ref10_ge_p1p1_to_p3
-#define ge_p2_dbl crypto_core_curve25519_ref10_ge_p2_dbl
-#define ge_p3_dbl crypto_core_curve25519_ref10_ge_p3_dbl
 
-#define ge_madd crypto_core_curve25519_ref10_ge_madd
-#define ge_msub crypto_core_curve25519_ref10_ge_msub
 #define ge_add crypto_core_curve25519_ref10_ge_add
-#define ge_sub crypto_core_curve25519_ref10_ge_sub
 #define ge_scalarmult_base crypto_core_curve25519_ref10_ge_scalarmult_base
 #define ge_double_scalarmult_vartime crypto_core_curve25519_ref10_ge_double_scalarmult_vartime
 #define ge_scalarmult_vartime crypto_core_curve25519_ref10_ge_scalarmult_vartime
+#define ge_mul_l crypto_core_curve25519_ref10_ge_mul_l
 
 extern void ge_tobytes(unsigned char *,const ge_p2 *);
 extern void ge_p3_tobytes(unsigned char *,const ge_p3 *);
 extern int ge_frombytes_negate_vartime(ge_p3 *,const unsigned char *);
 
-extern void ge_p2_0(ge_p2 *);
-extern void ge_p3_0(ge_p3 *);
-extern void ge_precomp_0(ge_precomp *);
-extern void ge_p3_to_p2(ge_p2 *,const ge_p3 *);
 extern void ge_p3_to_cached(ge_cached *,const ge_p3 *);
 extern void ge_p1p1_to_p2(ge_p2 *,const ge_p1p1 *);
-extern void ge_p1p1_to_p3(ge_p3 *,const ge_p1p1 *);
-extern void ge_p2_dbl(ge_p1p1 *,const ge_p2 *);
-extern void ge_p3_dbl(ge_p1p1 *,const ge_p3 *);
 
-extern void ge_madd(ge_p1p1 *,const ge_p3 *,const ge_precomp *);
-extern void ge_msub(ge_p1p1 *,const ge_p3 *,const ge_precomp *);
 extern void ge_add(ge_p1p1 *,const ge_p3 *,const ge_cached *);
-extern void ge_sub(ge_p1p1 *,const ge_p3 *,const ge_cached *);
 extern void ge_scalarmult_base(ge_p3 *,const unsigned char *);
 extern void ge_double_scalarmult_vartime(ge_p2 *,const unsigned char *,const ge_p3 *,const unsigned char *);
 extern void ge_scalarmult_vartime(ge_p3 *,const unsigned char *,const ge_p3 *);
+extern void ge_mul_l(ge_p3 *r, const ge_p3 *A);
 
 /*
  The set of scalars is \Z/l

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

@@ -25,6 +25,8 @@ typedef struct randombytes_implementation {
     int         (*close)(void);               /* optional */
 } randombytes_implementation;
 
+#define randombytes_BYTES_MAX SODIUM_MIN(SODIUM_SIZE_MAX, 0xffffffffUL)
+
 #define randombytes_SEEDBYTES 32U
 SODIUM_EXPORT
 size_t randombytes_seedbytes(void);