rbnacl-libsodium 1.0.1 → 1.0.2

data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/sign.c

@@ -8,7 +8,7 @@
 #include "utils.h"
 
 int
-crypto_sign_detached(unsigned char *sig, unsigned long long *siglen,
+crypto_sign_detached(unsigned char *sig, unsigned long long *siglen_p,
                      const unsigned char *m, unsigned long long mlen,
                      const unsigned char *sk)
 {
@@ -48,14 +48,14 @@ crypto_sign_detached(unsigned char *sig, unsigned long long *siglen,
     sodium_memzero(az, sizeof az);
     sodium_memzero(nonce, sizeof nonce);
 
-    if (siglen != NULL) {
-        *siglen = 64U;
+    if (siglen_p != NULL) {
+        *siglen_p = 64U;
     }
     return 0;
 }
 
 int
-crypto_sign(unsigned char *sm, unsigned long long *smlen,
+crypto_sign(unsigned char *sm, unsigned long long *smlen_p,
             const unsigned char *m, unsigned long long mlen,
             const unsigned char *sk)
 {
@@ -66,16 +66,16 @@ crypto_sign(unsigned char *sm, unsigned long long *smlen,
     if (crypto_sign_detached(sm, &siglen, sm + crypto_sign_ed25519_BYTES,
                              mlen, sk) != 0 ||
         siglen != crypto_sign_ed25519_BYTES) {
-        if (smlen != NULL) {
-            *smlen = 0;
+        if (smlen_p != NULL) {
+            *smlen_p = 0;
         }
         memset(sm, 0, mlen + crypto_sign_ed25519_BYTES);
         return -1;
     }
 /* LCOV_EXCL_STOP */
 
-    if (smlen != NULL) {
-        *smlen = mlen + siglen;
+    if (smlen_p != NULL) {
+        *smlen_p = mlen + siglen;
     }
     return 0;
 }

data/vendor/libsodium/src/libsodium/crypto_sign/edwards25519sha512batch/ref/sign_edwards25519sha512batch.c

@@ -27,7 +27,7 @@ int crypto_sign_keypair(
 }
 
 int crypto_sign(
-    unsigned char *sm,unsigned long long *smlen,
+    unsigned char *sm,unsigned long long *smlen_p,
     const unsigned char *m,unsigned long long mlen,
     const unsigned char *sk
     )
@@ -40,7 +40,9 @@ int crypto_sign(
   unsigned char hmg[crypto_hash_sha512_BYTES];
   unsigned char hmr[crypto_hash_sha512_BYTES];
 
-  *smlen = mlen+64;
+  if (smlen_p != NULL) {
+    *smlen_p = mlen+64;
+  }
   for(i=0;i<mlen;i++)
     sm[32 + i] = m[i];
   for(i=0;i<32;i++)
@@ -69,7 +71,7 @@ int crypto_sign(
 }
 
 int crypto_sign_open(
-    unsigned char *m,unsigned long long *mlen,
+    unsigned char *m,unsigned long long *mlen_p,
     const unsigned char *sm,unsigned long long smlen,
     const unsigned char *pk
     )
@@ -94,9 +96,11 @@ int crypto_sign_open(
   ge25519_scalarmult_base(&get2, &scs);
   ge25519_pack(t2, &get2);
 
-  for(i=0;i<smlen-64;i++)
+  for(i=0;i<smlen-64;i++) {
     m[i] = sm[i + 32];
-  *mlen = smlen-64;
-
+  }
+  if (mlen_p != NULL) {
+    *mlen_p = smlen-64;
+  }
   return crypto_verify_32(t1, t2);
 }

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

@@ -98,7 +98,7 @@ chacha_encrypt_bytes(chacha_ctx *x, const u8 *m, u8 *c, unsigned long long bytes
     u32 j0, j1, j2, j3, j4, j5, j6, j7, j8, j9, j10, j11, j12, j13, j14, j15;
     u8 *ctarget = NULL;
     u8 tmp[64];
-    unsigned long long i;
+    unsigned int i;
 
     if (!bytes) {
         return; /* LCOV_EXCL_LINE */
@@ -215,7 +215,7 @@ chacha_encrypt_bytes(chacha_ctx *x, const u8 *m, u8 *c, unsigned long long bytes
 
         if (bytes <= 64) {
             if (bytes < 64) {
-                for (i = 0; i < bytes; ++i) {
+                for (i = 0; i < (unsigned int) bytes; ++i) {
                     ctarget[i] = c[i];
                 }
             }

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

@@ -25,7 +25,7 @@ int crypto_stream(
   unsigned char in[16];
   unsigned char block[64];
   unsigned char kcopy[32];
-  unsigned long long i;
+  unsigned int i;
   unsigned int u;
 
   if (!clen) return 0;
@@ -50,7 +50,7 @@ int crypto_stream(
 
   if (clen) {
     crypto_core_salsa20(block,in,kcopy,sigma);
-    for (i = 0;i < clen;++i) c[i] = block[i];
+    for (i = 0;i < (unsigned int) clen;++i) c[i] = block[i];
   }
   sodium_memzero(block, sizeof block);
   sodium_memzero(kcopy, sizeof kcopy);

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

@@ -28,7 +28,7 @@ int crypto_stream_salsa20_xor_ic(
   unsigned char in[16];
   unsigned char block[64];
   unsigned char kcopy[32];
-  unsigned long long i;
+  unsigned int i;
   unsigned int u;
 
   if (!mlen) return 0;
@@ -58,7 +58,7 @@ int crypto_stream_salsa20_xor_ic(
 
   if (mlen) {
     crypto_core_salsa20(block,in,kcopy,sigma);
-    for (i = 0;i < mlen;++i) c[i] = m[i] ^ block[i];
+    for (i = 0;i < (unsigned int) mlen;++i) c[i] = m[i] ^ block[i];
   }
   sodium_memzero(block, sizeof block);
   sodium_memzero(kcopy, sizeof kcopy);

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

@@ -1,11 +1,12 @@
 /*
-version 20080913
+version 20140420
 D. J. Bernstein
 Public domain.
 */
 
 #include "api.h"
 #include "crypto_core_salsa2012.h"
+#include "utils.h"
 
 typedef unsigned int uint32;
 
@@ -21,16 +22,18 @@ int crypto_stream(
 {
   unsigned char in[16];
   unsigned char block[64];
-  unsigned long long i;
+  unsigned char kcopy[32];
+  unsigned int i;
   unsigned int u;
 
   if (!clen) return 0;
 
+  for (i = 0;i < 32;++i) kcopy[i] = k[i];
   for (i = 0;i < 8;++i) in[i] = n[i];
   for (i = 8;i < 16;++i) in[i] = 0;
 
   while (clen >= 64) {
-    crypto_core_salsa2012(c,in,k,sigma);
+    crypto_core_salsa2012(c,in,kcopy,sigma);
 
     u = 1;
     for (i = 8;i < 16;++i) {
@@ -44,8 +47,11 @@ int crypto_stream(
   }
 
   if (clen) {
-    crypto_core_salsa2012(block,in,k,sigma);
-    for (i = 0;i < clen;++i) c[i] = block[i];
+    crypto_core_salsa2012(block,in,kcopy,sigma);
+    for (i = 0;i < (unsigned int) clen;++i) c[i] = block[i];
   }
+  sodium_memzero(block, sizeof block);
+  sodium_memzero(kcopy, sizeof kcopy);
+
   return 0;
 }

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

@@ -1,11 +1,12 @@
 /*
-version 20080913
+version 20140420
 D. J. Bernstein
 Public domain.
 */
 
 #include "api.h"
 #include "crypto_core_salsa2012.h"
+#include "utils.h"
 
 typedef unsigned int uint32;
 
@@ -22,16 +23,18 @@ int crypto_stream_xor(
 {
   unsigned char in[16];
   unsigned char block[64];
-  unsigned long long i;
+  unsigned char kcopy[32];
+  unsigned int i;
   unsigned int u;
 
   if (!mlen) return 0;
 
+  for (i = 0;i < 32;++i) kcopy[i] = k[i];
   for (i = 0;i < 8;++i) in[i] = n[i];
   for (i = 8;i < 16;++i) in[i] = 0;
 
   while (mlen >= 64) {
-    crypto_core_salsa2012(block,in,k,sigma);
+    crypto_core_salsa2012(block,in,kcopy,sigma);
     for (i = 0;i < 64;++i) c[i] = m[i] ^ block[i];
 
     u = 1;
@@ -47,8 +50,11 @@ int crypto_stream_xor(
   }
 
   if (mlen) {
-    crypto_core_salsa2012(block,in,k,sigma);
-    for (i = 0;i < mlen;++i) c[i] = m[i] ^ block[i];
+    crypto_core_salsa2012(block,in,kcopy,sigma);
+    for (i = 0;i < (unsigned int) mlen;++i) c[i] = m[i] ^ block[i];
   }
+  sodium_memzero(block, sizeof block);
+  sodium_memzero(kcopy, sizeof kcopy);
+
   return 0;
 }

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

@@ -1,11 +1,12 @@
 /*
-version 20080913
+version 20140420
 D. J. Bernstein
 Public domain.
 */
 
 #include "api.h"
 #include "crypto_core_salsa208.h"
+#include "utils.h"
 
 typedef unsigned int uint32;
 
@@ -21,16 +22,18 @@ int crypto_stream(
 {
   unsigned char in[16];
   unsigned char block[64];
-  unsigned long long i;
+  unsigned char kcopy[32];
+  unsigned int i;
   unsigned int u;
 
   if (!clen) return 0;
 
+  for (i = 0;i < 32;++i) kcopy[i] = k[i];
   for (i = 0;i < 8;++i) in[i] = n[i];
   for (i = 8;i < 16;++i) in[i] = 0;
 
   while (clen >= 64) {
-    crypto_core_salsa208(c,in,k,sigma);
+    crypto_core_salsa208(c,in,kcopy,sigma);
 
     u = 1;
     for (i = 8;i < 16;++i) {
@@ -44,8 +47,11 @@ int crypto_stream(
   }
 
   if (clen) {
-    crypto_core_salsa208(block,in,k,sigma);
-    for (i = 0;i < clen;++i) c[i] = block[i];
+    crypto_core_salsa208(block,in,kcopy,sigma);
+    for (i = 0;i < (unsigned int) clen;++i) c[i] = block[i];
   }
+  sodium_memzero(block, sizeof block);
+  sodium_memzero(kcopy, sizeof kcopy);
+
   return 0;
 }

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

@@ -1,11 +1,12 @@
 /*
-version 20080913
+version 20140420
 D. J. Bernstein
 Public domain.
 */
 
 #include "api.h"
 #include "crypto_core_salsa208.h"
+#include "utils.h"
 
 typedef unsigned int uint32;
 
@@ -22,16 +23,18 @@ int crypto_stream_xor(
 {
   unsigned char in[16];
   unsigned char block[64];
-  unsigned long long i;
+  unsigned char kcopy[32];
+  unsigned int i;
   unsigned int u;
 
   if (!mlen) return 0;
 
+  for (i = 0;i < 32;++i) kcopy[i] = k[i];
   for (i = 0;i < 8;++i) in[i] = n[i];
   for (i = 8;i < 16;++i) in[i] = 0;
 
   while (mlen >= 64) {
-    crypto_core_salsa208(block,in,k,sigma);
+    crypto_core_salsa208(block,in,kcopy,sigma);
     for (i = 0;i < 64;++i) c[i] = m[i] ^ block[i];
 
     u = 1;
@@ -47,8 +50,11 @@ int crypto_stream_xor(
   }
 
   if (mlen) {
-    crypto_core_salsa208(block,in,k,sigma);
-    for (i = 0;i < mlen;++i) c[i] = m[i] ^ block[i];
+    crypto_core_salsa208(block,in,kcopy,sigma);
+    for (i = 0;i < (unsigned int) mlen;++i) c[i] = m[i] ^ block[i];
   }
+  sodium_memzero(block, sizeof block);
+  sodium_memzero(kcopy, sizeof kcopy);
+
   return 0;
 }

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

@@ -7,6 +7,7 @@ Public domain.
 #include "api.h"
 #include "crypto_core_hsalsa20.h"
 #include "crypto_stream_salsa20.h"
+#include "utils.h"
 
 static const unsigned char sigma[16] = {
     'e', 'x', 'p', 'a', 'n', 'd', ' ', '3', '2', '-', 'b', 'y', 't', 'e', ' ', 'k'
@@ -19,6 +20,9 @@ int crypto_stream(
 )
 {
   unsigned char subkey[32];
+  int ret;
   crypto_core_hsalsa20(subkey,n,k,sigma);
-  return crypto_stream_salsa20(c,clen,n + 16,subkey);
+  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

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

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

@@ -239,6 +239,7 @@ SODIUM_LIBRARY_VERSION = @SODIUM_LIBRARY_VERSION@
 SODIUM_LIBRARY_VERSION_MAJOR = @SODIUM_LIBRARY_VERSION_MAJOR@
 SODIUM_LIBRARY_VERSION_MINOR = @SODIUM_LIBRARY_VERSION_MINOR@
 STRIP = @STRIP@
+TEST_LDFLAGS = @TEST_LDFLAGS@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@

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

@@ -2,49 +2,49 @@
 #ifndef sodium_H
 #define sodium_H
 
-#include <sodium/core.h>
-#include <sodium/crypto_aead_chacha20poly1305.h>
-#include <sodium/crypto_auth.h>
-#include <sodium/crypto_auth_hmacsha256.h>
-#include <sodium/crypto_auth_hmacsha512.h>
-#include <sodium/crypto_auth_hmacsha512256.h>
-#include <sodium/crypto_box.h>
-#include <sodium/crypto_box_curve25519xsalsa20poly1305.h>
-#include <sodium/crypto_core_hsalsa20.h>
-#include <sodium/crypto_core_salsa20.h>
-#include <sodium/crypto_core_salsa2012.h>
-#include <sodium/crypto_core_salsa208.h>
-#include <sodium/crypto_generichash.h>
-#include <sodium/crypto_generichash_blake2b.h>
-#include <sodium/crypto_hash.h>
-#include <sodium/crypto_hash_sha256.h>
-#include <sodium/crypto_hash_sha512.h>
-#include <sodium/crypto_onetimeauth.h>
-#include <sodium/crypto_onetimeauth_poly1305.h>
-#include <sodium/crypto_pwhash_scryptsalsa208sha256.h>
-#include <sodium/crypto_scalarmult.h>
-#include <sodium/crypto_scalarmult_curve25519.h>
-#include <sodium/crypto_secretbox.h>
-#include <sodium/crypto_secretbox_xsalsa20poly1305.h>
-#include <sodium/crypto_shorthash.h>
-#include <sodium/crypto_shorthash_siphash24.h>
-#include <sodium/crypto_sign.h>
-#include <sodium/crypto_sign_ed25519.h>
-#include <sodium/crypto_stream.h>
-#include <sodium/crypto_stream_aes128ctr.h>
-#include <sodium/crypto_stream_chacha20.h>
-#include <sodium/crypto_stream_salsa20.h>
-#include <sodium/crypto_stream_salsa2012.h>
-#include <sodium/crypto_stream_salsa208.h>
-#include <sodium/crypto_stream_xsalsa20.h>
-#include <sodium/crypto_verify_16.h>
-#include <sodium/crypto_verify_32.h>
-#include <sodium/crypto_verify_64.h>
-#include <sodium/randombytes.h>
-#include <sodium/randombytes_salsa20_random.h>
-#include <sodium/randombytes_sysrandom.h>
-#include <sodium/runtime.h>
-#include <sodium/utils.h>
-#include <sodium/version.h>
+#include "sodium/core.h"
+#include "sodium/crypto_aead_chacha20poly1305.h"
+#include "sodium/crypto_auth.h"
+#include "sodium/crypto_auth_hmacsha256.h"
+#include "sodium/crypto_auth_hmacsha512.h"
+#include "sodium/crypto_auth_hmacsha512256.h"
+#include "sodium/crypto_box.h"
+#include "sodium/crypto_box_curve25519xsalsa20poly1305.h"
+#include "sodium/crypto_core_hsalsa20.h"
+#include "sodium/crypto_core_salsa20.h"
+#include "sodium/crypto_core_salsa2012.h"
+#include "sodium/crypto_core_salsa208.h"
+#include "sodium/crypto_generichash.h"
+#include "sodium/crypto_generichash_blake2b.h"
+#include "sodium/crypto_hash.h"
+#include "sodium/crypto_hash_sha256.h"
+#include "sodium/crypto_hash_sha512.h"
+#include "sodium/crypto_onetimeauth.h"
+#include "sodium/crypto_onetimeauth_poly1305.h"
+#include "sodium/crypto_pwhash_scryptsalsa208sha256.h"
+#include "sodium/crypto_scalarmult.h"
+#include "sodium/crypto_scalarmult_curve25519.h"
+#include "sodium/crypto_secretbox.h"
+#include "sodium/crypto_secretbox_xsalsa20poly1305.h"
+#include "sodium/crypto_shorthash.h"
+#include "sodium/crypto_shorthash_siphash24.h"
+#include "sodium/crypto_sign.h"
+#include "sodium/crypto_sign_ed25519.h"
+#include "sodium/crypto_stream.h"
+#include "sodium/crypto_stream_aes128ctr.h"
+#include "sodium/crypto_stream_chacha20.h"
+#include "sodium/crypto_stream_salsa20.h"
+#include "sodium/crypto_stream_salsa2012.h"
+#include "sodium/crypto_stream_salsa208.h"
+#include "sodium/crypto_stream_xsalsa20.h"
+#include "sodium/crypto_verify_16.h"
+#include "sodium/crypto_verify_32.h"
+#include "sodium/crypto_verify_64.h"
+#include "sodium/randombytes.h"
+#include "sodium/randombytes_salsa20_random.h"
+#include "sodium/randombytes_sysrandom.h"
+#include "sodium/runtime.h"
+#include "sodium/utils.h"
+#include "sodium/version.h"
 
 #endif