rbnacl-libsodium 1.0.8 → 1.0.9

data/vendor/libsodium/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.h

@@ -2,6 +2,7 @@
 #include <stdint.h>
 
 #include "crypto_stream_chacha20.h"
+#include "../stream_chacha20.h"
 
 extern struct crypto_stream_chacha20_implementation
     crypto_stream_chacha20_ref_implementation;

data/vendor/libsodium/src/libsodium/crypto_stream/chacha20/vec/stream_chacha20_vec.h

@@ -2,6 +2,7 @@
 #include <stdint.h>
 
 #include "crypto_stream_chacha20.h"
+#include "../stream_chacha20.h"
 
 extern struct crypto_stream_chacha20_implementation
     crypto_stream_chacha20_vec_implementation;

data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/ref/stream_salsa20_ref.c

@@ -10,12 +10,6 @@ Public domain.
 
 #ifndef HAVE_AMD64_ASM
 
-typedef unsigned int uint32;
-
-static const unsigned char sigma[16] = {
-    'e', 'x', 'p', 'a', 'n', 'd', ' ', '3', '2', '-', 'b', 'y', 't', 'e', ' ', 'k'
-};
-
 int crypto_stream_salsa20(
         unsigned char *c,unsigned long long clen,
   const unsigned char *n,
@@ -35,7 +29,7 @@ int crypto_stream_salsa20(
   for (i = 8;i < 16;++i) in[i] = 0;
 
   while (clen >= 64) {
-    crypto_core_salsa20(c,in,kcopy,sigma);
+    crypto_core_salsa20(c,in,kcopy,NULL);
 
     u = 1;
     for (i = 8;i < 16;++i) {
@@ -49,7 +43,7 @@ int crypto_stream_salsa20(
   }
 
   if (clen) {
-    crypto_core_salsa20(block,in,kcopy,sigma);
+    crypto_core_salsa20(block,in,kcopy,NULL);
     for (i = 0;i < (unsigned int) clen;++i) c[i] = block[i];
   }
   sodium_memzero(block, sizeof block);

data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/ref/xor_salsa20_ref.c

@@ -12,12 +12,6 @@ Public domain.
 
 #ifndef HAVE_AMD64_ASM
 
-typedef unsigned int uint32;
-
-static const unsigned char sigma[16] = {
-    'e', 'x', 'p', 'a', 'n', 'd', ' ', '3', '2', '-', 'b', 'y', 't', 'e', ' ', 'k'
-};
-
 int crypto_stream_salsa20_xor_ic(
         unsigned char *c,
   const unsigned char *m,unsigned long long mlen,
@@ -41,7 +35,7 @@ int crypto_stream_salsa20_xor_ic(
   }
 
   while (mlen >= 64) {
-    crypto_core_salsa20(block,in,kcopy,sigma);
+    crypto_core_salsa20(block,in,kcopy,NULL);
     for (i = 0;i < 64;++i) c[i] = m[i] ^ block[i];
 
     u = 1;
@@ -57,7 +51,7 @@ int crypto_stream_salsa20_xor_ic(
   }
 
   if (mlen) {
-    crypto_core_salsa20(block,in,kcopy,sigma);
+    crypto_core_salsa20(block,in,kcopy,NULL);
     for (i = 0;i < (unsigned int) mlen;++i) c[i] = m[i] ^ block[i];
   }
   sodium_memzero(block, sizeof block);

data/vendor/libsodium/src/libsodium/crypto_stream/salsa2012/ref/stream_salsa2012.c

@@ -8,12 +8,6 @@ Public domain.
 #include "crypto_stream_salsa2012.h"
 #include "utils.h"
 
-typedef unsigned int uint32;
-
-static const unsigned char sigma[16] = {
-    'e', 'x', 'p', 'a', 'n', 'd', ' ', '3', '2', '-', 'b', 'y', 't', 'e', ' ', 'k'
-};
-
 int crypto_stream_salsa2012(
         unsigned char *c,unsigned long long clen,
   const unsigned char *n,
@@ -33,7 +27,7 @@ int crypto_stream_salsa2012(
   for (i = 8;i < 16;++i) in[i] = 0;
 
   while (clen >= 64) {
-    crypto_core_salsa2012(c,in,kcopy,sigma);
+    crypto_core_salsa2012(c,in,kcopy,NULL);
 
     u = 1;
     for (i = 8;i < 16;++i) {
@@ -47,7 +41,7 @@ int crypto_stream_salsa2012(
   }
 
   if (clen) {
-    crypto_core_salsa2012(block,in,kcopy,sigma);
+    crypto_core_salsa2012(block,in,kcopy,NULL);
     for (i = 0;i < (unsigned int) clen;++i) c[i] = block[i];
   }
   sodium_memzero(block, sizeof block);

data/vendor/libsodium/src/libsodium/crypto_stream/salsa2012/ref/xor_salsa2012.c

@@ -8,12 +8,6 @@ Public domain.
 #include "crypto_stream_salsa2012.h"
 #include "utils.h"
 
-typedef unsigned int uint32;
-
-static const unsigned char sigma[16] = {
-    'e', 'x', 'p', 'a', 'n', 'd', ' ', '3', '2', '-', 'b', 'y', 't', 'e', ' ', 'k'
-};
-
 int crypto_stream_salsa2012_xor(
         unsigned char *c,
   const unsigned char *m,unsigned long long mlen,
@@ -34,7 +28,7 @@ int crypto_stream_salsa2012_xor(
   for (i = 8;i < 16;++i) in[i] = 0;
 
   while (mlen >= 64) {
-    crypto_core_salsa2012(block,in,kcopy,sigma);
+    crypto_core_salsa2012(block,in,kcopy,NULL);
     for (i = 0;i < 64;++i) c[i] = m[i] ^ block[i];
 
     u = 1;
@@ -50,7 +44,7 @@ int crypto_stream_salsa2012_xor(
   }
 
   if (mlen) {
-    crypto_core_salsa2012(block,in,kcopy,sigma);
+    crypto_core_salsa2012(block,in,kcopy,NULL);
     for (i = 0;i < (unsigned int) mlen;++i) c[i] = m[i] ^ block[i];
   }
   sodium_memzero(block, sizeof block);

data/vendor/libsodium/src/libsodium/crypto_stream/salsa208/ref/stream_salsa208.c

@@ -8,12 +8,6 @@ Public domain.
 #include "crypto_stream_salsa208.h"
 #include "utils.h"
 
-typedef unsigned int uint32;
-
-static const unsigned char sigma[16] = {
-        'e', 'x', 'p', 'a', 'n', 'd', ' ', '3', '2', '-', 'b', 'y', 't', 'e', ' ', 'k'
-};
-
 int crypto_stream_salsa208(
         unsigned char *c,unsigned long long clen,
   const unsigned char *n,
@@ -33,7 +27,7 @@ int crypto_stream_salsa208(
   for (i = 8;i < 16;++i) in[i] = 0;
 
   while (clen >= 64) {
-    crypto_core_salsa208(c,in,kcopy,sigma);
+    crypto_core_salsa208(c,in,kcopy,NULL);
 
     u = 1;
     for (i = 8;i < 16;++i) {
@@ -47,7 +41,7 @@ int crypto_stream_salsa208(
   }
 
   if (clen) {
-    crypto_core_salsa208(block,in,kcopy,sigma);
+    crypto_core_salsa208(block,in,kcopy,NULL);
     for (i = 0;i < (unsigned int) clen;++i) c[i] = block[i];
   }
   sodium_memzero(block, sizeof block);

data/vendor/libsodium/src/libsodium/crypto_stream/salsa208/ref/xor_salsa208.c

@@ -8,12 +8,6 @@ Public domain.
 #include "crypto_stream_salsa208.h"
 #include "utils.h"
 
-typedef unsigned int uint32;
-
-static const unsigned char sigma[16] = {
-    'e', 'x', 'p', 'a', 'n', 'd', ' ', '3', '2', '-', 'b', 'y', 't', 'e', ' ', 'k'
-};
-
 int crypto_stream_salsa208_xor(
         unsigned char *c,
   const unsigned char *m,unsigned long long mlen,
@@ -34,7 +28,7 @@ int crypto_stream_salsa208_xor(
   for (i = 8;i < 16;++i) in[i] = 0;
 
   while (mlen >= 64) {
-    crypto_core_salsa208(block,in,kcopy,sigma);
+    crypto_core_salsa208(block,in,kcopy,NULL);
     for (i = 0;i < 64;++i) c[i] = m[i] ^ block[i];
 
     u = 1;
@@ -50,7 +44,7 @@ int crypto_stream_salsa208_xor(
   }
 
   if (mlen) {
-    crypto_core_salsa208(block,in,kcopy,sigma);
+    crypto_core_salsa208(block,in,kcopy,NULL);
     for (i = 0;i < (unsigned int) mlen;++i) c[i] = m[i] ^ block[i];
   }
   sodium_memzero(block, sizeof block);

data/vendor/libsodium/src/libsodium/crypto_stream/xsalsa20/ref/stream_xsalsa20.c

@@ -9,10 +9,6 @@ Public domain.
 #include "crypto_stream_xsalsa20.h"
 #include "utils.h"
 
-static const unsigned char sigma[16] = {
-    'e', 'x', 'p', 'a', 'n', 'd', ' ', '3', '2', '-', 'b', 'y', 't', 'e', ' ', 'k'
-};
-
 int crypto_stream_xsalsa20(
         unsigned char *c,unsigned long long clen,
   const unsigned char *n,
@@ -21,7 +17,7 @@ int crypto_stream_xsalsa20(
 {
   unsigned char subkey[32];
   int ret;
-  crypto_core_hsalsa20(subkey,n,k,sigma);
+  crypto_core_hsalsa20(subkey,n,k,NULL);
   ret = crypto_stream_salsa20(c,clen,n + 16,subkey);
   sodium_memzero(subkey, sizeof subkey);
   return ret;

data/vendor/libsodium/src/libsodium/crypto_stream/xsalsa20/ref/xor_xsalsa20.c

@@ -9,10 +9,6 @@ Public domain.
 #include "crypto_stream_xsalsa20.h"
 #include "utils.h"
 
-static const unsigned char sigma[16] = {
-    'e', 'x', 'p', 'a', 'n', 'd', ' ', '3', '2', '-', 'b', 'y', 't', 'e', ' ', 'k'
-};
-
 int crypto_stream_xsalsa20_xor_ic(
         unsigned char *c,
   const unsigned char *m,unsigned long long mlen,
@@ -22,7 +18,7 @@ int crypto_stream_xsalsa20_xor_ic(
 {
   unsigned char subkey[32];
   int ret;
-  crypto_core_hsalsa20(subkey,n,k,sigma);
+  crypto_core_hsalsa20(subkey,n,k,NULL);
   ret = crypto_stream_salsa20_xor_ic(c,m,mlen,n + 16,ic,subkey);
   sodium_memzero(subkey, sizeof subkey);
   return ret;

data/vendor/libsodium/src/libsodium/include/Makefile.am

@@ -10,6 +10,7 @@ SODIUM_EXPORT = \
 	sodium/crypto_auth_hmacsha512256.h \
 	sodium/crypto_box.h \
 	sodium/crypto_box_curve25519xsalsa20poly1305.h \
+	sodium/crypto_core_hchacha20.h \
 	sodium/crypto_core_hsalsa20.h \
 	sodium/crypto_core_salsa20.h \
 	sodium/crypto_core_salsa2012.h \
@@ -21,6 +22,8 @@ SODIUM_EXPORT = \
 	sodium/crypto_hash_sha512.h \
 	sodium/crypto_onetimeauth.h \
 	sodium/crypto_onetimeauth_poly1305.h \
+	sodium/crypto_pwhash.h \
+	sodium/crypto_pwhash_argon2i.h \
 	sodium/crypto_pwhash_scryptsalsa208sha256.h \
 	sodium/crypto_scalarmult.h \
 	sodium/crypto_scalarmult_curve25519.h \

data/vendor/libsodium/src/libsodium/include/Makefile.in

@@ -96,6 +96,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_check_define.m4 \
 	$(top_srcdir)/m4/ax_check_link_flag.m4 \
+	$(top_srcdir)/m4/ax_valgrind_check.m4 \
 	$(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
@@ -133,13 +134,14 @@ am__nobase_include_HEADERS_DIST = sodium.h sodium/core.h \
 	sodium/crypto_auth_hmacsha512.h \
 	sodium/crypto_auth_hmacsha512256.h sodium/crypto_box.h \
 	sodium/crypto_box_curve25519xsalsa20poly1305.h \
-	sodium/crypto_core_hsalsa20.h sodium/crypto_core_salsa20.h \
-	sodium/crypto_core_salsa2012.h sodium/crypto_core_salsa208.h \
-	sodium/crypto_generichash.h \
+	sodium/crypto_core_hchacha20.h sodium/crypto_core_hsalsa20.h \
+	sodium/crypto_core_salsa20.h sodium/crypto_core_salsa2012.h \
+	sodium/crypto_core_salsa208.h sodium/crypto_generichash.h \
 	sodium/crypto_generichash_blake2b.h sodium/crypto_hash.h \
 	sodium/crypto_hash_sha256.h sodium/crypto_hash_sha512.h \
 	sodium/crypto_onetimeauth.h \
-	sodium/crypto_onetimeauth_poly1305.h \
+	sodium/crypto_onetimeauth_poly1305.h sodium/crypto_pwhash.h \
+	sodium/crypto_pwhash_argon2i.h \
 	sodium/crypto_pwhash_scryptsalsa208sha256.h \
 	sodium/crypto_scalarmult.h \
 	sodium/crypto_scalarmult_curve25519.h \
@@ -227,6 +229,8 @@ CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CFLAGS_AESNI = @CFLAGS_AESNI@
+CFLAGS_AVX = @CFLAGS_AVX@
+CFLAGS_AVX2 = @CFLAGS_AVX2@
 CFLAGS_MMX = @CFLAGS_MMX@
 CFLAGS_PCLMUL = @CFLAGS_PCLMUL@
 CFLAGS_SSE2 = @CFLAGS_SSE2@
@@ -299,6 +303,12 @@ SODIUM_LIBRARY_VERSION_MAJOR = @SODIUM_LIBRARY_VERSION_MAJOR@
 SODIUM_LIBRARY_VERSION_MINOR = @SODIUM_LIBRARY_VERSION_MINOR@
 STRIP = @STRIP@
 TEST_LDFLAGS = @TEST_LDFLAGS@
+VALGRIND = @VALGRIND@
+VALGRIND_ENABLED = @VALGRIND_ENABLED@
+VALGRIND_HAVE_TOOL_drd = @VALGRIND_HAVE_TOOL_drd@
+VALGRIND_HAVE_TOOL_exp_sgcheck = @VALGRIND_HAVE_TOOL_exp_sgcheck@
+VALGRIND_HAVE_TOOL_helgrind = @VALGRIND_HAVE_TOOL_helgrind@
+VALGRIND_HAVE_TOOL_memcheck = @VALGRIND_HAVE_TOOL_memcheck@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -358,13 +368,14 @@ SODIUM_EXPORT = sodium.h sodium/core.h sodium/crypto_aead_aes256gcm.h \
 	sodium/crypto_auth_hmacsha512.h \
 	sodium/crypto_auth_hmacsha512256.h sodium/crypto_box.h \
 	sodium/crypto_box_curve25519xsalsa20poly1305.h \
-	sodium/crypto_core_hsalsa20.h sodium/crypto_core_salsa20.h \
-	sodium/crypto_core_salsa2012.h sodium/crypto_core_salsa208.h \
-	sodium/crypto_generichash.h \
+	sodium/crypto_core_hchacha20.h sodium/crypto_core_hsalsa20.h \
+	sodium/crypto_core_salsa20.h sodium/crypto_core_salsa2012.h \
+	sodium/crypto_core_salsa208.h sodium/crypto_generichash.h \
 	sodium/crypto_generichash_blake2b.h sodium/crypto_hash.h \
 	sodium/crypto_hash_sha256.h sodium/crypto_hash_sha512.h \
 	sodium/crypto_onetimeauth.h \
-	sodium/crypto_onetimeauth_poly1305.h \
+	sodium/crypto_onetimeauth_poly1305.h sodium/crypto_pwhash.h \
+	sodium/crypto_pwhash_argon2i.h \
 	sodium/crypto_pwhash_scryptsalsa208sha256.h \
 	sodium/crypto_scalarmult.h \
 	sodium/crypto_scalarmult_curve25519.h \

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

@@ -12,6 +12,7 @@
 #include "sodium/crypto_box.h"
 #include "sodium/crypto_box_curve25519xsalsa20poly1305.h"
 #include "sodium/crypto_core_hsalsa20.h"
+#include "sodium/crypto_core_hchacha20.h"
 #include "sodium/crypto_core_salsa20.h"
 #include "sodium/crypto_core_salsa2012.h"
 #include "sodium/crypto_core_salsa208.h"
@@ -22,6 +23,8 @@
 #include "sodium/crypto_hash_sha512.h"
 #include "sodium/crypto_onetimeauth.h"
 #include "sodium/crypto_onetimeauth_poly1305.h"
+#include "sodium/crypto_pwhash.h"
+#include "sodium/crypto_pwhash_argon2i.h"
 #include "sodium/crypto_pwhash_scryptsalsa208sha256.h"
 #include "sodium/crypto_scalarmult.h"
 #include "sodium/crypto_scalarmult_curve25519.h"

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

@@ -57,6 +57,32 @@ int crypto_aead_aes256gcm_decrypt(unsigned char *m,
                                   const unsigned char *k)
             __attribute__ ((warn_unused_result));
 
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_encrypt_detached(unsigned char *c,
+                                           unsigned char *mac,
+                                           unsigned long long *maclen_p,
+                                           const unsigned char *m,
+                                           unsigned long long mlen,
+                                           const unsigned char *ad,
+                                           unsigned long long adlen,
+                                           const unsigned char *nsec,
+                                           const unsigned char *npub,
+                                           const unsigned char *k);
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_decrypt_detached(unsigned char *m,
+                                           unsigned char *nsec,
+                                           const unsigned char *c,
+                                           unsigned long long clen,
+                                           const unsigned char *mac,
+                                           const unsigned char *ad,
+                                           unsigned long long adlen,
+                                           const unsigned char *npub,
+                                           const unsigned char *k)
+        __attribute__ ((warn_unused_result));
+
+/* -- Precomputation interface -- */
+
 SODIUM_EXPORT
 int crypto_aead_aes256gcm_beforenm(crypto_aead_aes256gcm_state *ctx_,
                                    const unsigned char *k);
@@ -84,6 +110,30 @@ int crypto_aead_aes256gcm_decrypt_afternm(unsigned char *m,
                                           const crypto_aead_aes256gcm_state *ctx_)
             __attribute__ ((warn_unused_result));
 
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_encrypt_detached_afternm(unsigned char *c,
+                                                   unsigned char *mac,
+                                                   unsigned long long *maclen_p,
+                                                   const unsigned char *m,
+                                                   unsigned long long mlen,
+                                                   const unsigned char *ad,
+                                                   unsigned long long adlen,
+                                                   const unsigned char *nsec,
+                                                   const unsigned char *npub,
+                                                   const crypto_aead_aes256gcm_state *ctx_);
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_decrypt_detached_afternm(unsigned char *m,
+                                                   unsigned char *nsec,
+                                                   const unsigned char *c,
+                                                   unsigned long long clen,
+                                                   const unsigned char *mac,
+                                                   const unsigned char *ad,
+                                                   unsigned long long adlen,
+                                                   const unsigned char *npub,
+                                                   const crypto_aead_aes256gcm_state *ctx_)
+        __attribute__ ((warn_unused_result));
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -11,6 +11,74 @@
 extern "C" {
 #endif
 
+/* -- IETF ChaCha20-Poly1305 construction with a 96-bit nonce and a 32-bit internal counter -- */
+
+#define crypto_aead_chacha20poly1305_ietf_KEYBYTES 32U
+SODIUM_EXPORT
+size_t crypto_aead_chacha20poly1305_ietf_keybytes(void);
+
+#define crypto_aead_chacha20poly1305_ietf_NSECBYTES 0U
+SODIUM_EXPORT
+size_t crypto_aead_chacha20poly1305_ietf_nsecbytes(void);
+
+#define crypto_aead_chacha20poly1305_ietf_NPUBBYTES 12U
+
+SODIUM_EXPORT
+size_t crypto_aead_chacha20poly1305_ietf_npubbytes(void);
+
+#define crypto_aead_chacha20poly1305_ietf_ABYTES 16U
+SODIUM_EXPORT
+size_t crypto_aead_chacha20poly1305_ietf_abytes(void);
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_encrypt(unsigned char *c,
+                                              unsigned long long *clen_p,
+                                              const unsigned char *m,
+                                              unsigned long long mlen,
+                                              const unsigned char *ad,
+                                              unsigned long long adlen,
+                                              const unsigned char *nsec,
+                                              const unsigned char *npub,
+                                              const unsigned char *k);
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_decrypt(unsigned char *m,
+                                              unsigned long long *mlen_p,
+                                              unsigned char *nsec,
+                                              const unsigned char *c,
+                                              unsigned long long clen,
+                                              const unsigned char *ad,
+                                              unsigned long long adlen,
+                                              const unsigned char *npub,
+                                              const unsigned char *k)
+            __attribute__ ((warn_unused_result));
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_encrypt_detached(unsigned char *c,
+                                                       unsigned char *mac,
+                                                       unsigned long long *maclen_p,
+                                                       const unsigned char *m,
+                                                       unsigned long long mlen,
+                                                       const unsigned char *ad,
+                                                       unsigned long long adlen,
+                                                       const unsigned char *nsec,
+                                                       const unsigned char *npub,
+                                                       const unsigned char *k);
+
+SODIUM_EXPORT
+int crypto_aead_chacha20poly1305_ietf_decrypt_detached(unsigned char *m,
+                                                       unsigned char *nsec,
+                                                       const unsigned char *c,
+                                                       unsigned long long clen,
+                                                       const unsigned char *mac,
+                                                       const unsigned char *ad,
+                                                       unsigned long long adlen,
+                                                       const unsigned char *npub,
+                                                       const unsigned char *k)
+        __attribute__ ((warn_unused_result));
+
+/* -- Original ChaCha20-Poly1305 construction with a 64-bit nonce and a 64-bit internal counter -- */
+
 #define crypto_aead_chacha20poly1305_KEYBYTES 32U
 SODIUM_EXPORT
 size_t crypto_aead_chacha20poly1305_keybytes(void);
@@ -50,32 +118,36 @@ int crypto_aead_chacha20poly1305_decrypt(unsigned char *m,
                                          const unsigned char *k)
             __attribute__ ((warn_unused_result));
 
-#define crypto_aead_chacha20poly1305_IETF_NPUBBYTES 12U
 SODIUM_EXPORT
-size_t crypto_aead_chacha20poly1305_ietf_npubbytes(void);
+int crypto_aead_chacha20poly1305_encrypt_detached(unsigned char *c,
+                                                  unsigned char *mac,
+                                                  unsigned long long *maclen_p,
+                                                  const unsigned char *m,
+                                                  unsigned long long mlen,
+                                                  const unsigned char *ad,
+                                                  unsigned long long adlen,
+                                                  const unsigned char *nsec,
+                                                  const unsigned char *npub,
+                                                  const unsigned char *k);
 
 SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_ietf_encrypt(unsigned char *c,
-                                              unsigned long long *clen_p,
-                                              const unsigned char *m,
-                                              unsigned long long mlen,
-                                              const unsigned char *ad,
-                                              unsigned long long adlen,
-                                              const unsigned char *nsec,
-                                              const unsigned char *npub,
-                                              const unsigned char *k);
+int crypto_aead_chacha20poly1305_decrypt_detached(unsigned char *m,
+                                                  unsigned char *nsec,
+                                                  const unsigned char *c,
+                                                  unsigned long long clen,
+                                                  const unsigned char *mac,
+                                                  const unsigned char *ad,
+                                                  unsigned long long adlen,
+                                                  const unsigned char *npub,
+                                                  const unsigned char *k)
+        __attribute__ ((warn_unused_result));
 
-SODIUM_EXPORT
-int crypto_aead_chacha20poly1305_ietf_decrypt(unsigned char *m,
-                                              unsigned long long *mlen_p,
-                                              unsigned char *nsec,
-                                              const unsigned char *c,
-                                              unsigned long long clen,
-                                              const unsigned char *ad,
-                                              unsigned long long adlen,
-                                              const unsigned char *npub,
-                                              const unsigned char *k)
-            __attribute__ ((warn_unused_result));
+/* 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
 
 #ifdef __cplusplus
 }