rbnacl-libsodium 1.0.3 → 1.0.4

data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c

@@ -279,6 +279,10 @@ escrypt_kdf_nosse(escrypt_local_t * local,
 		errno = EFBIG;
 		return -1;
 	}
+	if (N > UINT32_MAX) {
+		errno = EFBIG;
+		return -1;
+	}
 	if (((N & (N - 1)) != 0) || (N < 2)) {
 		errno = EINVAL;
 		return -1;

data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.c

@@ -53,6 +53,9 @@ PBKDF2_SHA256(const uint8_t * passwd, size_t passwdlen, const uint8_t * salt,
     int             k;
     size_t          clen;
 
+    if (dkLen > 0x1fffffffe0UL) {
+        abort();
+    }
     crypto_auth_hmacsha256_init(&PShctx, passwd, passwdlen);
     crypto_auth_hmacsha256_update(&PShctx, salt, saltlen);
 

data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c

@@ -28,7 +28,8 @@
  * online backup system.
  */
 
-#if defined(HAVE_EMMINTRIN_H) || defined(_MSC_VER)
+#if defined(HAVE_EMMINTRIN_H) || \
+    (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86)))
 #if __GNUC__
 # pragma GCC target("sse2")
 #endif

data/vendor/libsodium/src/libsodium/crypto_scalarmult/curve25519/ref10/fe_frombytes_curve25519_ref10.c

@@ -58,16 +58,16 @@ void fe_frombytes(fe h,const unsigned char *s)
   carry6 = (h6 + (crypto_int64) (1<<25)) >> 26; h7 += carry6; h6 -= carry6 << 26;
   carry8 = (h8 + (crypto_int64) (1<<25)) >> 26; h9 += carry8; h8 -= carry8 << 26;
 
-  h[0] = h0;
-  h[1] = h1;
-  h[2] = h2;
-  h[3] = h3;
-  h[4] = h4;
-  h[5] = h5;
-  h[6] = h6;
-  h[7] = h7;
-  h[8] = h8;
-  h[9] = h9;
+  h[0] = (crypto_int32) h0;
+  h[1] = (crypto_int32) h1;
+  h[2] = (crypto_int32) h2;
+  h[3] = (crypto_int32) h3;
+  h[4] = (crypto_int32) h4;
+  h[5] = (crypto_int32) h5;
+  h[6] = (crypto_int32) h6;
+  h[7] = (crypto_int32) h7;
+  h[8] = (crypto_int32) h8;
+  h[9] = (crypto_int32) h9;
 }
 
 #endif

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

@@ -10,3 +10,13 @@ crypto_stream_chacha20_ref_xor_ic(unsigned char *c, const unsigned char *m,
                                   unsigned long long mlen,
                                   const unsigned char *n, uint64_t ic,
                                   const unsigned char *k);
+
+int
+crypto_stream_chacha20_ietf_ref(unsigned char *c, unsigned long long clen,
+                                const unsigned char *n, const unsigned char *k);
+
+int
+crypto_stream_chacha20_ietf_ref_xor_ic(unsigned char *c, const unsigned char *m,
+                                       unsigned long long mlen,
+                                       const unsigned char *n, uint32_t ic,
+                                       const unsigned char *k);

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

@@ -91,6 +91,15 @@ chacha_ivsetup(chacha_ctx *x, const u8 *iv, const u8 *counter)
     x->input[15] = U8TO32_LITTLE(iv + 4);
 }
 
+static void
+chacha_ietf_ivsetup(chacha_ctx *x, const u8 *iv, const u8 *counter)
+{
+    x->input[12] = counter == NULL ? 0 : U8TO32_LITTLE(counter);
+    x->input[13] = U8TO32_LITTLE(iv + 0);
+    x->input[14] = U8TO32_LITTLE(iv + 4);
+    x->input[15] = U8TO32_LITTLE(iv + 8);
+}
+
 static void
 chacha_encrypt_bytes(chacha_ctx *x, const u8 *m, u8 *c, unsigned long long bytes)
 {
@@ -248,6 +257,25 @@ crypto_stream_chacha20_ref(unsigned char *c, unsigned long long clen,
     return 0;
 }
 
+int
+crypto_stream_chacha20_ietf_ref(unsigned char *c, unsigned long long clen,
+                                const unsigned char *n, const unsigned char *k)
+{
+    struct chacha_ctx ctx;
+
+    if (!clen) {
+        return 0;
+    }
+    (void) sizeof(int[crypto_stream_chacha20_KEYBYTES == 256 / 8 ? 1 : -1]);
+    chacha_keysetup(&ctx, k);
+    chacha_ietf_ivsetup(&ctx, n, NULL);
+    memset(c, 0, clen);
+    chacha_encrypt_bytes(&ctx, c, c, clen);
+    sodium_memzero(&ctx, sizeof ctx);
+
+    return 0;
+}
+
 int
 crypto_stream_chacha20_ref_xor_ic(unsigned char *c, const unsigned char *m,
                                   unsigned long long mlen,
@@ -269,6 +297,29 @@ crypto_stream_chacha20_ref_xor_ic(unsigned char *c, const unsigned char *m,
     chacha_keysetup(&ctx, k);
     chacha_ivsetup(&ctx, n, ic_bytes);
     chacha_encrypt_bytes(&ctx, m, c, mlen);
+
+    sodium_memzero(&ctx, sizeof ctx);
+    sodium_memzero(ic_bytes, sizeof ic_bytes);
+
+    return 0;
+}
+
+int
+crypto_stream_chacha20_ietf_ref_xor_ic(unsigned char *c, const unsigned char *m,
+                                       unsigned long long mlen,
+                                       const unsigned char *n, uint32_t ic,
+                                       const unsigned char *k)
+{
+    struct chacha_ctx ctx;
+    uint8_t           ic_bytes[4];
+
+    if (!mlen) {
+        return 0;
+    }
+    U32TO8_LITTLE(ic_bytes, ic);
+    chacha_keysetup(&ctx, k);
+    chacha_ietf_ivsetup(&ctx, n, ic_bytes);
+    chacha_encrypt_bytes(&ctx, m, c, mlen);
     sodium_memzero(&ctx, sizeof ctx);
     sodium_memzero(ic_bytes, sizeof ic_bytes);
 

data/vendor/libsodium/src/libsodium/crypto_stream/chacha20/stream_chacha20_api.c

@@ -11,6 +11,11 @@ crypto_stream_chacha20_noncebytes(void) {
     return crypto_stream_chacha20_NONCEBYTES;
 }
 
+size_t
+crypto_stream_chacha20_ietf_noncebytes(void) {
+    return crypto_stream_chacha20_IETF_NONCEBYTES;
+}
+
 int
 crypto_stream_chacha20(unsigned char *c, unsigned long long clen,
                        const unsigned char *n, const unsigned char *k)
@@ -18,6 +23,13 @@ crypto_stream_chacha20(unsigned char *c, unsigned long long clen,
     return crypto_stream_chacha20_ref(c, clen, n, k);
 }
 
+int
+crypto_stream_chacha20_ietf(unsigned char *c, unsigned long long clen,
+                            const unsigned char *n, const unsigned char *k)
+{
+    return crypto_stream_chacha20_ietf_ref(c, clen, n, k);
+}
+
 int
 crypto_stream_chacha20_xor_ic(unsigned char *c, const unsigned char *m,
                               unsigned long long mlen,
@@ -27,6 +39,15 @@ crypto_stream_chacha20_xor_ic(unsigned char *c, const unsigned char *m,
     return crypto_stream_chacha20_ref_xor_ic(c, m, mlen, n, ic, k);
 }
 
+int
+crypto_stream_chacha20_ietf_xor_ic(unsigned char *c, const unsigned char *m,
+                                   unsigned long long mlen,
+                                   const unsigned char *n, uint32_t ic,
+                                   const unsigned char *k)
+{
+    return crypto_stream_chacha20_ietf_ref_xor_ic(c, m, mlen, n, ic, k);
+}
+
 int
 crypto_stream_chacha20_xor(unsigned char *c, const unsigned char *m,
                            unsigned long long mlen, const unsigned char *n,
@@ -34,3 +55,11 @@ crypto_stream_chacha20_xor(unsigned char *c, const unsigned char *m,
 {
     return crypto_stream_chacha20_ref_xor_ic(c, m, mlen, n, 0U, k);
 }
+
+int
+crypto_stream_chacha20_ietf_xor(unsigned char *c, const unsigned char *m,
+                                unsigned long long mlen, const unsigned char *n,
+                                const unsigned char *k)
+{
+    return crypto_stream_chacha20_ietf_ref_xor_ic(c, m, mlen, n, 0U, k);
+}

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

@@ -2,6 +2,7 @@
 SODIUM_EXPORT = \
 	sodium.h \
 	sodium/core.h \
+	sodium/crypto_aead_aes256gcm.h \
 	sodium/crypto_aead_chacha20poly1305.h \
 	sodium/crypto_auth.h \
 	sodium/crypto_auth_hmacsha256.h \
@@ -53,6 +54,11 @@ SODIUM_EXPORT = \
 	sodium/runtime.h \
 	sodium/utils.h
 
+if NATIVECLIENT
+SODIUM_EXPORT += \
+	sodium/randombytes_nativeclient.h
+endif
+
 EXTRA_SRC = $(SODIUM_EXPORT) \
 	sodium/version.h.in
 

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

@@ -88,9 +88,13 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@NATIVECLIENT_TRUE@am__append_1 = \
+@NATIVECLIENT_TRUE@	sodium/randombytes_nativeclient.h
+
 subdir = src/libsodium/include
 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/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -98,7 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(nobase_include_HEADERS) \
+DIST_COMMON = $(srcdir)/Makefile.am $(am__nobase_include_HEADERS_DIST) \
 	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
@@ -122,6 +126,41 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__nobase_include_HEADERS_DIST = sodium.h sodium/core.h \
+	sodium/crypto_aead_aes256gcm.h \
+	sodium/crypto_aead_chacha20poly1305.h sodium/crypto_auth.h \
+	sodium/crypto_auth_hmacsha256.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_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_pwhash_scryptsalsa208sha256.h \
+	sodium/crypto_scalarmult.h \
+	sodium/crypto_scalarmult_curve25519.h \
+	sodium/crypto_secretbox.h \
+	sodium/crypto_secretbox_xsalsa20poly1305.h \
+	sodium/crypto_shorthash.h sodium/crypto_shorthash_siphash24.h \
+	sodium/crypto_sign.h sodium/crypto_sign_ed25519.h \
+	sodium/crypto_sign_edwards25519sha512batch.h \
+	sodium/crypto_stream.h sodium/crypto_stream_aes128ctr.h \
+	sodium/crypto_stream_chacha20.h sodium/crypto_stream_salsa20.h \
+	sodium/crypto_stream_salsa2012.h \
+	sodium/crypto_stream_salsa208.h \
+	sodium/crypto_stream_xsalsa20.h sodium/crypto_int32.h \
+	sodium/crypto_int64.h sodium/crypto_uint16.h \
+	sodium/crypto_uint32.h sodium/crypto_uint64.h \
+	sodium/crypto_uint8.h sodium/crypto_verify_16.h \
+	sodium/crypto_verify_32.h sodium/crypto_verify_64.h \
+	sodium/export.h sodium/randombytes.h \
+	sodium/randombytes_salsa20_random.h \
+	sodium/randombytes_sysrandom.h sodium/runtime.h sodium/utils.h \
+	sodium/randombytes_nativeclient.h
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -187,6 +226,13 @@ CCASDEPMODE = @CCASDEPMODE@
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CFLAGS_AESNI = @CFLAGS_AESNI@
+CFLAGS_MMX = @CFLAGS_MMX@
+CFLAGS_PCLMUL = @CFLAGS_PCLMUL@
+CFLAGS_SSE2 = @CFLAGS_SSE2@
+CFLAGS_SSE3 = @CFLAGS_SSE3@
+CFLAGS_SSE4_1 = @CFLAGS_SSE4_1@
+CFLAGS_SSSE3 = @CFLAGS_SSSE3@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CWFLAGS = @CWFLAGS@
@@ -223,6 +269,7 @@ LIBTOOL_EXTRA_FLAGS = @LIBTOOL_EXTRA_FLAGS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -304,25 +351,17 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SODIUM_EXPORT = \
-	sodium.h \
-	sodium/core.h \
-	sodium/crypto_aead_chacha20poly1305.h \
-	sodium/crypto_auth.h \
+SODIUM_EXPORT = sodium.h sodium/core.h sodium/crypto_aead_aes256gcm.h \
+	sodium/crypto_aead_chacha20poly1305.h sodium/crypto_auth.h \
 	sodium/crypto_auth_hmacsha256.h \
 	sodium/crypto_auth_hmacsha512.h \
-	sodium/crypto_auth_hmacsha512256.h \
-	sodium/crypto_box.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_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_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_pwhash_scryptsalsa208sha256.h \
@@ -330,34 +369,22 @@ SODIUM_EXPORT = \
 	sodium/crypto_scalarmult_curve25519.h \
 	sodium/crypto_secretbox.h \
 	sodium/crypto_secretbox_xsalsa20poly1305.h \
-	sodium/crypto_shorthash.h \
-	sodium/crypto_shorthash_siphash24.h \
-	sodium/crypto_sign.h \
-	sodium/crypto_sign_ed25519.h \
+	sodium/crypto_shorthash.h sodium/crypto_shorthash_siphash24.h \
+	sodium/crypto_sign.h sodium/crypto_sign_ed25519.h \
 	sodium/crypto_sign_edwards25519sha512batch.h \
-	sodium/crypto_stream.h \
-	sodium/crypto_stream_aes128ctr.h \
-	sodium/crypto_stream_chacha20.h \
-	sodium/crypto_stream_salsa20.h \
+	sodium/crypto_stream.h sodium/crypto_stream_aes128ctr.h \
+	sodium/crypto_stream_chacha20.h sodium/crypto_stream_salsa20.h \
 	sodium/crypto_stream_salsa2012.h \
 	sodium/crypto_stream_salsa208.h \
-	sodium/crypto_stream_xsalsa20.h \
-	sodium/crypto_int32.h \
-	sodium/crypto_int64.h \
-	sodium/crypto_uint16.h \
-	sodium/crypto_uint32.h \
-	sodium/crypto_uint64.h \
-	sodium/crypto_uint8.h \
-	sodium/crypto_verify_16.h \
-	sodium/crypto_verify_32.h \
-	sodium/crypto_verify_64.h \
-	sodium/export.h \
-	sodium/randombytes.h \
+	sodium/crypto_stream_xsalsa20.h sodium/crypto_int32.h \
+	sodium/crypto_int64.h sodium/crypto_uint16.h \
+	sodium/crypto_uint32.h sodium/crypto_uint64.h \
+	sodium/crypto_uint8.h sodium/crypto_verify_16.h \
+	sodium/crypto_verify_32.h sodium/crypto_verify_64.h \
+	sodium/export.h sodium/randombytes.h \
 	sodium/randombytes_salsa20_random.h \
-	sodium/randombytes_sysrandom.h \
-	sodium/runtime.h \
-	sodium/utils.h
-
+	sodium/randombytes_sysrandom.h sodium/runtime.h sodium/utils.h \
+	$(am__append_1)
 EXTRA_SRC = $(SODIUM_EXPORT) \
 	sodium/version.h.in
 

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

@@ -3,6 +3,7 @@
 #define sodium_H
 
 #include "sodium/core.h"
+#include "sodium/crypto_aead_aes256gcm.h"
 #include "sodium/crypto_aead_chacha20poly1305.h"
 #include "sodium/crypto_auth.h"
 #include "sodium/crypto_auth_hmacsha256.h"
@@ -41,6 +42,9 @@
 #include "sodium/crypto_verify_32.h"
 #include "sodium/crypto_verify_64.h"
 #include "sodium/randombytes.h"
+#ifdef __native_client__
+# include "sodium/randombytes_nativeclient.h"
+#endif
 #include "sodium/randombytes_salsa20_random.h"
 #include "sodium/randombytes_sysrandom.h"
 #include "sodium/runtime.h"

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

@@ -0,0 +1,88 @@
+#ifndef crypto_aead_aes256gcm_H
+#define crypto_aead_aes256gcm_H
+
+#include <stddef.h>
+#include "export.h"
+
+#ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
+extern "C" {
+#endif
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_is_available(void);
+
+#define crypto_aead_aes256gcm_KEYBYTES  32U
+SODIUM_EXPORT
+size_t crypto_aead_aes256gcm_keybytes(void);
+
+#define crypto_aead_aes256gcm_NSECBYTES 0U
+SODIUM_EXPORT
+size_t crypto_aead_aes256gcm_nsecbytes(void);
+
+#define crypto_aead_aes256gcm_NPUBBYTES 12U
+SODIUM_EXPORT
+size_t crypto_aead_aes256gcm_npubbytes(void);
+
+#define crypto_aead_aes256gcm_ABYTES    16U
+SODIUM_EXPORT
+size_t crypto_aead_aes256gcm_abytes(void);
+
+typedef CRYPTO_ALIGN(16) unsigned char crypto_aead_aes256gcm_state[512];
+SODIUM_EXPORT
+size_t crypto_aead_aes256gcm_statebytes(void);
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_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_aes256gcm_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);
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_beforenm(crypto_aead_aes256gcm_state *ctx_,
+                                   const unsigned char *k);
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_encrypt_afternm(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 crypto_aead_aes256gcm_state *ctx_);
+
+SODIUM_EXPORT
+int crypto_aead_aes256gcm_decrypt_afternm(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 crypto_aead_aes256gcm_state *ctx_);
+#ifdef __cplusplus
+}
+#endif
+
+#endif