rbnacl-libsodium 0.4.5 → 0.5.0

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

@@ -2,35 +2,52 @@
 #define crypto_auth_hmacsha512256_H
 
 #include <stddef.h>
+#include "crypto_auth_hmacsha512.h"
 #include "export.h"
 
-#define crypto_auth_hmacsha512256_BYTES 32U
-#define crypto_auth_hmacsha512256_KEYBYTES 32U
-
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 
+typedef struct crypto_auth_hmacsha512_state crypto_auth_hmacsha512256_state;
+
+#define crypto_auth_hmacsha512256_BYTES 32U
 SODIUM_EXPORT
 size_t crypto_auth_hmacsha512256_bytes(void);
 
+#define crypto_auth_hmacsha512256_KEYBYTES 32U
 SODIUM_EXPORT
 size_t crypto_auth_hmacsha512256_keybytes(void);
 
 SODIUM_EXPORT
-const char * crypto_auth_hmacsha512256_primitive(void);
+int crypto_auth_hmacsha512256(unsigned char *out, const unsigned char *in,
+                              unsigned long long inlen,const unsigned char *k);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *);
+int crypto_auth_hmacsha512256_verify(const unsigned char *h,
+                                     const unsigned char *in,
+                                     unsigned long long inlen,
+                                     const unsigned char *k);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha512256_verify(const unsigned char *,const unsigned char *,unsigned long long,const unsigned char *);
+int crypto_auth_hmacsha512256_init(crypto_auth_hmacsha512256_state *state,
+                                   const unsigned char *key,
+                                   size_t keylen);
+
+SODIUM_EXPORT
+int crypto_auth_hmacsha512256_update(crypto_auth_hmacsha512256_state *state,
+                                     const unsigned char *in,
+                                     unsigned long long inlen);
+
+SODIUM_EXPORT
+int crypto_auth_hmacsha512256_final(crypto_auth_hmacsha512256_state *state,
+                                    unsigned char *out);
 
 #ifdef __cplusplus
 }
 #endif
 
-#define crypto_auth_hmacsha512256_ref crypto_auth_hmacsha512256
-#define crypto_auth_hmacsha512256_ref_verify crypto_auth_hmacsha512256_verify
-
 #endif

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

@@ -14,6 +14,9 @@
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 
@@ -76,6 +79,16 @@ int crypto_box_open(unsigned char *m, const unsigned char *c,
                     unsigned long long clen, const unsigned char *n,
                     const unsigned char *pk, const 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);
+
+SODIUM_EXPORT
+int crypto_box_open_easy(unsigned char *m, const unsigned char *c,
+                         unsigned long long clen, const unsigned char *n,
+                         const unsigned char *pk, const unsigned char *sk);
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -4,69 +4,83 @@
 #include <stddef.h>
 #include "export.h"
 
-#define crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES 32U
-#define crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES 32U
-#define crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES 32U
-#define crypto_box_curve25519xsalsa20poly1305_NONCEBYTES 24U
-#define crypto_box_curve25519xsalsa20poly1305_ZEROBYTES 32U
-#define crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES 16U
-#define crypto_box_curve25519xsalsa20poly1305_MACBYTES (crypto_box_curve25519xsalsa20poly1305_ZEROBYTES - crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES)
-
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 
+#define crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES 32U
 SODIUM_EXPORT
 size_t crypto_box_curve25519xsalsa20poly1305_publickeybytes(void);
 
+#define crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES 32U
 SODIUM_EXPORT
 size_t crypto_box_curve25519xsalsa20poly1305_secretkeybytes(void);
 
+#define crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES 32U
 SODIUM_EXPORT
 size_t crypto_box_curve25519xsalsa20poly1305_beforenmbytes(void);
 
+#define crypto_box_curve25519xsalsa20poly1305_NONCEBYTES 24U
 SODIUM_EXPORT
 size_t crypto_box_curve25519xsalsa20poly1305_noncebytes(void);
 
+#define crypto_box_curve25519xsalsa20poly1305_ZEROBYTES 32U
 SODIUM_EXPORT
 size_t crypto_box_curve25519xsalsa20poly1305_zerobytes(void);
 
+#define crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES 16U
 SODIUM_EXPORT
 size_t crypto_box_curve25519xsalsa20poly1305_boxzerobytes(void);
 
+#define crypto_box_curve25519xsalsa20poly1305_MACBYTES \
+    (crypto_box_curve25519xsalsa20poly1305_ZEROBYTES - \
+     crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES)
 SODIUM_EXPORT
 size_t crypto_box_curve25519xsalsa20poly1305_macbytes(void);
 
 SODIUM_EXPORT
-const char * crypto_box_curve25519xsalsa20poly1305_primitive(void);
-
-SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *,const unsigned char *);
+int crypto_box_curve25519xsalsa20poly1305(unsigned char *c,
+                                          const unsigned char *m,
+                                          unsigned long long mlen,
+                                          const unsigned char *n,
+                                          const unsigned char *pk,
+                                          const unsigned char *sk);
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_open(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *,const unsigned char *);
+int crypto_box_curve25519xsalsa20poly1305_open(unsigned char *m,
+                                               const unsigned char *c,
+                                               unsigned long long clen,
+                                               const unsigned char *n,
+                                               const unsigned char *pk,
+                                               const unsigned char *sk);
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_keypair(unsigned char *,unsigned char *);
+int crypto_box_curve25519xsalsa20poly1305_keypair(unsigned char *pk, unsigned char *sk);
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_beforenm(unsigned char *,const unsigned char *,const unsigned char *);
+int crypto_box_curve25519xsalsa20poly1305_beforenm(unsigned char *k,
+                                                   const unsigned char *pk,
+                                                   const unsigned char *sk);
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
+int crypto_box_curve25519xsalsa20poly1305_afternm(unsigned char *c,
+                                                  const unsigned char *m,
+                                                  unsigned long long mlen,
+                                                  const unsigned char *n,
+                                                  const unsigned char *k);
 
 SODIUM_EXPORT
-int crypto_box_curve25519xsalsa20poly1305_open_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
+int crypto_box_curve25519xsalsa20poly1305_open_afternm(unsigned char *m,
+                                                       const unsigned char *c,
+                                                       unsigned long long clen,
+                                                       const unsigned char *n,
+                                                       const unsigned char *k);
 
 #ifdef __cplusplus
 }
 #endif
 
-#define crypto_box_curve25519xsalsa20poly1305_ref crypto_box_curve25519xsalsa20poly1305
-#define crypto_box_curve25519xsalsa20poly1305_ref_open crypto_box_curve25519xsalsa20poly1305_open
-#define crypto_box_curve25519xsalsa20poly1305_ref_keypair crypto_box_curve25519xsalsa20poly1305_keypair
-#define crypto_box_curve25519xsalsa20poly1305_ref_beforenm crypto_box_curve25519xsalsa20poly1305_beforenm
-#define crypto_box_curve25519xsalsa20poly1305_ref_afternm crypto_box_curve25519xsalsa20poly1305_afternm
-#define crypto_box_curve25519xsalsa20poly1305_ref_open_afternm crypto_box_curve25519xsalsa20poly1305_open_afternm
-
 #endif

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

@@ -4,37 +4,32 @@
 #include <stddef.h>
 #include "export.h"
 
-#define crypto_core_hsalsa20_OUTPUTBYTES 32U
-#define crypto_core_hsalsa20_INPUTBYTES 16U
-#define crypto_core_hsalsa20_KEYBYTES 32U
-#define crypto_core_hsalsa20_CONSTBYTES 16U
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#define crypto_core_hsalsa20_OUTPUTBYTES 32U
 SODIUM_EXPORT
 size_t crypto_core_hsalsa20_outputbytes(void);
 
+#define crypto_core_hsalsa20_INPUTBYTES 16U
 SODIUM_EXPORT
 size_t crypto_core_hsalsa20_inputbytes(void);
 
+#define crypto_core_hsalsa20_KEYBYTES 32U
 SODIUM_EXPORT
 size_t crypto_core_hsalsa20_keybytes(void);
 
+#define crypto_core_hsalsa20_CONSTBYTES 16U
 SODIUM_EXPORT
 size_t crypto_core_hsalsa20_constbytes(void);
 
 SODIUM_EXPORT
-const char * crypto_core_hsalsa20_primitive(void);
-
-SODIUM_EXPORT
-int crypto_core_hsalsa20(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *);
+int crypto_core_hsalsa20(unsigned char *out, const unsigned char *in,
+                         const unsigned char *k, const unsigned char *c);
 
 #ifdef __cplusplus
 }
 #endif
 
-#define crypto_core_hsalsa20_ref2 crypto_core_hsalsa20
-
 #endif

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

@@ -4,37 +4,32 @@
 #include <stddef.h>
 #include "export.h"
 
-#define crypto_core_salsa20_OUTPUTBYTES 64U
-#define crypto_core_salsa20_INPUTBYTES 16U
-#define crypto_core_salsa20_KEYBYTES 32U
-#define crypto_core_salsa20_CONSTBYTES 16U
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#define crypto_core_salsa20_OUTPUTBYTES 64U
 SODIUM_EXPORT
 size_t crypto_core_salsa20_outputbytes(void);
 
+#define crypto_core_salsa20_INPUTBYTES 16U
 SODIUM_EXPORT
 size_t crypto_core_salsa20_inputbytes(void);
 
+#define crypto_core_salsa20_KEYBYTES 32U
 SODIUM_EXPORT
 size_t crypto_core_salsa20_keybytes(void);
 
+#define crypto_core_salsa20_CONSTBYTES 16U
 SODIUM_EXPORT
 size_t crypto_core_salsa20_constbytes(void);
 
 SODIUM_EXPORT
-const char * crypto_core_salsa20_primitive(void);
-
-SODIUM_EXPORT
-int crypto_core_salsa20(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *);
+int crypto_core_salsa20(unsigned char *out, const unsigned char *in,
+                        const unsigned char *k, const unsigned char *c);
 
 #ifdef __cplusplus
 }
 #endif
 
-#define crypto_core_salsa20_ref crypto_core_salsa20
-
 #endif

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

@@ -4,37 +4,32 @@
 #include <stddef.h>
 #include "export.h"
 
-#define crypto_core_salsa2012_OUTPUTBYTES 64U
-#define crypto_core_salsa2012_INPUTBYTES 16U
-#define crypto_core_salsa2012_KEYBYTES 32U
-#define crypto_core_salsa2012_CONSTBYTES 16U
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#define crypto_core_salsa2012_OUTPUTBYTES 64U
 SODIUM_EXPORT
 size_t crypto_core_salsa2012_outputbytes(void);
 
+#define crypto_core_salsa2012_INPUTBYTES 16U
 SODIUM_EXPORT
 size_t crypto_core_salsa2012_inputbytes(void);
 
+#define crypto_core_salsa2012_KEYBYTES 32U
 SODIUM_EXPORT
 size_t crypto_core_salsa2012_keybytes(void);
 
+#define crypto_core_salsa2012_CONSTBYTES 16U
 SODIUM_EXPORT
 size_t crypto_core_salsa2012_constbytes(void);
 
 SODIUM_EXPORT
-const char * crypto_core_salsa2012_primitive(void);
-
-SODIUM_EXPORT
-int crypto_core_salsa2012(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *);
+int crypto_core_salsa2012(unsigned char *out, const unsigned char *in,
+                          const unsigned char *k, const unsigned char *c);
 
 #ifdef __cplusplus
 }
 #endif
 
-#define crypto_core_salsa2012_ref crypto_core_salsa2012
-
 #endif

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

@@ -4,37 +4,32 @@
 #include <stddef.h>
 #include "export.h"
 
-#define crypto_core_salsa208_OUTPUTBYTES 64U
-#define crypto_core_salsa208_INPUTBYTES 16U
-#define crypto_core_salsa208_KEYBYTES 32U
-#define crypto_core_salsa208_CONSTBYTES 16U
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#define crypto_core_salsa208_OUTPUTBYTES 64U
 SODIUM_EXPORT
 size_t crypto_core_salsa208_outputbytes(void);
 
+#define crypto_core_salsa208_INPUTBYTES 16U
 SODIUM_EXPORT
 size_t crypto_core_salsa208_inputbytes(void);
 
+#define crypto_core_salsa208_KEYBYTES 32U
 SODIUM_EXPORT
 size_t crypto_core_salsa208_keybytes(void);
 
+#define crypto_core_salsa208_CONSTBYTES 16U
 SODIUM_EXPORT
 size_t crypto_core_salsa208_constbytes(void);
 
 SODIUM_EXPORT
-const char * crypto_core_salsa208_primitive(void);
-
-SODIUM_EXPORT
-int crypto_core_salsa208(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *);
+int crypto_core_salsa208(unsigned char *out, const unsigned char *in,
+                         const unsigned char *k, const unsigned char *c);
 
 #ifdef __cplusplus
 }
 #endif
 
-#define crypto_core_salsa208_ref crypto_core_salsa208
-
 #endif

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

@@ -7,13 +7,12 @@
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 
-#define crypto_generichash_BYTES crypto_generichash_blake2b_BYTES
-SODIUM_EXPORT
-size_t  crypto_generichash_bytes(void);
-
 #define crypto_generichash_BYTES_MIN crypto_generichash_blake2b_BYTES_MIN
 SODIUM_EXPORT
 size_t  crypto_generichash_bytes_min(void);
@@ -22,9 +21,9 @@ size_t  crypto_generichash_bytes_min(void);
 SODIUM_EXPORT
 size_t  crypto_generichash_bytes_max(void);
 
-#define crypto_generichash_KEYBYTES crypto_generichash_blake2b_KEYBYTES
+#define crypto_generichash_BYTES crypto_generichash_blake2b_BYTES
 SODIUM_EXPORT
-size_t  crypto_generichash_keybytes(void);
+size_t  crypto_generichash_bytes(void);
 
 #define crypto_generichash_KEYBYTES_MIN crypto_generichash_blake2b_KEYBYTES_MIN
 SODIUM_EXPORT
@@ -34,9 +33,9 @@ size_t  crypto_generichash_keybytes_min(void);
 SODIUM_EXPORT
 size_t  crypto_generichash_keybytes_max(void);
 
-#define crypto_generichash_BLOCKBYTES crypto_generichash_blake2b_BLOCKBYTES
+#define crypto_generichash_KEYBYTES crypto_generichash_blake2b_KEYBYTES
 SODIUM_EXPORT
-size_t  crypto_generichash_blockbytes(void);
+size_t  crypto_generichash_keybytes(void);
 
 #define crypto_generichash_PRIMITIVE "blake2b"
 SODIUM_EXPORT

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

@@ -7,14 +7,6 @@
 
 #include "export.h"
 
-#define crypto_generichash_blake2b_BYTES         32U
-#define crypto_generichash_blake2b_BYTES_MIN     16U
-#define crypto_generichash_blake2b_BYTES_MAX     64U
-#define crypto_generichash_blake2b_KEYBYTES      32U
-#define crypto_generichash_blake2b_KEYBYTES_MIN  16U
-#define crypto_generichash_blake2b_KEYBYTES_MAX  64U
-#define crypto_generichash_blake2b_BLOCKBYTES   128U
-
 #if defined(_MSC_VER)
 # define CRYPTO_ALIGN(x) __declspec(align(x))
 #else
@@ -22,6 +14,9 @@
 #endif
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 
@@ -30,29 +25,43 @@ CRYPTO_ALIGN(64) typedef struct crypto_generichash_blake2b_state {
     uint64_t h[8];
     uint64_t t[2];
     uint64_t f[2];
-    uint8_t  buf[2 * crypto_generichash_blake2b_BLOCKBYTES];
+    uint8_t  buf[2 * 128];
     size_t   buflen;
     uint8_t  last_node;
 } crypto_generichash_blake2b_state;
 #pragma pack(pop)
 
+#define crypto_generichash_blake2b_BYTES_MIN     16U
 SODIUM_EXPORT
 size_t crypto_generichash_blake2b_bytes_min(void);
 
+#define crypto_generichash_blake2b_BYTES_MAX     64U
 SODIUM_EXPORT
 size_t crypto_generichash_blake2b_bytes_max(void);
 
+#define crypto_generichash_blake2b_BYTES         32U
+SODIUM_EXPORT
+size_t crypto_generichash_blake2b_bytes(void);
+
+#define crypto_generichash_blake2b_KEYBYTES_MIN  16U
 SODIUM_EXPORT
 size_t crypto_generichash_blake2b_keybytes_min(void);
 
+#define crypto_generichash_blake2b_KEYBYTES_MAX  64U
 SODIUM_EXPORT
 size_t crypto_generichash_blake2b_keybytes_max(void);
 
+#define crypto_generichash_blake2b_KEYBYTES      32U
+SODIUM_EXPORT
+size_t crypto_generichash_blake2b_keybytes(void);
+
+#define crypto_generichash_blake2b_SALTBYTES     16U
 SODIUM_EXPORT
-size_t crypto_generichash_blake2b_blockbytes(void);
+size_t crypto_generichash_blake2b_saltbytes(void);
 
+#define crypto_generichash_blake2b_PERSONALBYTES 16U
 SODIUM_EXPORT
-const char * crypto_generichash_blake2b_blockbytes_primitive(void);
+size_t crypto_generichash_blake2b_personalbytes(void);
 
 SODIUM_EXPORT
 int crypto_generichash_blake2b(unsigned char *out, size_t outlen,
@@ -60,11 +69,27 @@ int crypto_generichash_blake2b(unsigned char *out, size_t outlen,
                                unsigned long long inlen,
                                const unsigned char *key, size_t keylen);
 
+SODIUM_EXPORT
+int crypto_generichash_blake2b_salt_personal(unsigned char *out, size_t outlen,
+                                             const unsigned char *in,
+                                             unsigned long long inlen,
+                                             const unsigned char *key,
+                                             size_t keylen,
+                                             const unsigned char *salt,
+                                             const unsigned char *personal);
+
 SODIUM_EXPORT
 int crypto_generichash_blake2b_init(crypto_generichash_blake2b_state *state,
                                     const unsigned char *key,
                                     const size_t keylen, const size_t outlen);
 
+SODIUM_EXPORT
+int crypto_generichash_blake2b_init_salt_personal(crypto_generichash_blake2b_state *state,
+                                                  const unsigned char *key,
+                                                  const size_t keylen, const size_t outlen,
+                                                  const unsigned char *salt,
+                                                  const unsigned char *personal);
+
 SODIUM_EXPORT
 int crypto_generichash_blake2b_update(crypto_generichash_blake2b_state *state,
                                       const unsigned char *in,
@@ -79,9 +104,4 @@ int crypto_generichash_blake2b_final(crypto_generichash_blake2b_state *state,
 }
 #endif
 
-#define crypto_generichash_blake2b_ref crypto_generichash_blake2b
-#define crypto_generichash_blake2b_ref_init crypto_generichash_blake2b_init
-#define crypto_generichash_blake2b_ref_update crypto_generichash_blake2b_update
-#define crypto_generichash_blake2b_ref_final crypto_generichash_blake2b_final
-
 #endif