rbnacl-libsodium 1.0.13 → 1.0.15

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

@@ -30,6 +30,12 @@ size_t crypto_aead_chacha20poly1305_ietf_npubbytes(void);
 SODIUM_EXPORT
 size_t crypto_aead_chacha20poly1305_ietf_abytes(void);
 
+#define crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX \
+    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ietf_ABYTES, \
+               (64ULL * (1ULL << 32) - 64ULL) - crypto_aead_chacha20poly1305_ietf_ABYTES)
+SODIUM_EXPORT
+size_t crypto_aead_chacha20poly1305_ietf_messagebytes_max(void);
+
 SODIUM_EXPORT
 int crypto_aead_chacha20poly1305_ietf_encrypt(unsigned char *c,
                                               unsigned long long *clen_p,
@@ -98,6 +104,11 @@ size_t crypto_aead_chacha20poly1305_npubbytes(void);
 SODIUM_EXPORT
 size_t crypto_aead_chacha20poly1305_abytes(void);
 
+#define crypto_aead_chacha20poly1305_MESSAGEBYTES_MAX \
+    (SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ABYTES)
+SODIUM_EXPORT
+size_t crypto_aead_chacha20poly1305_messagebytes_max(void);
+
 SODIUM_EXPORT
 int crypto_aead_chacha20poly1305_encrypt(unsigned char *c,
                                          unsigned long long *clen_p,
@@ -150,10 +161,11 @@ void crypto_aead_chacha20poly1305_keygen(unsigned char k[crypto_aead_chacha20pol
 
 /* Aliases */
 
-#define crypto_aead_chacha20poly1305_IETF_KEYBYTES  crypto_aead_chacha20poly1305_ietf_KEYBYTES
-#define crypto_aead_chacha20poly1305_IETF_NSECBYTES crypto_aead_chacha20poly1305_ietf_NSECBYTES
-#define crypto_aead_chacha20poly1305_IETF_NPUBBYTES crypto_aead_chacha20poly1305_ietf_NPUBBYTES
-#define crypto_aead_chacha20poly1305_IETF_ABYTES    crypto_aead_chacha20poly1305_ietf_ABYTES
+#define crypto_aead_chacha20poly1305_IETF_KEYBYTES         crypto_aead_chacha20poly1305_ietf_KEYBYTES
+#define crypto_aead_chacha20poly1305_IETF_NSECBYTES        crypto_aead_chacha20poly1305_ietf_NSECBYTES
+#define crypto_aead_chacha20poly1305_IETF_NPUBBYTES        crypto_aead_chacha20poly1305_ietf_NPUBBYTES
+#define crypto_aead_chacha20poly1305_IETF_ABYTES           crypto_aead_chacha20poly1305_ietf_ABYTES
+#define crypto_aead_chacha20poly1305_IETF_MESSAGEBYTES_MAX crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX
 
 #ifdef __cplusplus
 }

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

@@ -27,6 +27,11 @@ size_t crypto_aead_xchacha20poly1305_ietf_npubbytes(void);
 SODIUM_EXPORT
 size_t crypto_aead_xchacha20poly1305_ietf_abytes(void);
 
+#define crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX \
+    (SODIUM_SIZE_MAX - crypto_aead_xchacha20poly1305_ietf_ABYTES)
+SODIUM_EXPORT
+size_t crypto_aead_xchacha20poly1305_ietf_messagebytes_max(void);
+
 SODIUM_EXPORT
 int crypto_aead_xchacha20poly1305_ietf_encrypt(unsigned char *c,
                                                unsigned long long *clen_p,
@@ -79,10 +84,11 @@ void crypto_aead_xchacha20poly1305_ietf_keygen(unsigned char k[crypto_aead_xchac
 
 /* Aliases */
 
-#define crypto_aead_xchacha20poly1305_IETF_KEYBYTES  crypto_aead_xchacha20poly1305_ietf_KEYBYTES
-#define crypto_aead_xchacha20poly1305_IETF_NSECBYTES crypto_aead_xchacha20poly1305_ietf_NSECBYTES
-#define crypto_aead_xchacha20poly1305_IETF_NPUBBYTES crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
-#define crypto_aead_xchacha20poly1305_IETF_ABYTES    crypto_aead_xchacha20poly1305_ietf_ABYTES
+#define crypto_aead_xchacha20poly1305_IETF_KEYBYTES         crypto_aead_xchacha20poly1305_ietf_KEYBYTES
+#define crypto_aead_xchacha20poly1305_IETF_NSECBYTES        crypto_aead_xchacha20poly1305_ietf_NSECBYTES
+#define crypto_aead_xchacha20poly1305_IETF_NPUBBYTES        crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
+#define crypto_aead_xchacha20poly1305_IETF_ABYTES           crypto_aead_xchacha20poly1305_ietf_ABYTES
+#define crypto_aead_xchacha20poly1305_IETF_MESSAGEBYTES_MAX crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX
 
 #ifdef __cplusplus
 }

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

@@ -40,6 +40,10 @@ size_t  crypto_box_noncebytes(void);
 SODIUM_EXPORT
 size_t  crypto_box_macbytes(void);
 
+#define crypto_box_MESSAGEBYTES_MAX crypto_box_curve25519xsalsa20poly1305_MESSAGEBYTES_MAX
+SODIUM_EXPORT
+size_t  crypto_box_messagebytes_max(void);
+
 #define crypto_box_PRIMITIVE "curve25519xsalsa20poly1305"
 SODIUM_EXPORT
 const char *crypto_box_primitive(void);

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

@@ -3,6 +3,7 @@
 #define crypto_box_curve25519xchacha20poly1305_H
 
 #include <stddef.h>
+#include "crypto_stream_xchacha20.h"
 #include "export.h"
 
 #ifdef __cplusplus
@@ -36,6 +37,11 @@ size_t crypto_box_curve25519xchacha20poly1305_noncebytes(void);
 SODIUM_EXPORT
 size_t crypto_box_curve25519xchacha20poly1305_macbytes(void);
 
+#define crypto_box_curve25519xchacha20poly1305_MESSAGEBYTES_MAX \
+    (crypto_stream_xchacha20_MESSAGEBYTES_MAX - crypto_box_curve25519xchacha20poly1305_MACBYTES)
+SODIUM_EXPORT
+size_t crypto_box_curve25519xchacha20poly1305_messagebytes_max(void);
+
 SODIUM_EXPORT
 int crypto_box_curve25519xchacha20poly1305_seed_keypair(unsigned char *pk,
                                                         unsigned char *sk,

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

@@ -2,6 +2,7 @@
 #define crypto_box_curve25519xsalsa20poly1305_H
 
 #include <stddef.h>
+#include "crypto_stream_xsalsa20.h"
 #include "export.h"
 
 #ifdef __cplusplus
@@ -35,6 +36,29 @@ size_t crypto_box_curve25519xsalsa20poly1305_noncebytes(void);
 SODIUM_EXPORT
 size_t crypto_box_curve25519xsalsa20poly1305_macbytes(void);
 
+/* Only for the libsodium API - The NaCl compatibility API would require BOXZEROBYTES extra bytes */
+#define crypto_box_curve25519xsalsa20poly1305_MESSAGEBYTES_MAX \
+    (crypto_stream_xsalsa20_MESSAGEBYTES_MAX - crypto_box_curve25519xsalsa20poly1305_MACBYTES)
+SODIUM_EXPORT
+size_t crypto_box_curve25519xsalsa20poly1305_messagebytes_max(void);
+
+SODIUM_EXPORT
+int crypto_box_curve25519xsalsa20poly1305_seed_keypair(unsigned char *pk,
+                                                       unsigned char *sk,
+                                                       const unsigned char *seed);
+
+SODIUM_EXPORT
+int crypto_box_curve25519xsalsa20poly1305_keypair(unsigned char *pk,
+                                                  unsigned char *sk);
+
+SODIUM_EXPORT
+int crypto_box_curve25519xsalsa20poly1305_beforenm(unsigned char *k,
+                                                   const unsigned char *pk,
+                                                   const unsigned char *sk)
+            __attribute__ ((warn_unused_result));
+
+/* -- NaCl compatibility interface ; Requires padding -- */
+
 #define crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES 16U
 SODIUM_EXPORT
 size_t crypto_box_curve25519xsalsa20poly1305_boxzerobytes(void);
@@ -63,21 +87,6 @@ int crypto_box_curve25519xsalsa20poly1305_open(unsigned char *m,
                                                const unsigned char *sk)
             __attribute__ ((warn_unused_result));
 
-SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_seed_keypair(unsigned char *pk,
-                                                       unsigned char *sk,
-                                                       const unsigned char *seed);
-
-SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_keypair(unsigned char *pk,
-                                                  unsigned char *sk);
-
-SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_beforenm(unsigned char *k,
-                                                   const unsigned char *pk,
-                                                   const unsigned char *sk)
-            __attribute__ ((warn_unused_result));
-
 SODIUM_EXPORT
 int crypto_box_curve25519xsalsa20poly1305_afternm(unsigned char *c,
                                                   const unsigned char *m,

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

@@ -10,19 +10,23 @@ extern "C" {
 
 #define crypto_core_salsa208_OUTPUTBYTES 64U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_outputbytes(void);
+size_t crypto_core_salsa208_outputbytes(void)
+            __attribute__ ((deprecated));
 
 #define crypto_core_salsa208_INPUTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_inputbytes(void);
+size_t crypto_core_salsa208_inputbytes(void)
+            __attribute__ ((deprecated));
 
 #define crypto_core_salsa208_KEYBYTES 32U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_keybytes(void);
+size_t crypto_core_salsa208_keybytes(void)
+            __attribute__ ((deprecated));
 
 #define crypto_core_salsa208_CONSTBYTES 16U
 SODIUM_EXPORT
-size_t crypto_core_salsa208_constbytes(void);
+size_t crypto_core_salsa208_constbytes(void)
+            __attribute__ ((deprecated));
 
 SODIUM_EXPORT
 int crypto_core_salsa208(unsigned char *out, const unsigned char *in,

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

@@ -22,78 +22,84 @@ int crypto_pwhash_alg_argon2i13(void);
 SODIUM_EXPORT
 int crypto_pwhash_alg_argon2id13(void);
 
-#define crypto_pwhash_ALG_DEFAULT crypto_pwhash_ALG_ARGON2I13
+#define crypto_pwhash_ALG_DEFAULT crypto_pwhash_ALG_ARGON2ID13
 SODIUM_EXPORT
 int crypto_pwhash_alg_default(void);
 
-#define crypto_pwhash_BYTES_MIN crypto_pwhash_argon2i_BYTES_MIN
+#define crypto_pwhash_BYTES_MIN crypto_pwhash_argon2id_BYTES_MIN
 SODIUM_EXPORT
 size_t crypto_pwhash_bytes_min(void);
 
-#define crypto_pwhash_BYTES_MAX crypto_pwhash_argon2i_BYTES_MAX
+#define crypto_pwhash_BYTES_MAX crypto_pwhash_argon2id_BYTES_MAX
 SODIUM_EXPORT
 size_t crypto_pwhash_bytes_max(void);
 
-#define crypto_pwhash_PASSWD_MIN crypto_pwhash_argon2i_PASSWD_MIN
+#define crypto_pwhash_PASSWD_MIN crypto_pwhash_argon2id_PASSWD_MIN
 SODIUM_EXPORT
 size_t crypto_pwhash_passwd_min(void);
 
-#define crypto_pwhash_PASSWD_MAX crypto_pwhash_argon2i_PASSWD_MAX
+#define crypto_pwhash_PASSWD_MAX crypto_pwhash_argon2id_PASSWD_MAX
 SODIUM_EXPORT
 size_t crypto_pwhash_passwd_max(void);
 
-#define crypto_pwhash_SALTBYTES crypto_pwhash_argon2i_SALTBYTES
+#define crypto_pwhash_SALTBYTES crypto_pwhash_argon2id_SALTBYTES
 SODIUM_EXPORT
 size_t crypto_pwhash_saltbytes(void);
 
-#define crypto_pwhash_STRBYTES crypto_pwhash_argon2i_STRBYTES
+#define crypto_pwhash_STRBYTES crypto_pwhash_argon2id_STRBYTES
 SODIUM_EXPORT
 size_t crypto_pwhash_strbytes(void);
 
-#define crypto_pwhash_STRPREFIX crypto_pwhash_argon2i_STRPREFIX
+#define crypto_pwhash_STRPREFIX crypto_pwhash_argon2id_STRPREFIX
 SODIUM_EXPORT
 const char *crypto_pwhash_strprefix(void);
 
-#define crypto_pwhash_OPSLIMIT_MIN crypto_pwhash_argon2i_OPSLIMIT_MIN
+#define crypto_pwhash_OPSLIMIT_MIN crypto_pwhash_argon2id_OPSLIMIT_MIN
 SODIUM_EXPORT
 size_t crypto_pwhash_opslimit_min(void);
 
-#define crypto_pwhash_OPSLIMIT_MAX crypto_pwhash_argon2i_OPSLIMIT_MAX
+#define crypto_pwhash_OPSLIMIT_MAX crypto_pwhash_argon2id_OPSLIMIT_MAX
 SODIUM_EXPORT
 size_t crypto_pwhash_opslimit_max(void);
 
-#define crypto_pwhash_MEMLIMIT_MIN crypto_pwhash_argon2i_MEMLIMIT_MIN
+#define crypto_pwhash_MEMLIMIT_MIN crypto_pwhash_argon2id_MEMLIMIT_MIN
 SODIUM_EXPORT
 size_t crypto_pwhash_memlimit_min(void);
 
-#define crypto_pwhash_MEMLIMIT_MAX crypto_pwhash_argon2i_MEMLIMIT_MAX
+#define crypto_pwhash_MEMLIMIT_MAX crypto_pwhash_argon2id_MEMLIMIT_MAX
 SODIUM_EXPORT
 size_t crypto_pwhash_memlimit_max(void);
 
-#define crypto_pwhash_OPSLIMIT_INTERACTIVE crypto_pwhash_argon2i_OPSLIMIT_INTERACTIVE
+#define crypto_pwhash_OPSLIMIT_INTERACTIVE crypto_pwhash_argon2id_OPSLIMIT_INTERACTIVE
 SODIUM_EXPORT
 size_t crypto_pwhash_opslimit_interactive(void);
 
-#define crypto_pwhash_MEMLIMIT_INTERACTIVE crypto_pwhash_argon2i_MEMLIMIT_INTERACTIVE
+#define crypto_pwhash_MEMLIMIT_INTERACTIVE crypto_pwhash_argon2id_MEMLIMIT_INTERACTIVE
 SODIUM_EXPORT
 size_t crypto_pwhash_memlimit_interactive(void);
 
-#define crypto_pwhash_OPSLIMIT_MODERATE crypto_pwhash_argon2i_OPSLIMIT_MODERATE
+#define crypto_pwhash_OPSLIMIT_MODERATE crypto_pwhash_argon2id_OPSLIMIT_MODERATE
 SODIUM_EXPORT
 size_t crypto_pwhash_opslimit_moderate(void);
 
-#define crypto_pwhash_MEMLIMIT_MODERATE crypto_pwhash_argon2i_MEMLIMIT_MODERATE
+#define crypto_pwhash_MEMLIMIT_MODERATE crypto_pwhash_argon2id_MEMLIMIT_MODERATE
 SODIUM_EXPORT
 size_t crypto_pwhash_memlimit_moderate(void);
 
-#define crypto_pwhash_OPSLIMIT_SENSITIVE crypto_pwhash_argon2i_OPSLIMIT_SENSITIVE
+#define crypto_pwhash_OPSLIMIT_SENSITIVE crypto_pwhash_argon2id_OPSLIMIT_SENSITIVE
 SODIUM_EXPORT
 size_t crypto_pwhash_opslimit_sensitive(void);
 
-#define crypto_pwhash_MEMLIMIT_SENSITIVE crypto_pwhash_argon2i_MEMLIMIT_SENSITIVE
+#define crypto_pwhash_MEMLIMIT_SENSITIVE crypto_pwhash_argon2id_MEMLIMIT_SENSITIVE
 SODIUM_EXPORT
 size_t crypto_pwhash_memlimit_sensitive(void);
 
+/*
+ * With this function, do not forget to store all parameters, including the
+ * algorithm identifier in order to produce deterministic output.
+ * The crypto_pwhash_* definitions, including crypto_pwhash_ALG_DEFAULT,
+ * may change.
+ */
 SODIUM_EXPORT
 int crypto_pwhash(unsigned char * const out, unsigned long long outlen,
                   const char * const passwd, unsigned long long passwdlen,
@@ -101,18 +107,34 @@ int crypto_pwhash(unsigned char * const out, unsigned long long outlen,
                   unsigned long long opslimit, size_t memlimit, int alg)
             __attribute__ ((warn_unused_result));
 
+/*
+ * The output string already includes all the required parameters, including
+ * the algorithm identifier. The string is all that has to be stored in
+ * order to verify a password.
+ */
 SODIUM_EXPORT
 int crypto_pwhash_str(char out[crypto_pwhash_STRBYTES],
                       const char * const passwd, unsigned long long passwdlen,
                       unsigned long long opslimit, size_t memlimit)
             __attribute__ ((warn_unused_result));
 
+SODIUM_EXPORT
+int crypto_pwhash_str_alg(char out[crypto_pwhash_STRBYTES],
+                          const char * const passwd, unsigned long long passwdlen,
+                          unsigned long long opslimit, size_t memlimit, int alg)
+            __attribute__ ((warn_unused_result));
+
 SODIUM_EXPORT
 int crypto_pwhash_str_verify(const char str[crypto_pwhash_STRBYTES],
                              const char * const passwd,
                              unsigned long long passwdlen)
             __attribute__ ((warn_unused_result));
 
+SODIUM_EXPORT
+int crypto_pwhash_str_needs_rehash(const char str[crypto_pwhash_STRBYTES],
+                                   unsigned long long opslimit, size_t memlimit)
+            __attribute__ ((warn_unused_result));
+
 #define crypto_pwhash_PRIMITIVE "argon2i"
 SODIUM_EXPORT
 const char *crypto_pwhash_primitive(void)

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

@@ -22,7 +22,7 @@ int crypto_pwhash_argon2i_alg_argon2i13(void);
 SODIUM_EXPORT
 size_t crypto_pwhash_argon2i_bytes_min(void);
 
-#define crypto_pwhash_argon2i_BYTES_MAX 4294967295U
+#define crypto_pwhash_argon2i_BYTES_MAX SODIUM_MIN(SODIUM_SIZE_MAX, 4294967295U)
 SODIUM_EXPORT
 size_t crypto_pwhash_argon2i_bytes_max(void);
 
@@ -58,7 +58,8 @@ size_t crypto_pwhash_argon2i_opslimit_max(void);
 SODIUM_EXPORT
 size_t crypto_pwhash_argon2i_memlimit_min(void);
 
-#define crypto_pwhash_argon2i_MEMLIMIT_MAX ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) ? 2147483648U : 32768U)
+#define crypto_pwhash_argon2i_MEMLIMIT_MAX \
+    ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) ? 2147483648U : 32768U)
 SODIUM_EXPORT
 size_t crypto_pwhash_argon2i_memlimit_max(void);
 
@@ -109,6 +110,11 @@ int crypto_pwhash_argon2i_str_verify(const char str[crypto_pwhash_argon2i_STRBYT
                                      unsigned long long passwdlen)
             __attribute__ ((warn_unused_result));
 
+SODIUM_EXPORT
+int crypto_pwhash_argon2i_str_needs_rehash(const char str[crypto_pwhash_argon2i_STRBYTES],
+                                           unsigned long long opslimit, size_t memlimit)
+            __attribute__ ((warn_unused_result));
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -22,7 +22,7 @@ int crypto_pwhash_argon2id_alg_argon2id13(void);
 SODIUM_EXPORT
 size_t crypto_pwhash_argon2id_bytes_min(void);
 
-#define crypto_pwhash_argon2id_BYTES_MAX 4294967295U
+#define crypto_pwhash_argon2id_BYTES_MAX SODIUM_MIN(SODIUM_SIZE_MAX, 4294967295U)
 SODIUM_EXPORT
 size_t crypto_pwhash_argon2id_bytes_max(void);
 
@@ -58,7 +58,8 @@ size_t crypto_pwhash_argon2id_opslimit_max(void);
 SODIUM_EXPORT
 size_t crypto_pwhash_argon2id_memlimit_min(void);
 
-#define crypto_pwhash_argon2id_MEMLIMIT_MAX ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) ? 2147483648U : 32768U)
+#define crypto_pwhash_argon2id_MEMLIMIT_MAX \
+    ((SIZE_MAX >= 4398046510080U) ? 4398046510080U : (SIZE_MAX >= 2147483648U) ? 2147483648U : 32768U)
 SODIUM_EXPORT
 size_t crypto_pwhash_argon2id_memlimit_max(void);
 
@@ -109,6 +110,11 @@ int crypto_pwhash_argon2id_str_verify(const char str[crypto_pwhash_argon2id_STRB
                                       unsigned long long passwdlen)
             __attribute__ ((warn_unused_result));
 
+SODIUM_EXPORT
+int crypto_pwhash_argon2id_str_needs_rehash(const char str[crypto_pwhash_argon2id_STRBYTES],
+                                            unsigned long long opslimit, size_t memlimit)
+            __attribute__ ((warn_unused_result));
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -18,7 +18,8 @@ extern "C" {
 SODIUM_EXPORT
 size_t crypto_pwhash_scryptsalsa208sha256_bytes_min(void);
 
-#define crypto_pwhash_scryptsalsa208sha256_BYTES_MAX SIZE_MAX
+#define crypto_pwhash_scryptsalsa208sha256_BYTES_MAX \
+    SODIUM_MIN(SODIUM_SIZE_MAX, 0x1fffffffe0ULL)
 SODIUM_EXPORT
 size_t crypto_pwhash_scryptsalsa208sha256_bytes_max(void);
 
@@ -26,7 +27,7 @@ size_t crypto_pwhash_scryptsalsa208sha256_bytes_max(void);
 SODIUM_EXPORT
 size_t crypto_pwhash_scryptsalsa208sha256_passwd_min(void);
 
-#define crypto_pwhash_scryptsalsa208sha256_PASSWD_MAX SIZE_MAX
+#define crypto_pwhash_scryptsalsa208sha256_PASSWD_MAX SODIUM_SIZE_MAX
 SODIUM_EXPORT
 size_t crypto_pwhash_scryptsalsa208sha256_passwd_max(void);
 
@@ -54,7 +55,8 @@ size_t crypto_pwhash_scryptsalsa208sha256_opslimit_max(void);
 SODIUM_EXPORT
 size_t crypto_pwhash_scryptsalsa208sha256_memlimit_min(void);
 
-#define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_MAX ((SIZE_MAX >= 68719476736U) ? 68719476736U : SIZE_MAX)
+#define crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_MAX \
+    SODIUM_MIN(SIZE_MAX, 68719476736ULL)
 SODIUM_EXPORT
 size_t crypto_pwhash_scryptsalsa208sha256_memlimit_max(void);
 
@@ -105,6 +107,12 @@ int crypto_pwhash_scryptsalsa208sha256_ll(const uint8_t * passwd, size_t passwdl
                                           uint8_t * buf, size_t buflen)
             __attribute__ ((warn_unused_result));
 
+SODIUM_EXPORT
+int crypto_pwhash_scryptsalsa208sha256_str_needs_rehash(const char str[crypto_pwhash_scryptsalsa208sha256_STRBYTES],
+                                                        unsigned long long opslimit,
+                                                        size_t memlimit)
+            __attribute__ ((warn_unused_result));
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -29,6 +29,10 @@ size_t  crypto_secretbox_macbytes(void);
 SODIUM_EXPORT
 const char *crypto_secretbox_primitive(void);
 
+#define crypto_secretbox_MESSAGEBYTES_MAX crypto_secretbox_xsalsa20poly1305_MESSAGEBYTES_MAX
+SODIUM_EXPORT
+size_t crypto_secretbox_messagebytes_max(void);
+
 SODIUM_EXPORT
 int crypto_secretbox_easy(unsigned char *c, const unsigned char *m,
                           unsigned long long mlen, const unsigned char *n,

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

@@ -2,6 +2,7 @@
 #define crypto_secretbox_xchacha20poly1305_H
 
 #include <stddef.h>
+#include "crypto_stream_xchacha20.h"
 #include "export.h"
 
 #ifdef __cplusplus
@@ -23,6 +24,11 @@ size_t crypto_secretbox_xchacha20poly1305_noncebytes(void);
 SODIUM_EXPORT
 size_t crypto_secretbox_xchacha20poly1305_macbytes(void);
 
+#define crypto_secretbox_xchacha20poly1305_MESSAGEBYTES_MAX \
+    (crypto_stream_xchacha20_MESSAGEBYTES_MAX - crypto_secretbox_xchacha20poly1305_MACBYTES)
+SODIUM_EXPORT
+size_t crypto_secretbox_xchacha20poly1305_messagebytes_max(void);
+
 SODIUM_EXPORT
 int crypto_secretbox_xchacha20poly1305_easy(unsigned char *c,
                                             const unsigned char *m,