rbnacl-libsodium 1.0.4 → 1.0.5

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

@@ -124,18 +124,18 @@ void sc_reduce(unsigned char *s)
   s11 -= s18 * 683901;
 
 
-  carry6 = (s6 + (1<<20)) >> 21; s7 += carry6; s6 -= carry6 << 21;
-  carry8 = (s8 + (1<<20)) >> 21; s9 += carry8; s8 -= carry8 << 21;
-  carry10 = (s10 + (1<<20)) >> 21; s11 += carry10; s10 -= carry10 << 21;
-  carry12 = (s12 + (1<<20)) >> 21; s13 += carry12; s12 -= carry12 << 21;
-  carry14 = (s14 + (1<<20)) >> 21; s15 += carry14; s14 -= carry14 << 21;
-  carry16 = (s16 + (1<<20)) >> 21; s17 += carry16; s16 -= carry16 << 21;
-
-  carry7 = (s7 + (1<<20)) >> 21; s8 += carry7; s7 -= carry7 << 21;
-  carry9 = (s9 + (1<<20)) >> 21; s10 += carry9; s9 -= carry9 << 21;
-  carry11 = (s11 + (1<<20)) >> 21; s12 += carry11; s11 -= carry11 << 21;
-  carry13 = (s13 + (1<<20)) >> 21; s14 += carry13; s13 -= carry13 << 21;
-  carry15 = (s15 + (1<<20)) >> 21; s16 += carry15; s15 -= carry15 << 21;
+  carry6 = (s6 + (1L << 20)) >> 21; s7 += carry6; s6 -= carry6 * (1L << 21);
+  carry8 = (s8 + (1L << 20)) >> 21; s9 += carry8; s8 -= carry8 * (1L << 21);
+  carry10 = (s10 + (1L << 20)) >> 21; s11 += carry10; s10 -= carry10 * (1L << 21);
+  carry12 = (s12 + (1L << 20)) >> 21; s13 += carry12; s12 -= carry12 * (1L << 21);
+  carry14 = (s14 + (1L << 20)) >> 21; s15 += carry14; s14 -= carry14 * (1L << 21);
+  carry16 = (s16 + (1L << 20)) >> 21; s17 += carry16; s16 -= carry16 * (1L << 21);
+
+  carry7 = (s7 + (1L << 20)) >> 21; s8 += carry7; s7 -= carry7 * (1L << 21);
+  carry9 = (s9 + (1L << 20)) >> 21; s10 += carry9; s9 -= carry9 * (1L << 21);
+  carry11 = (s11 + (1L << 20)) >> 21; s12 += carry11; s11 -= carry11 * (1L << 21);
+  carry13 = (s13 + (1L << 20)) >> 21; s14 += carry13; s13 -= carry13 * (1L << 21);
+  carry15 = (s15 + (1L << 20)) >> 21; s16 += carry15; s15 -= carry15 * (1L << 21);
 
   s5 += s17 * 666643;
   s6 += s17 * 470296;
@@ -185,19 +185,19 @@ void sc_reduce(unsigned char *s)
   s5 -= s12 * 683901;
   s12 = 0;
 
-  carry0 = (s0 + (1<<20)) >> 21; s1 += carry0; s0 -= carry0 << 21;
-  carry2 = (s2 + (1<<20)) >> 21; s3 += carry2; s2 -= carry2 << 21;
-  carry4 = (s4 + (1<<20)) >> 21; s5 += carry4; s4 -= carry4 << 21;
-  carry6 = (s6 + (1<<20)) >> 21; s7 += carry6; s6 -= carry6 << 21;
-  carry8 = (s8 + (1<<20)) >> 21; s9 += carry8; s8 -= carry8 << 21;
-  carry10 = (s10 + (1<<20)) >> 21; s11 += carry10; s10 -= carry10 << 21;
+  carry0 = (s0 + (1L << 20)) >> 21; s1 += carry0; s0 -= carry0 * (1L << 21);
+  carry2 = (s2 + (1L << 20)) >> 21; s3 += carry2; s2 -= carry2 * (1L << 21);
+  carry4 = (s4 + (1L << 20)) >> 21; s5 += carry4; s4 -= carry4 * (1L << 21);
+  carry6 = (s6 + (1L << 20)) >> 21; s7 += carry6; s6 -= carry6 * (1L << 21);
+  carry8 = (s8 + (1L << 20)) >> 21; s9 += carry8; s8 -= carry8 * (1L << 21);
+  carry10 = (s10 + (1L << 20)) >> 21; s11 += carry10; s10 -= carry10 * (1L << 21);
 
-  carry1 = (s1 + (1<<20)) >> 21; s2 += carry1; s1 -= carry1 << 21;
-  carry3 = (s3 + (1<<20)) >> 21; s4 += carry3; s3 -= carry3 << 21;
-  carry5 = (s5 + (1<<20)) >> 21; s6 += carry5; s5 -= carry5 << 21;
-  carry7 = (s7 + (1<<20)) >> 21; s8 += carry7; s7 -= carry7 << 21;
-  carry9 = (s9 + (1<<20)) >> 21; s10 += carry9; s9 -= carry9 << 21;
-  carry11 = (s11 + (1<<20)) >> 21; s12 += carry11; s11 -= carry11 << 21;
+  carry1 = (s1 + (1L << 20)) >> 21; s2 += carry1; s1 -= carry1 * (1L << 21);
+  carry3 = (s3 + (1L << 20)) >> 21; s4 += carry3; s3 -= carry3 * (1L << 21);
+  carry5 = (s5 + (1L << 20)) >> 21; s6 += carry5; s5 -= carry5 * (1L << 21);
+  carry7 = (s7 + (1L << 20)) >> 21; s8 += carry7; s7 -= carry7 * (1L << 21);
+  carry9 = (s9 + (1L << 20)) >> 21; s10 += carry9; s9 -= carry9 * (1L << 21);
+  carry11 = (s11 + (1L << 20)) >> 21; s12 += carry11; s11 -= carry11 * (1L << 21);
 
   s0 += s12 * 666643;
   s1 += s12 * 470296;
@@ -207,18 +207,18 @@ void sc_reduce(unsigned char *s)
   s5 -= s12 * 683901;
   s12 = 0;
 
-  carry0 = s0 >> 21; s1 += carry0; s0 -= carry0 << 21;
-  carry1 = s1 >> 21; s2 += carry1; s1 -= carry1 << 21;
-  carry2 = s2 >> 21; s3 += carry2; s2 -= carry2 << 21;
-  carry3 = s3 >> 21; s4 += carry3; s3 -= carry3 << 21;
-  carry4 = s4 >> 21; s5 += carry4; s4 -= carry4 << 21;
-  carry5 = s5 >> 21; s6 += carry5; s5 -= carry5 << 21;
-  carry6 = s6 >> 21; s7 += carry6; s6 -= carry6 << 21;
-  carry7 = s7 >> 21; s8 += carry7; s7 -= carry7 << 21;
-  carry8 = s8 >> 21; s9 += carry8; s8 -= carry8 << 21;
-  carry9 = s9 >> 21; s10 += carry9; s9 -= carry9 << 21;
-  carry10 = s10 >> 21; s11 += carry10; s10 -= carry10 << 21;
-  carry11 = s11 >> 21; s12 += carry11; s11 -= carry11 << 21;
+  carry0 = s0 >> 21; s1 += carry0; s0 -= carry0 * (1L << 21);
+  carry1 = s1 >> 21; s2 += carry1; s1 -= carry1 * (1L << 21);
+  carry2 = s2 >> 21; s3 += carry2; s2 -= carry2 * (1L << 21);
+  carry3 = s3 >> 21; s4 += carry3; s3 -= carry3 * (1L << 21);
+  carry4 = s4 >> 21; s5 += carry4; s4 -= carry4 * (1L << 21);
+  carry5 = s5 >> 21; s6 += carry5; s5 -= carry5 * (1L << 21);
+  carry6 = s6 >> 21; s7 += carry6; s6 -= carry6 * (1L << 21);
+  carry7 = s7 >> 21; s8 += carry7; s7 -= carry7 * (1L << 21);
+  carry8 = s8 >> 21; s9 += carry8; s8 -= carry8 * (1L << 21);
+  carry9 = s9 >> 21; s10 += carry9; s9 -= carry9 * (1L << 21);
+  carry10 = s10 >> 21; s11 += carry10; s10 -= carry10 * (1L << 21);
+  carry11 = s11 >> 21; s12 += carry11; s11 -= carry11 * (1L << 21);
 
   s0 += s12 * 666643;
   s1 += s12 * 470296;
@@ -228,17 +228,17 @@ void sc_reduce(unsigned char *s)
   s5 -= s12 * 683901;
 
 
-  carry0 = s0 >> 21; s1 += carry0; s0 -= carry0 << 21;
-  carry1 = s1 >> 21; s2 += carry1; s1 -= carry1 << 21;
-  carry2 = s2 >> 21; s3 += carry2; s2 -= carry2 << 21;
-  carry3 = s3 >> 21; s4 += carry3; s3 -= carry3 << 21;
-  carry4 = s4 >> 21; s5 += carry4; s4 -= carry4 << 21;
-  carry5 = s5 >> 21; s6 += carry5; s5 -= carry5 << 21;
-  carry6 = s6 >> 21; s7 += carry6; s6 -= carry6 << 21;
-  carry7 = s7 >> 21; s8 += carry7; s7 -= carry7 << 21;
-  carry8 = s8 >> 21; s9 += carry8; s8 -= carry8 << 21;
-  carry9 = s9 >> 21; s10 += carry9; s9 -= carry9 << 21;
-  carry10 = s10 >> 21; s11 += carry10; s10 -= carry10 << 21;
+  carry0 = s0 >> 21; s1 += carry0; s0 -= carry0 * (1L << 21);
+  carry1 = s1 >> 21; s2 += carry1; s1 -= carry1 * (1L << 21);
+  carry2 = s2 >> 21; s3 += carry2; s2 -= carry2 * (1L << 21);
+  carry3 = s3 >> 21; s4 += carry3; s3 -= carry3 * (1L << 21);
+  carry4 = s4 >> 21; s5 += carry4; s4 -= carry4 * (1L << 21);
+  carry5 = s5 >> 21; s6 += carry5; s5 -= carry5 * (1L << 21);
+  carry6 = s6 >> 21; s7 += carry6; s6 -= carry6 * (1L << 21);
+  carry7 = s7 >> 21; s8 += carry7; s7 -= carry7 * (1L << 21);
+  carry8 = s8 >> 21; s9 += carry8; s8 -= carry8 * (1L << 21);
+  carry9 = s9 >> 21; s10 += carry9; s9 -= carry9 * (1L << 21);
+  carry10 = s10 >> 21; s11 += carry10; s10 -= carry10 * (1L << 21);
 
   s[0] = s0 >> 0;
   s[1] = s0 >> 8;

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

@@ -14,7 +14,12 @@
 extern "C" {
 #endif
 
-#pragma pack(push, 1)
+#ifdef __SUNPRO_C
+# pragma pack(1)
+#else
+# pragma pack(push, 1)
+#endif
+
 typedef CRYPTO_ALIGN(64) struct crypto_generichash_blake2b_state {
     uint64_t h[8];
     uint64_t t[2];
@@ -23,7 +28,12 @@ typedef CRYPTO_ALIGN(64) struct crypto_generichash_blake2b_state {
     size_t   buflen;
     uint8_t  last_node;
 } crypto_generichash_blake2b_state;
-#pragma pack(pop)
+
+#ifdef __SUNPRO_C
+# pragma pack()
+#else
+# pragma pack(pop)
+#endif
 
 #define crypto_generichash_blake2b_BYTES_MIN     16U
 SODIUM_EXPORT

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

@@ -20,7 +20,11 @@
 #  endif
 # else
 #  if defined(__SUNPRO_C)
-#   define SODIUM_EXPORT __attribute__ __global
+#   ifndef __GNU_C__
+#    define SODIUM_EXPORT __attribute__(visibility(__global))
+#   else
+#    define SODIUM_EXPORT __attribute__ __global
+#   endif
 #  elif defined(_MSG_VER)
 #   define SODIUM_EXPORT extern __declspec(dllexport)
 #  else

data/vendor/libsodium/src/libsodium/randombytes/randombytes.c

@@ -81,12 +81,12 @@ randombytes_stir(void)
             } catch (e) {
                 try {
                     var crypto = require('crypto'),
-                        randomValueIOJS = function() {
+                        randomValueNodeJS = function() {
                             var buf = crypto.randomBytes(4);
                             return (buf[0] << 24 | buf[1] << 16 | buf[2] << 8 | buf[3]) >>> 0;
                         };
-                    randomValueIOJS();
-                    Module.getRandomValue = randomValueIOJS;
+                    randomValueNodeJS();
+                    Module.getRandomValue = randomValueNodeJS;
                 } catch (e) {
                     throw 'No secure random number generator found';
                 }

data/vendor/libsodium/test/default/generichash.c

@@ -1301,9 +1301,9 @@ tv(void)
     size_t         i = 0U;
     size_t         in_len;
 
-    key = sodium_malloc(crypto_generichash_KEYBYTES_MAX);
-    out = sodium_malloc(crypto_generichash_BYTES_MAX);
-    expected_out = sodium_malloc(crypto_generichash_BYTES_MAX);
+    key = (unsigned char *) sodium_malloc(crypto_generichash_KEYBYTES_MAX);
+    out = (unsigned char *) sodium_malloc(crypto_generichash_BYTES_MAX);
+    expected_out = (unsigned char *) sodium_malloc(crypto_generichash_BYTES_MAX);
     do {
         assert(strlen(tests[i].key_hex) == 2 * crypto_generichash_KEYBYTES_MAX);
         sodium_hex2bin(key, crypto_generichash_KEYBYTES_MAX,
@@ -1314,7 +1314,7 @@ tv(void)
                        tests[i].out_hex, strlen(tests[i].out_hex),
                        NULL, NULL, NULL);
         in_len = strlen(tests[i].in_hex) / 2;
-        in = sodium_malloc(in_len);
+        in = (unsigned char *) sodium_malloc(in_len);
         sodium_hex2bin(in, in_len, tests[i].in_hex, strlen(tests[i].in_hex),
                        NULL, NULL, NULL);
         crypto_generichash(out, crypto_generichash_BYTES_MAX,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbnacl-libsodium
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Artiom Di
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2015-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbnacl