rbnacl-libsodium 0.4.5 → 0.5.0

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

@@ -1,8 +1,5 @@
 
 #include "crypto_stream_salsa20.h"
 
-#define crypto_stream_salsa20_implementation_name \
-    crypto_stream_salsa20_ref_implementation_name
-
-#define crypto_stream crypto_stream_salsa20_ref
-#define crypto_stream_xor crypto_stream_salsa20_ref_xor
+#define crypto_stream crypto_stream_salsa20
+#define crypto_stream_xor crypto_stream_salsa20_xor

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

@@ -1,11 +1,12 @@
 /*
-version 20080913
+version 20140420
 D. J. Bernstein
 Public domain.
 */
 
 #include "api.h"
 #include "crypto_core_salsa20.h"
+#include "utils.h"
 
 #ifndef HAVE_AMD64_ASM
 
@@ -23,16 +24,18 @@ int crypto_stream(
 {
   unsigned char in[16];
   unsigned char block[64];
+  unsigned char kcopy[32];
   unsigned long long 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_salsa20(c,in,k,sigma);
+    crypto_core_salsa20(c,in,kcopy,sigma);
 
     u = 1;
     for (i = 8;i < 16;++i) {
@@ -46,9 +49,12 @@ int crypto_stream(
   }
 
   if (clen) {
-    crypto_core_salsa20(block,in,k,sigma);
+    crypto_core_salsa20(block,in,kcopy,sigma);
     for (i = 0;i < 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/salsa20/ref/xor_salsa20_ref.c

@@ -1,11 +1,12 @@
 /*
-version 20080913
+version 20140420
 D. J. Bernstein
 Public domain.
 */
 
 #include "api.h"
 #include "crypto_core_salsa20.h"
+#include "utils.h"
 
 #ifndef HAVE_AMD64_ASM
 
@@ -24,16 +25,18 @@ int crypto_stream_xor(
 {
   unsigned char in[16];
   unsigned char block[64];
+  unsigned char kcopy[32];
   unsigned long long 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_salsa20(block,in,k,sigma);
+    crypto_core_salsa20(block,in,kcopy,sigma);
     for (i = 0;i < 64;++i) c[i] = m[i] ^ block[i];
 
     u = 1;
@@ -49,9 +52,12 @@ int crypto_stream_xor(
   }
 
   if (mlen) {
-    crypto_core_salsa20(block,in,k,sigma);
+    crypto_core_salsa20(block,in,kcopy,sigma);
     for (i = 0;i < 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/salsa20/stream_salsa20_api.c

@@ -9,8 +9,3 @@ size_t
 crypto_stream_salsa20_noncebytes(void) {
     return crypto_stream_salsa20_NONCEBYTES;
 }
-
-const char *
-crypto_stream_salsa20_primitive(void) {
-    return "salsa20";
-}

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

@@ -5,7 +5,6 @@
 #define crypto_stream_xor crypto_stream_salsa2012_xor
 #define crypto_stream_KEYBYTES crypto_stream_salsa2012_KEYBYTES
 #define crypto_stream_NONCEBYTES crypto_stream_salsa2012_NONCEBYTES
-#define crypto_stream_PRIMITIVE "salsa2012"
 #define crypto_stream_IMPLEMENTATION crypto_stream_salsa2012_IMPLEMENTATION
 #define crypto_stream_VERSION crypto_stream_salsa2012_VERSION
 

data/vendor/libsodium/src/libsodium/crypto_stream/salsa2012/stream_salsa2012_api.c

@@ -9,8 +9,3 @@ size_t
 crypto_stream_salsa2012_noncebytes(void) {
     return crypto_stream_salsa2012_NONCEBYTES;
 }
-
-const char *
-crypto_stream_salsa2012_primitive(void) {
-    return "salsa2012";
-}

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

@@ -5,6 +5,5 @@
 #define crypto_stream_xor crypto_stream_salsa208_xor
 #define crypto_stream_KEYBYTES crypto_stream_salsa208_KEYBYTES
 #define crypto_stream_NONCEBYTES crypto_stream_salsa208_NONCEBYTES
-#define crypto_stream_PRIMITIVE "salsa208"
 #define crypto_stream_IMPLEMENTATION crypto_stream_salsa208_IMPLEMENTATION
 #define crypto_stream_VERSION crypto_stream_salsa208_VERSION

data/vendor/libsodium/src/libsodium/crypto_stream/salsa208/stream_salsa208_api.c

@@ -9,8 +9,3 @@ size_t
 crypto_stream_salsa208_noncebytes(void) {
     return crypto_stream_salsa208_NONCEBYTES;
 }
-
-const char *
-crypto_stream_salsa208_primitive(void) {
-    return "salsa208";
-}

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

@@ -5,7 +5,6 @@
 #define crypto_stream_xor crypto_stream_xsalsa20_xor
 #define crypto_stream_KEYBYTES crypto_stream_xsalsa20_KEYBYTES
 #define crypto_stream_NONCEBYTES crypto_stream_xsalsa20_NONCEBYTES
-#define crypto_stream_PRIMITIVE "xsalsa20"
 #define crypto_stream_IMPLEMENTATION crypto_stream_xsalsa20_IMPLEMENTATION
 #define crypto_stream_VERSION crypto_stream_xsalsa20_VERSION
 

data/vendor/libsodium/src/libsodium/crypto_stream/xsalsa20/stream_xsalsa20_api.c

@@ -9,8 +9,3 @@ size_t
 crypto_stream_xsalsa20_noncebytes(void) {
     return crypto_stream_xsalsa20_NONCEBYTES;
 }
-
-const char *
-crypto_stream_xsalsa20_primitive(void) {
-    return "xsalsa20";
-}

data/vendor/libsodium/src/libsodium/crypto_verify/64/ref/api.h

@@ -0,0 +1,2 @@
+
+#include "crypto_verify_64.h"

data/vendor/libsodium/src/libsodium/crypto_verify/64/ref/verify_64.c

@@ -0,0 +1,72 @@
+#include "api.h"
+
+int crypto_verify_64(const unsigned char *x,const unsigned char *y)
+{
+  unsigned int differentbits = 0;
+#define F(i) differentbits |= x[i] ^ y[i];
+  F(0)
+  F(1)
+  F(2)
+  F(3)
+  F(4)
+  F(5)
+  F(6)
+  F(7)
+  F(8)
+  F(9)
+  F(10)
+  F(11)
+  F(12)
+  F(13)
+  F(14)
+  F(15)
+  F(16)
+  F(17)
+  F(18)
+  F(19)
+  F(20)
+  F(21)
+  F(22)
+  F(23)
+  F(24)
+  F(25)
+  F(26)
+  F(27)
+  F(28)
+  F(29)
+  F(30)
+  F(31)
+  F(32)
+  F(33)
+  F(34)
+  F(35)
+  F(36)
+  F(37)
+  F(38)
+  F(39)
+  F(40)
+  F(41)
+  F(42)
+  F(43)
+  F(44)
+  F(45)
+  F(46)
+  F(47)
+  F(48)
+  F(49)
+  F(50)
+  F(51)
+  F(52)
+  F(53)
+  F(54)
+  F(55)
+  F(56)
+  F(57)
+  F(58)
+  F(59)
+  F(60)
+  F(61)
+  F(62)
+  F(63)
+  return (1 & ((differentbits - 1) >> 8)) - 1;
+}

data/vendor/libsodium/src/libsodium/crypto_verify/64/verify_64_api.c

@@ -0,0 +1,6 @@
+#include "crypto_verify_64.h"
+
+size_t
+crypto_verify_64_bytes(void) {
+    return crypto_verify_64_BYTES;
+}

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

@@ -4,6 +4,7 @@ SODIUM_EXPORT = \
 	sodium/core.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 \
@@ -16,13 +17,12 @@ SODIUM_EXPORT = \
 	sodium/crypto_hash.h \
 	sodium/crypto_hash_sha256.h \
 	sodium/crypto_hash_sha512.h \
-	sodium/crypto_hashblocks_sha256.h \
-	sodium/crypto_hashblocks_sha512.h \
 	sodium/crypto_onetimeauth.h \
 	sodium/crypto_onetimeauth_poly1305.h \
-	sodium/crypto_onetimeauth_poly1305_53.h \
 	sodium/crypto_onetimeauth_poly1305_donna.h \
+	sodium/crypto_pwhash_scryptxsalsa208sha256.h \
 	sodium/crypto_scalarmult.h \
+	sodium/crypto_scalarmult_curve25519.h \
 	sodium/crypto_secretbox.h \
 	sodium/crypto_secretbox_xsalsa20poly1305.h \
 	sodium/crypto_shorthash.h \
@@ -33,6 +33,7 @@ SODIUM_EXPORT = \
 	sodium/crypto_stream.h \
 	sodium/crypto_stream_aes128ctr.h \
 	sodium/crypto_stream_aes256estream.h \
+	sodium/crypto_stream_salsa20.h \
 	sodium/crypto_stream_salsa2012.h \
 	sodium/crypto_stream_salsa208.h \
 	sodium/crypto_stream_xsalsa20.h \
@@ -44,20 +45,18 @@ SODIUM_EXPORT = \
 	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
 
 EXTRA_SRC = $(SODIUM_EXPORT) \
-	sodium/crypto_scalarmult_curve25519.h.in \
-	sodium/crypto_stream_salsa20.h.in \
 	sodium/version.h.in
 
 nobase_include_HEADERS = $(SODIUM_EXPORT)
 
 nobase_nodist_include_HEADERS = \
-	sodium/crypto_scalarmult_curve25519.h \
-	sodium/crypto_stream_salsa20.h \
 	sodium/version.h

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

@@ -5,6 +5,7 @@
 #include <sodium/core.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>
@@ -17,10 +18,9 @@
 #include <sodium/crypto_hash.h>
 #include <sodium/crypto_hash_sha256.h>
 #include <sodium/crypto_hash_sha512.h>
-#include <sodium/crypto_hashblocks_sha256.h>
-#include <sodium/crypto_hashblocks_sha512.h>
 #include <sodium/crypto_onetimeauth.h>
 #include <sodium/crypto_onetimeauth_poly1305.h>
+#include <sodium/crypto_pwhash_scryptxsalsa208sha256.h>
 #include <sodium/crypto_scalarmult.h>
 #include <sodium/crypto_scalarmult_curve25519.h>
 #include <sodium/crypto_secretbox.h>
@@ -29,7 +29,6 @@
 #include <sodium/crypto_shorthash_siphash24.h>
 #include <sodium/crypto_sign.h>
 #include <sodium/crypto_sign_ed25519.h>
-#include <sodium/crypto_sign_edwards25519sha512batch.h>
 #include <sodium/crypto_stream.h>
 #include <sodium/crypto_stream_aes128ctr.h>
 #include <sodium/crypto_stream_aes256estream.h>
@@ -39,9 +38,11 @@
 #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>
 

data/vendor/libsodium/src/libsodium/include/sodium/crypto_auth.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_auth_hmacsha256.h

@@ -2,35 +2,57 @@
 #define crypto_auth_hmacsha256_H
 
 #include <stddef.h>
+#include "crypto_hash_sha256.h"
 #include "export.h"
 
-#define crypto_auth_hmacsha256_BYTES 32U
-#define crypto_auth_hmacsha256_KEYBYTES 32U
-
 #ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
 extern "C" {
 #endif
 
+typedef struct crypto_auth_hmacsha256_state {
+    crypto_hash_sha256_state ictx;
+    crypto_hash_sha256_state octx;
+} crypto_auth_hmacsha256_state;
+
+#define crypto_auth_hmacsha256_BYTES 32U
 SODIUM_EXPORT
 size_t crypto_auth_hmacsha256_bytes(void);
 
+#define crypto_auth_hmacsha256_KEYBYTES 32U
 SODIUM_EXPORT
 size_t crypto_auth_hmacsha256_keybytes(void);
 
 SODIUM_EXPORT
-const char * crypto_auth_hmacsha256_primitive(void);
+int crypto_auth_hmacsha256(unsigned char *out,
+                           const unsigned char *in,
+                           unsigned long long inlen,
+                           const unsigned char *k);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256(unsigned char *,const unsigned char *,unsigned long long,const unsigned char *);
+int crypto_auth_hmacsha256_verify(const unsigned char *h,
+                                  const unsigned char *in,
+                                  unsigned long long inlen,
+                                  const unsigned char *k);
 
 SODIUM_EXPORT
-int crypto_auth_hmacsha256_verify(const unsigned char *,const unsigned char *,unsigned long long,const unsigned char *);
+int crypto_auth_hmacsha256_init(crypto_auth_hmacsha256_state *state,
+                                const unsigned char *key,
+                                size_t keylen);
+
+SODIUM_EXPORT
+int crypto_auth_hmacsha256_update(crypto_auth_hmacsha256_state *state,
+                                  const unsigned char *in,
+                                  unsigned long long inlen);
+
+SODIUM_EXPORT
+int crypto_auth_hmacsha256_final(crypto_auth_hmacsha256_state *state,
+                                 unsigned char *out);
 
 #ifdef __cplusplus
 }
 #endif
 
-#define crypto_auth_hmacsha256_ref crypto_auth_hmacsha256
-#define crypto_auth_hmacsha256_ref_verify crypto_auth_hmacsha256_verify
-
 #endif

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

@@ -0,0 +1,58 @@
+#ifndef crypto_auth_hmacsha512_H
+#define crypto_auth_hmacsha512_H
+
+#include <stddef.h>
+#include "crypto_hash_sha512.h"
+#include "export.h"
+
+#ifdef __cplusplus
+# if __GNUC__
+#  pragma GCC diagnostic ignored "-Wlong-long"
+# endif
+extern "C" {
+#endif
+
+typedef struct crypto_auth_hmacsha512_state {
+    crypto_hash_sha512_state ictx;
+    crypto_hash_sha512_state octx;
+} crypto_auth_hmacsha512_state;
+
+#define crypto_auth_hmacsha512_BYTES 64U
+SODIUM_EXPORT
+size_t crypto_auth_hmacsha512_bytes(void);
+
+#define crypto_auth_hmacsha512_KEYBYTES 32U
+SODIUM_EXPORT
+size_t crypto_auth_hmacsha512_keybytes(void);
+
+SODIUM_EXPORT
+int crypto_auth_hmacsha512(unsigned char *out,
+                           const unsigned char *in,
+                           unsigned long long inlen,
+                           const unsigned char *k);
+
+SODIUM_EXPORT
+int crypto_auth_hmacsha512_verify(const unsigned char *h,
+                                  const unsigned char *in,
+                                  unsigned long long inlen,
+                                  const unsigned char *k);
+
+SODIUM_EXPORT
+int crypto_auth_hmacsha512_init(crypto_auth_hmacsha512_state *state,
+                                const unsigned char *key,
+                                size_t keylen);
+
+SODIUM_EXPORT
+int crypto_auth_hmacsha512_update(crypto_auth_hmacsha512_state *state,
+                                  const unsigned char *in,
+                                  unsigned long long inlen);
+
+SODIUM_EXPORT
+int crypto_auth_hmacsha512_final(crypto_auth_hmacsha512_state *state,
+                                 unsigned char *out);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif