rbnacl-libsodium 0.4.5 → 0.5.0

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

@@ -1,21 +1,30 @@
 #ifndef crypto_hash_H
 #define crypto_hash_H
 
+#include <stddef.h>
+
 #include "crypto_hash_sha512.h"
 #include "export.h"
 
-#define crypto_hash_BYTES crypto_hash_sha512_BYTES
-#define crypto_hash_BLOCKBYTES crypto_hash_sha512_BLOCKBYTES
-#define crypto_hash_PRIMITIVE "sha512"
-
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 
+#define crypto_hash_BYTES crypto_hash_sha512_BYTES
+SODIUM_EXPORT
+size_t crypto_hash_bytes(void);
+
 SODIUM_EXPORT
 int crypto_hash(unsigned char *out, const unsigned char *in,
                 unsigned long long inlen);
 
+#define crypto_hash_PRIMITIVE "sha512"
+SODIUM_EXPORT
+const char *crypto_hash_primitive(void);
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -2,28 +2,46 @@
 #define crypto_hash_sha256_H
 
 #include <stddef.h>
-#include "export.h"
+#include <stdint.h>
+#include <stdlib.h>
 
-#define crypto_hash_sha256_BYTES 32U
-#define crypto_hash_sha256_BLOCKBYTES 64U
+#include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 
+typedef struct crypto_hash_sha256_state {
+    uint32_t      state[8];
+    uint32_t      count[2];
+    unsigned char buf[64];
+} crypto_hash_sha256_state;
+
+#define crypto_hash_sha256_BYTES 32U
 SODIUM_EXPORT
 size_t crypto_hash_sha256_bytes(void);
 
 SODIUM_EXPORT
-const char * crypto_hash_sha256_primitive(void);
+int crypto_hash_sha256(unsigned char *out, const unsigned char *in,
+                       unsigned long long inlen);
 
 SODIUM_EXPORT
-int crypto_hash_sha256(unsigned char *,const unsigned char *,unsigned long long);
+int crypto_hash_sha256_init(crypto_hash_sha256_state *state);
+
+SODIUM_EXPORT
+int crypto_hash_sha256_update(crypto_hash_sha256_state *state,
+                              const unsigned char *in,
+                              unsigned long long inlen);
+
+SODIUM_EXPORT
+int crypto_hash_sha256_final(crypto_hash_sha256_state *state,
+                             unsigned char *out);
 
 #ifdef __cplusplus
 }
 #endif
 
-#define crypto_hash_sha256_ref crypto_hash_sha256
-
 #endif

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

@@ -2,28 +2,46 @@
 #define crypto_hash_sha512_H
 
 #include <stddef.h>
-#include "export.h"
+#include <stdint.h>
+#include <stdlib.h>
 
-#define crypto_hash_sha512_BYTES 64U
-#define crypto_hash_sha512_BLOCKBYTES 128U
+#include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 
+typedef struct crypto_hash_sha512_state {
+    uint64_t      state[8];
+    uint64_t      count[2];
+    unsigned char buf[128];
+} crypto_hash_sha512_state;
+
+#define crypto_hash_sha512_BYTES 64U
 SODIUM_EXPORT
 size_t crypto_hash_sha512_bytes(void);
 
 SODIUM_EXPORT
-const char * crypto_hash_sha512_primitive(void);
+int crypto_hash_sha512(unsigned char *out, const unsigned char *in,
+                       unsigned long long inlen);
 
 SODIUM_EXPORT
-int crypto_hash_sha512(unsigned char *,const unsigned char *,unsigned long long);
+int crypto_hash_sha512_init(crypto_hash_sha512_state *state);
+
+SODIUM_EXPORT
+int crypto_hash_sha512_update(crypto_hash_sha512_state *state,
+                              const unsigned char *in,
+                              unsigned long long inlen);
+
+SODIUM_EXPORT
+int crypto_hash_sha512_final(crypto_hash_sha512_state *state,
+                             unsigned char *out);
 
 #ifdef __cplusplus
 }
 #endif
 
-#define crypto_hash_sha512_ref crypto_hash_sha512
-
 #endif

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

@@ -7,6 +7,9 @@
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

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

@@ -4,9 +4,10 @@
 #include <stddef.h>
 #include "export.h"
 
-#define crypto_onetimeauth_poly1305_BYTES 16U
-#define crypto_onetimeauth_poly1305_KEYBYTES 32U
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 
@@ -27,15 +28,14 @@ typedef struct crypto_onetimeauth_poly1305_implementation {
                                       const unsigned char *k);
 } crypto_onetimeauth_poly1305_implementation;
 
+#define crypto_onetimeauth_poly1305_BYTES 16U
 SODIUM_EXPORT
 size_t crypto_onetimeauth_poly1305_bytes(void);
 
+#define crypto_onetimeauth_poly1305_KEYBYTES 32U
 SODIUM_EXPORT
 size_t crypto_onetimeauth_poly1305_keybytes(void);
 
-SODIUM_EXPORT
-const char * crypto_onetimeauth_poly1305_primitive(void);
-
 SODIUM_EXPORT
 const char *crypto_onetimeauth_poly1305_implementation_name(void);
 

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

@@ -5,6 +5,9 @@
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

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

@@ -0,0 +1,48 @@
+#ifndef crypto_pwhash_scryptxsalsa208sha256_H
+#define crypto_pwhash_scryptxsalsa208sha256_H
+
+#include <stddef.h>
+
+#include "export.h"
+
+#ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
+extern "C" {
+#endif
+
+#define crypto_pwhash_scryptxsalsa208sha256_SALTBYTES 32
+SODIUM_EXPORT
+size_t crypto_pwhash_scryptxsalsa208sha256_saltbytes(void);
+
+#define crypto_pwhash_scryptxsalsa208sha256_STRBYTES 102
+SODIUM_EXPORT
+size_t crypto_pwhash_scryptxsalsa208sha256_strbytes(void);
+
+SODIUM_EXPORT
+int crypto_pwhash_scryptxsalsa208sha256(unsigned char * const out,
+                                        unsigned long long outlen,
+                                        const char * const passwd,
+                                        unsigned long long passwdlen,
+                                        const unsigned char * const salt,
+                                        unsigned long long opslimit,
+                                        size_t memlimit);
+
+SODIUM_EXPORT
+int crypto_pwhash_scryptxsalsa208sha256_str(char out[crypto_pwhash_scryptxsalsa208sha256_STRBYTES],
+                                            const char * const passwd,
+                                            unsigned long long passwdlen,
+                                            unsigned long long opslimit,
+                                            size_t memlimit);
+
+SODIUM_EXPORT
+int crypto_pwhash_scryptxsalsa208sha256_str_verify(const char str[crypto_pwhash_scryptxsalsa208sha256_STRBYTES],
+                                                   const char * const passwd,
+                                                   unsigned long long passwdlen);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

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

@@ -0,0 +1,31 @@
+#ifndef crypto_scalarmult_curve25519_H
+#define crypto_scalarmult_curve25519_H
+
+#include <stddef.h>
+
+#include "export.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define crypto_scalarmult_curve25519_BYTES 32
+SODIUM_EXPORT
+size_t crypto_scalarmult_curve25519_bytes(void);
+
+#define crypto_scalarmult_curve25519_SCALARBYTES 32
+SODIUM_EXPORT
+size_t crypto_scalarmult_curve25519_scalarbytes(void);
+
+SODIUM_EXPORT
+int crypto_scalarmult_curve25519(unsigned char *q, const unsigned char *n,
+                                 const unsigned char *p);
+
+SODIUM_EXPORT
+int crypto_scalarmult_curve25519_base(unsigned char *q, const unsigned char *n);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

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

@@ -7,6 +7,9 @@
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 
@@ -26,6 +29,10 @@ size_t  crypto_secretbox_zerobytes(void);
 SODIUM_EXPORT
 size_t  crypto_secretbox_boxzerobytes(void);
 
+#define crypto_secretbox_MACBYTES crypto_secretbox_xsalsa20poly1305_MACBYTES
+SODIUM_EXPORT
+size_t  crypto_secretbox_macbytes(void);
+
 #define crypto_secretbox_PRIMITIVE "xsalsa20poly1305"
 SODIUM_EXPORT
 const char *crypto_secretbox_primitive(void);
@@ -40,6 +47,16 @@ int crypto_secretbox_open(unsigned char *m, const unsigned char *c,
                           unsigned long long clen, const unsigned char *n,
                           const unsigned char *k);
 
+SODIUM_EXPORT
+int crypto_secretbox_easy(unsigned char *c, const unsigned char *m,
+                          unsigned long long mlen, const unsigned char *n,
+                          const unsigned char *k);
+
+SODIUM_EXPORT
+int crypto_secretbox_open_easy(unsigned char *m, const unsigned char *c,
+                               unsigned long long clen, const unsigned char *n,
+                               const unsigned char *k);
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -4,41 +4,51 @@
 #include <stddef.h>
 #include "export.h"
 
-#define crypto_secretbox_xsalsa20poly1305_KEYBYTES 32U
-#define crypto_secretbox_xsalsa20poly1305_NONCEBYTES 24U
-#define crypto_secretbox_xsalsa20poly1305_ZEROBYTES 32U
-#define crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES 16U
-
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 
+#define crypto_secretbox_xsalsa20poly1305_KEYBYTES 32U
 SODIUM_EXPORT
 size_t crypto_secretbox_xsalsa20poly1305_keybytes(void);
 
+#define crypto_secretbox_xsalsa20poly1305_NONCEBYTES 24U
 SODIUM_EXPORT
 size_t crypto_secretbox_xsalsa20poly1305_noncebytes(void);
 
+#define crypto_secretbox_xsalsa20poly1305_ZEROBYTES 32U
 SODIUM_EXPORT
 size_t crypto_secretbox_xsalsa20poly1305_zerobytes(void);
 
+#define crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES 16U
 SODIUM_EXPORT
 size_t crypto_secretbox_xsalsa20poly1305_boxzerobytes(void);
 
+#define crypto_secretbox_xsalsa20poly1305_MACBYTES \
+    (crypto_secretbox_xsalsa20poly1305_ZEROBYTES - \
+     crypto_secretbox_xsalsa20poly1305_BOXZEROBYTES)
 SODIUM_EXPORT
-const char * crypto_secretbox_xsalsa20poly1305_primitive(void);
+size_t crypto_secretbox_xsalsa20poly1305_macbytes(void);
 
 SODIUM_EXPORT
-int crypto_secretbox_xsalsa20poly1305(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
+int crypto_secretbox_xsalsa20poly1305(unsigned char *c,
+                                      const unsigned char *m,
+                                      unsigned long long mlen,
+                                      const unsigned char *n,
+                                      const unsigned char *k);
 
 SODIUM_EXPORT
-int crypto_secretbox_xsalsa20poly1305_open(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
+int crypto_secretbox_xsalsa20poly1305_open(unsigned char *m,
+                                           const unsigned char *c,
+                                           unsigned long long clen,
+                                           const unsigned char *n,
+                                           const unsigned char *k);
 
 #ifdef __cplusplus
 }
 #endif
 
-#define crypto_secretbox_xsalsa20poly1305_ref crypto_secretbox_xsalsa20poly1305
-#define crypto_secretbox_xsalsa20poly1305_ref_open crypto_secretbox_xsalsa20poly1305_open
-
 #endif

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

@@ -7,6 +7,9 @@
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

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

@@ -4,26 +4,27 @@
 #include <stddef.h>
 #include "export.h"
 
-#define crypto_shorthash_siphash24_BYTES 8U
-#define crypto_shorthash_siphash24_KEYBYTES 16U
-
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 
+#define crypto_shorthash_siphash24_BYTES 8U
 SODIUM_EXPORT
 size_t crypto_shorthash_siphash24_bytes(void);
 
+#define crypto_shorthash_siphash24_KEYBYTES 16U
 SODIUM_EXPORT
-const char * crypto_shorthash_siphash24_primitive(void);
+size_t crypto_shorthash_siphash24_keybytes(void);
 
 SODIUM_EXPORT
-int crypto_shorthash_siphash24(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *);
+int crypto_shorthash_siphash24(unsigned char *out, const unsigned char *in,
+                               unsigned long long inlen, const unsigned char *k);
 
 #ifdef __cplusplus
 }
 #endif
 
-#define crypto_shorthash_siphash24_ref crypto_shorthash_siphash24
-
 #endif

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

@@ -14,6 +14,9 @@
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 

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

@@ -4,49 +4,48 @@
 #include <stddef.h>
 #include "export.h"
 
-#define crypto_sign_ed25519_SECRETKEYBYTES 64U
-#define crypto_sign_ed25519_PUBLICKEYBYTES 32U
-#define crypto_sign_ed25519_SEEDBYTES 32U
-#define crypto_sign_ed25519_BYTES 64U
-
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 
+#define crypto_sign_ed25519_BYTES 64U
 SODIUM_EXPORT
 size_t crypto_sign_ed25519_bytes(void);
 
+#define crypto_sign_ed25519_SEEDBYTES 32U
 SODIUM_EXPORT
 size_t crypto_sign_ed25519_seedbytes(void);
 
+#define crypto_sign_ed25519_PUBLICKEYBYTES 32U
 SODIUM_EXPORT
 size_t crypto_sign_ed25519_publickeybytes(void);
 
+#define crypto_sign_ed25519_SECRETKEYBYTES (32U + 32U)
 SODIUM_EXPORT
 size_t crypto_sign_ed25519_secretkeybytes(void);
 
 SODIUM_EXPORT
-const char * crypto_sign_ed25519_primitive(void);
+int crypto_sign_ed25519(unsigned char *sm, unsigned long long *smlen,
+                        const unsigned char *m, unsigned long long mlen,
+                        const unsigned char *sk);
 
 SODIUM_EXPORT
-int crypto_sign_ed25519(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *);
+int crypto_sign_ed25519_open(unsigned char *m, unsigned long long *mlen,
+                             const unsigned char *sm, unsigned long long smlen,
+                             const unsigned char *pk);
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_open(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *);
+int crypto_sign_ed25519_keypair(unsigned char *pk, unsigned char *sk);
 
 SODIUM_EXPORT
-int crypto_sign_ed25519_keypair(unsigned char *,unsigned char *);
-
-SODIUM_EXPORT
-int crypto_sign_ed25519_seed_keypair(unsigned char *,unsigned char *,const unsigned char *);
+int crypto_sign_ed25519_seed_keypair(unsigned char *pk, unsigned char *sk,
+                                     const unsigned char *seed);
 
 #ifdef __cplusplus
 }
 #endif
 
-#define crypto_sign_ed25519_ref10 crypto_sign_ed25519
-#define crypto_sign_ed25519_ref10_open crypto_sign_ed25519_open
-#define crypto_sign_ed25519_ref10_keypair crypto_sign_ed25519_keypair
-#define crypto_sign_ed25519_ref10_seed_keypair crypto_sign_ed25519_seed_keypair
-
 #endif