rbnacl-libsodium 0.4.5 → 0.5.0

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

@@ -4,41 +4,45 @@
 #include <stddef.h>
 #include "export.h"
 
-#define crypto_sign_edwards25519sha512batch_SECRETKEYBYTES 64U
-#define crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES 32U
-#define crypto_sign_edwards25519sha512batch_BYTES 64U
-
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 
+#define crypto_sign_edwards25519sha512batch_BYTES 64U
 SODIUM_EXPORT
 size_t crypto_sign_edwards25519sha512batch_bytes(void);
 
+#define crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES 32U
 SODIUM_EXPORT
 size_t crypto_sign_edwards25519sha512batch_publickeybytes(void);
 
+#define crypto_sign_edwards25519sha512batch_SECRETKEYBYTES (32U + 32U)
 SODIUM_EXPORT
 size_t crypto_sign_edwards25519sha512batch_secretkeybytes(void);
 
 SODIUM_EXPORT
-const char * crypto_sign_edwards25519sha512batch_primitive(void);
-
-SODIUM_EXPORT
-int crypto_sign_edwards25519sha512batch(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *);
+int crypto_sign_edwards25519sha512batch(unsigned char *sm,
+                                        unsigned long long *smlen,
+                                        const unsigned char *m,
+                                        unsigned long long mlen,
+                                        const unsigned char *sk);
 
 SODIUM_EXPORT
-int crypto_sign_edwards25519sha512batch_open(unsigned char *,unsigned long long *,const unsigned char *,unsigned long long,const unsigned char *);
+int crypto_sign_edwards25519sha512batch_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_edwards25519sha512batch_keypair(unsigned char *,unsigned char *);
+int crypto_sign_edwards25519sha512batch_keypair(unsigned char *pk,
+                                                unsigned char *sk);
 
 #ifdef __cplusplus
 }
 #endif
 
-#define crypto_sign_edwards25519sha512batch_ref crypto_sign_edwards25519sha512batch
-#define crypto_sign_edwards25519sha512batch_ref_open crypto_sign_edwards25519sha512batch_open
-#define crypto_sign_edwards25519sha512batch_ref_keypair crypto_sign_edwards25519sha512batch_keypair
-
 #endif

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

@@ -15,6 +15,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_stream_aes128ctr.h

@@ -12,49 +12,49 @@
 #include <stddef.h>
 #include "export.h"
 
-#define crypto_stream_aes128ctr_KEYBYTES 16U
-#define crypto_stream_aes128ctr_NONCEBYTES 16U
-#define crypto_stream_aes128ctr_BEFORENMBYTES 1408U
-
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 
+#define crypto_stream_aes128ctr_KEYBYTES 16U
 SODIUM_EXPORT
 size_t crypto_stream_aes128ctr_keybytes(void);
 
+#define crypto_stream_aes128ctr_NONCEBYTES 16U
 SODIUM_EXPORT
 size_t crypto_stream_aes128ctr_noncebytes(void);
 
+#define crypto_stream_aes128ctr_BEFORENMBYTES 1408U
 SODIUM_EXPORT
 size_t crypto_stream_aes128ctr_beforenmbytes(void);
 
 SODIUM_EXPORT
-const char * crypto_stream_aes128ctr_primitive(void);
+int crypto_stream_aes128ctr(unsigned char *out, unsigned long long outlen,
+                            const unsigned char *n, const unsigned char *k);
 
 SODIUM_EXPORT
-int crypto_stream_aes128ctr(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
+int crypto_stream_aes128ctr_xor(unsigned char *out, const unsigned char *in,
+                                unsigned long long inlen, const unsigned char *n,
+                                const unsigned char *k);
 
 SODIUM_EXPORT
-int crypto_stream_aes128ctr_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
+int crypto_stream_aes128ctr_beforenm(unsigned char *c, const unsigned char *k);
 
 SODIUM_EXPORT
-int crypto_stream_aes128ctr_beforenm(unsigned char *,const unsigned char *);
+int crypto_stream_aes128ctr_afternm(unsigned char *out, unsigned long long len,
+                                    const unsigned char *nonce, const unsigned char *c);
 
 SODIUM_EXPORT
-int crypto_stream_aes128ctr_afternm(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
-
-SODIUM_EXPORT
-int crypto_stream_aes128ctr_xor_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
+int crypto_stream_aes128ctr_xor_afternm(unsigned char *out, const unsigned char *in,
+                                        unsigned long long len,
+                                        const unsigned char *nonce,
+                                        const unsigned char *c);
 
 #ifdef __cplusplus
 }
 #endif
 
-#define crypto_stream_aes128ctr_portable crypto_stream_aes128ctr
-#define crypto_stream_aes128ctr_portable_xor crypto_stream_aes128ctr_xor
-#define crypto_stream_aes128ctr_portable_beforenm crypto_stream_aes128ctr_beforenm
-#define crypto_stream_aes128ctr_portable_afternm crypto_stream_aes128ctr_afternm
-#define crypto_stream_aes128ctr_portable_xor_afternm crypto_stream_aes128ctr_xor_afternm
-
 #endif

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

@@ -13,49 +13,50 @@
 #include <stddef.h>
 #include "export.h"
 
-#define crypto_stream_aes256estream_KEYBYTES 32U
-#define crypto_stream_aes256estream_NONCEBYTES 16U
-#define crypto_stream_aes256estream_BEFORENMBYTES 276U
-
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 
+#define crypto_stream_aes256estream_KEYBYTES 32U
 SODIUM_EXPORT
 size_t crypto_stream_aes256estream_keybytes(void);
 
+#define crypto_stream_aes256estream_NONCEBYTES 16U
 SODIUM_EXPORT
 size_t crypto_stream_aes256estream_noncebytes(void);
 
+#define crypto_stream_aes256estream_BEFORENMBYTES 276U
 SODIUM_EXPORT
 size_t crypto_stream_aes256estream_beforenmbytes(void);
 
 SODIUM_EXPORT
-const char * crypto_stream_aes256estream_primitive(void);
+int crypto_stream_aes256estream(unsigned char *out, unsigned long long len,
+                                const unsigned char *nonce, const unsigned char *c);
 
 SODIUM_EXPORT
-int crypto_stream_aes256estream(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
+int crypto_stream_aes256estream_xor(unsigned char *out, const unsigned char *in,
+                                    unsigned long long inlen, const unsigned char *n,
+                                    const unsigned char *k);
 
 SODIUM_EXPORT
-int crypto_stream_aes256estream_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
+int crypto_stream_aes256estream_beforenm(unsigned char *c, const unsigned char *k);
 
 SODIUM_EXPORT
-int crypto_stream_aes256estream_beforenm(unsigned char *,const unsigned char *);
+int crypto_stream_aes256estream_afternm(unsigned char *out, unsigned long long len,
+                                        const unsigned char *nonce,
+                                        const unsigned char *c);
 
 SODIUM_EXPORT
-int crypto_stream_aes256estream_afternm(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
-
-SODIUM_EXPORT
-int crypto_stream_aes256estream_xor_afternm(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
+int crypto_stream_aes256estream_xor_afternm(unsigned char *out, const unsigned char *in,
+                                            unsigned long long len,
+                                            const unsigned char *nonce,
+                                            const unsigned char *c);
 
 #ifdef __cplusplus
 }
 #endif
 
-#define crypto_stream_aes256estream_hongjun crypto_stream_aes256estream
-#define crypto_stream_aes256estream_hongjun_xor crypto_stream_aes256estream_xor
-#define crypto_stream_aes256estream_hongjun_beforenm crypto_stream_aes256estream_beforenm
-#define crypto_stream_aes256estream_hongjun_afternm crypto_stream_aes256estream_afternm
-#define crypto_stream_aes256estream_hongjun_xor_afternm crypto_stream_aes256estream_xor_afternm
-
 #endif

data/vendor/libsodium/src/libsodium/include/sodium/{crypto_stream_salsa20.h.in → crypto_stream_salsa20.h}

@@ -9,16 +9,13 @@
  *  the crypto_box functions.
  */
 
-#if @HAVE_AMD64_ASM_V@
-# ifndef SODIUM_HAVE_AMD64_ASM
-#  define SODIUM_HAVE_AMD64_ASM
-# endif
-#endif
-
 #include <stddef.h>
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 
@@ -31,21 +28,13 @@ SODIUM_EXPORT
 size_t crypto_stream_salsa20_noncebytes(void);
 
 SODIUM_EXPORT
-const char * crypto_stream_salsa20_primitive(void);
+int crypto_stream_salsa20(unsigned char *c, unsigned long long clen,
+                          const unsigned char *n, const unsigned char *k);
 
 SODIUM_EXPORT
-int crypto_stream_salsa20(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
-
-SODIUM_EXPORT
-int crypto_stream_salsa20_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
-
-#ifdef SODIUM_HAVE_AMD64_ASM
-# define crypto_stream_salsa20_amd64_xmm6 crypto_stream_salsa20
-# define crypto_stream_salsa20_amd64_xmm6_xor crypto_stream_salsa20_xor
-#else
-# define crypto_stream_salsa20_ref crypto_stream_salsa20
-# define crypto_stream_salsa20_ref_xor crypto_stream_salsa20_xor
-#endif
+int crypto_stream_salsa20_xor(unsigned char *c, const unsigned char *m,
+                              unsigned long long mlen, const unsigned char *n,
+                              const unsigned char *k);
 
 #ifdef __cplusplus
 }

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

@@ -13,6 +13,9 @@
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 
@@ -25,19 +28,16 @@ SODIUM_EXPORT
 size_t crypto_stream_salsa2012_noncebytes(void);
 
 SODIUM_EXPORT
-const char * crypto_stream_salsa2012_primitive(void);
+int crypto_stream_salsa2012(unsigned char *c, unsigned long long clen,
+                            const unsigned char *n, const unsigned char *k);
 
 SODIUM_EXPORT
-int crypto_stream_salsa2012(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
-
-SODIUM_EXPORT
-int crypto_stream_salsa2012_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
+int crypto_stream_salsa2012_xor(unsigned char *c, const unsigned char *m,
+                                unsigned long long mlen, const unsigned char *n,
+                                const unsigned char *k);
 
 #ifdef __cplusplus
 }
 #endif
 
-#define crypto_stream_salsa2012_ref crypto_stream_salsa2012
-#define crypto_stream_salsa2012_ref_xor crypto_stream_salsa2012_xor
-
 #endif

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

@@ -13,6 +13,9 @@
 #include "export.h"
 
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 
@@ -25,19 +28,16 @@ SODIUM_EXPORT
 size_t crypto_stream_salsa208_noncebytes(void);
 
 SODIUM_EXPORT
-const char * crypto_stream_salsa208_primitive(void);
+int crypto_stream_salsa208(unsigned char *c, unsigned long long clen,
+                           const unsigned char *n, const unsigned char *k);
 
 SODIUM_EXPORT
-int crypto_stream_salsa208(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
-
-SODIUM_EXPORT
-int crypto_stream_salsa208_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
+int crypto_stream_salsa208_xor(unsigned char *c, const unsigned char *m,
+                               unsigned long long mlen, const unsigned char *n,
+                               const unsigned char *k);
 
 #ifdef __cplusplus
 }
 #endif
 
-#define crypto_stream_salsa208_ref crypto_stream_salsa208
-#define crypto_stream_salsa208_ref_xor crypto_stream_salsa208_xor
-
 #endif

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

@@ -12,33 +12,32 @@
 #include <stddef.h>
 #include "export.h"
 
-#define crypto_stream_xsalsa20_KEYBYTES 32U
-#define crypto_stream_xsalsa20_NONCEBYTES 24U
-
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 
+#define crypto_stream_xsalsa20_KEYBYTES 32U
 SODIUM_EXPORT
 size_t crypto_stream_xsalsa20_keybytes(void);
 
+#define crypto_stream_xsalsa20_NONCEBYTES 24U
 SODIUM_EXPORT
 size_t crypto_stream_xsalsa20_noncebytes(void);
 
 SODIUM_EXPORT
-const char * crypto_stream_xsalsa20_primitive(void);
-
-SODIUM_EXPORT
-int crypto_stream_xsalsa20(unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
+int crypto_stream_xsalsa20(unsigned char *c, unsigned long long clen,
+                           const unsigned char *n, const unsigned char *k);
 
 SODIUM_EXPORT
-int crypto_stream_xsalsa20_xor(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *,const unsigned char *);
+int crypto_stream_xsalsa20_xor(unsigned char *c, const unsigned char *m,
+                               unsigned long long mlen, const unsigned char *n,
+                               const unsigned char *k);
 
 #ifdef __cplusplus
 }
 #endif
 
-#define crypto_stream_xsalsa20_ref crypto_stream_xsalsa20
-#define crypto_stream_xsalsa20_ref_xor crypto_stream_xsalsa20_xor
-
 #endif

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

@@ -4,20 +4,17 @@
 #include <stddef.h>
 #include "export.h"
 
-#define crypto_verify_16_BYTES 16U
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#define crypto_verify_16_BYTES 16U
 SODIUM_EXPORT
 size_t crypto_verify_16_bytes(void);
 
 SODIUM_EXPORT
 int crypto_verify_16(const unsigned char *x, const unsigned char *y);
 
-#define crypto_verify_16_ref crypto_verify_16
-
 #ifdef __cplusplus
 }
 #endif

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

@@ -4,20 +4,17 @@
 #include <stddef.h>
 #include "export.h"
 
-#define crypto_verify_32_BYTES 32U
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#define crypto_verify_32_BYTES 32U
 SODIUM_EXPORT
 size_t crypto_verify_32_bytes(void);
 
 SODIUM_EXPORT
 int crypto_verify_32(const unsigned char *x, const unsigned char *y);
 
-#define crypto_verify_32_ref crypto_verify_32
-
 #ifdef __cplusplus
 }
 #endif

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

@@ -0,0 +1,22 @@
+#ifndef crypto_verify_64_H
+#define crypto_verify_64_H
+
+#include <stddef.h>
+#include "export.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define crypto_verify_64_BYTES 64U
+SODIUM_EXPORT
+size_t crypto_verify_64_bytes(void);
+
+SODIUM_EXPORT
+int crypto_verify_64(const unsigned char *x, const unsigned char *y);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

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

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