rbnacl-libsodium 1.0.1 → 1.0.2

data/vendor/libsodium/test/Makefile.in

@@ -250,6 +250,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/test/default/Makefile.am

@@ -2,6 +2,7 @@
 EXTRA_DIST = \
 	cmptest.h \
 	wintest.bat \
+	pre.js.inc \
 	aead_chacha20poly1305.exp \
 	auth.exp \
 	auth2.exp \
@@ -127,6 +128,8 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/src/libsodium/include/sodium \
 	-I$(top_srcdir)/test/quirks
 
+AM_LDFLAGS = @TEST_LDFLAGS@
+
 TESTS_TARGETS = \
 	aead_chacha20poly1305 \
 	auth \
@@ -176,8 +179,6 @@ TESTS_TARGETS = \
 	sign \
 	sodium_core \
 	sodium_utils \
-	sodium_utils2 \
-	sodium_utils3 \
 	sodium_version \
 	stream \
 	stream2 \
@@ -185,6 +186,12 @@ TESTS_TARGETS = \
 	stream4 \
 	verify1
 
+if !EMSCRIPTEN
+TESTS_TARGETS += \
+	sodium_utils2 \
+	sodium_utils3
+endif
+
 check_PROGRAMS = $(TESTS_TARGETS)
 
 TESTS = $(TESTS_TARGETS)

data/vendor/libsodium/test/default/Makefile.in

@@ -77,8 +77,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-check_PROGRAMS = $(am__EXEEXT_1)
-TESTS = $(am__EXEEXT_1)
+@EMSCRIPTEN_FALSE@am__append_1 = \
+@EMSCRIPTEN_FALSE@	sodium_utils2 \
+@EMSCRIPTEN_FALSE@	sodium_utils3
+
+check_PROGRAMS = $(am__EXEEXT_2)
+TESTS = $(am__EXEEXT_2)
 subdir = test/default
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/build-aux/depcomp \
@@ -95,7 +99,9 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__EXEEXT_1 = aead_chacha20poly1305$(EXEEXT) auth$(EXEEXT) \
+@EMSCRIPTEN_FALSE@am__EXEEXT_1 = sodium_utils2$(EXEEXT) \
+@EMSCRIPTEN_FALSE@	sodium_utils3$(EXEEXT)
+am__EXEEXT_2 = aead_chacha20poly1305$(EXEEXT) auth$(EXEEXT) \
 	auth2$(EXEEXT) auth3$(EXEEXT) auth5$(EXEEXT) auth6$(EXEEXT) \
 	auth7$(EXEEXT) box$(EXEEXT) box2$(EXEEXT) box7$(EXEEXT) \
 	box8$(EXEEXT) box_easy$(EXEEXT) box_easy2$(EXEEXT) \
@@ -111,10 +117,9 @@ am__EXEEXT_1 = aead_chacha20poly1305$(EXEEXT) auth$(EXEEXT) \
 	secretbox2$(EXEEXT) secretbox7$(EXEEXT) secretbox8$(EXEEXT) \
 	secretbox_easy$(EXEEXT) secretbox_easy2$(EXEEXT) \
 	shorthash$(EXEEXT) sign$(EXEEXT) sodium_core$(EXEEXT) \
-	sodium_utils$(EXEEXT) sodium_utils2$(EXEEXT) \
-	sodium_utils3$(EXEEXT) sodium_version$(EXEEXT) stream$(EXEEXT) \
+	sodium_utils$(EXEEXT) sodium_version$(EXEEXT) stream$(EXEEXT) \
 	stream2$(EXEEXT) stream3$(EXEEXT) stream4$(EXEEXT) \
-	verify1$(EXEEXT)
+	verify1$(EXEEXT) $(am__EXEEXT_1)
 aead_chacha20poly1305_SOURCES = aead_chacha20poly1305.c
 aead_chacha20poly1305_OBJECTS = aead_chacha20poly1305.$(OBJEXT)
 aead_chacha20poly1305_DEPENDENCIES = $(TESTS_LDADD)
@@ -652,6 +657,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@
@@ -708,6 +714,7 @@ top_srcdir = @top_srcdir@
 EXTRA_DIST = \
 	cmptest.h \
 	wintest.bat \
+	pre.js.inc \
 	aead_chacha20poly1305.exp \
 	auth.exp \
 	auth2.exp \
@@ -833,64 +840,17 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/src/libsodium/include/sodium \
 	-I$(top_srcdir)/test/quirks
 
-TESTS_TARGETS = \
-	aead_chacha20poly1305 \
-	auth \
-	auth2 \
-	auth3 \
-	auth5 \
-	auth6 \
-	auth7 \
-	box \
-	box2 \
-	box7 \
-	box8 \
-	box_easy \
-	box_easy2 \
-	box_seed \
-	chacha20 \
-	core1 \
-	core2 \
-	core3 \
-	core4 \
-	core5 \
-	core6 \
-	ed25519_convert \
-	generichash \
-	generichash2 \
-	generichash3 \
-	hash \
-	hash3 \
-	onetimeauth \
-	onetimeauth2 \
-	onetimeauth7 \
-	pwhash \
-	pwhash_scrypt_ll \
-	randombytes \
-	scalarmult \
-	scalarmult2 \
-	scalarmult5 \
-	scalarmult6 \
-	scalarmult7 \
-	secretbox \
-	secretbox2 \
-	secretbox7 \
-	secretbox8 \
-	secretbox_easy \
-	secretbox_easy2 \
-	shorthash \
-	sign \
-	sodium_core \
-	sodium_utils \
-	sodium_utils2 \
-	sodium_utils3 \
-	sodium_version \
-	stream \
-	stream2 \
-	stream3 \
-	stream4 \
-	verify1
-
+AM_LDFLAGS = @TEST_LDFLAGS@
+TESTS_TARGETS = aead_chacha20poly1305 auth auth2 auth3 auth5 auth6 \
+	auth7 box box2 box7 box8 box_easy box_easy2 box_seed chacha20 \
+	core1 core2 core3 core4 core5 core6 ed25519_convert \
+	generichash generichash2 generichash3 hash hash3 onetimeauth \
+	onetimeauth2 onetimeauth7 pwhash pwhash_scrypt_ll randombytes \
+	scalarmult scalarmult2 scalarmult5 scalarmult6 scalarmult7 \
+	secretbox secretbox2 secretbox7 secretbox8 secretbox_easy \
+	secretbox_easy2 shorthash sign sodium_core sodium_utils \
+	sodium_version stream stream2 stream3 stream4 verify1 \
+	$(am__append_1)
 TESTS_LDADD = \
 	${top_builddir}/src/libsodium/libsodium.la
 
@@ -1896,20 +1856,6 @@ sodium_utils.log: sodium_utils$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-sodium_utils2.log: sodium_utils2$(EXEEXT)
-	@p='sodium_utils2$(EXEEXT)'; \
-	b='sodium_utils2'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-sodium_utils3.log: sodium_utils3$(EXEEXT)
-	@p='sodium_utils3$(EXEEXT)'; \
-	b='sodium_utils3'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 sodium_version.log: sodium_version$(EXEEXT)
 	@p='sodium_version$(EXEEXT)'; \
 	b='sodium_version'; \
@@ -1952,6 +1898,20 @@ verify1.log: verify1$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+sodium_utils2.log: sodium_utils2$(EXEEXT)
+	@p='sodium_utils2$(EXEEXT)'; \
+	b='sodium_utils2'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+sodium_utils3.log: sodium_utils3$(EXEEXT)
+	@p='sodium_utils3$(EXEEXT)'; \
+	b='sodium_utils3'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 .test.log:
 	@p='$<'; \
 	$(am__set_b); \

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

@@ -5,18 +5,28 @@
 unsigned char m[10000];
 unsigned char m2[10000];
 unsigned char c[crypto_box_MACBYTES + 10000];
-unsigned char nonce[crypto_box_NONCEBYTES];
-unsigned char alicepk[crypto_box_PUBLICKEYBYTES];
-unsigned char alicesk[crypto_box_SECRETKEYBYTES];
-unsigned char bobpk[crypto_box_PUBLICKEYBYTES];
-unsigned char bobsk[crypto_box_SECRETKEYBYTES];
-unsigned char mac[crypto_box_MACBYTES];
 
 int main(void)
 {
-    size_t mlen;
-    size_t i;
+    unsigned char *alicepk;
+    unsigned char *alicesk;
+    unsigned char *bobpk;
+    unsigned char *bobsk;
+    unsigned char *mac;
+    unsigned char *nonce;
+    unsigned char *k1;
+    unsigned char *k2;
+    size_t         mlen;
+    size_t         i;
 
+    alicepk = (unsigned char *) sodium_malloc(crypto_box_PUBLICKEYBYTES);
+    alicesk = (unsigned char *) sodium_malloc(crypto_box_SECRETKEYBYTES);
+    bobpk = (unsigned char *) sodium_malloc(crypto_box_PUBLICKEYBYTES);
+    bobsk = (unsigned char *) sodium_malloc(crypto_box_SECRETKEYBYTES);
+    mac = (unsigned char *) sodium_malloc(crypto_box_MACBYTES);
+    nonce = (unsigned char *) sodium_malloc(crypto_box_NONCEBYTES);
+    k1 = (unsigned char *) sodium_malloc(crypto_box_BEFORENMBYTES);
+    k2 = (unsigned char *) sodium_malloc(crypto_box_BEFORENMBYTES);
     crypto_box_keypair(alicepk, alicesk);
     crypto_box_keypair(bobpk, bobsk);
     mlen = (size_t) randombytes_uniform((uint32_t)sizeof m);
@@ -49,11 +59,46 @@ int main(void)
         printf("crypto_box_open_easy() failed\n");
     }
 
+    crypto_box_beforenm(k1, alicepk, bobsk);
+    crypto_box_beforenm(k2, bobpk, alicesk);
+
+    memset(m2, 0, sizeof m2);
+
+    if (crypto_box_easy_afternm(c, m, SIZE_MAX - 1U, nonce, k1) == 0) {
+        printf("crypto_box_easy_afternm() with a short ciphertext should have failed\n");
+    }
+    crypto_box_easy_afternm(c, m, (unsigned long long) mlen, nonce, k1);
+    crypto_box_open_easy_afternm(m2, c,
+                                 (unsigned long long) mlen + crypto_box_MACBYTES,
+                                 nonce, k2);
+    printf("%d\n", memcmp(m, m2, mlen));
+    if (crypto_box_open_easy_afternm(m2, c, crypto_box_MACBYTES - 1U,
+                                     nonce, k2) == 0) {
+        printf("crypto_box_open_easy_afternm() with a huge ciphertext should have failed\n");
+    }
+    memset(m2, 0, sizeof m2);
     crypto_box_detached(c, mac, m, (unsigned long long) mlen,
-                        nonce, bobsk, alicepk);
+                        nonce, alicepk, bobsk);
     crypto_box_open_detached(m2, c, mac, (unsigned long long) mlen,
-                             nonce, alicepk, bobsk);
+                             nonce, bobpk, alicesk);
+    printf("%d\n", memcmp(m, m2, mlen));
+
+    memset(m2, 0, sizeof m2);
+    crypto_box_detached_afternm(c, mac, m, (unsigned long long) mlen,
+                                nonce, k1);
+    crypto_box_open_detached_afternm(m2, c, mac, (unsigned long long) mlen,
+                                     nonce, k2);
     printf("%d\n", memcmp(m, m2, mlen));
 
+    sodium_free(alicepk);
+    sodium_free(alicesk);
+    sodium_free(bobpk);
+    sodium_free(bobsk);
+    sodium_free(mac);
+    sodium_free(nonce);
+    sodium_free(k1);
+    sodium_free(k2);
+    printf("OK\n");
+
     return 0;
 }

data/vendor/libsodium/test/default/box_easy2.exp

@@ -2,3 +2,6 @@
 0
 0
 0
+0
+0
+OK

data/vendor/libsodium/test/default/cmptest.h

@@ -10,6 +10,10 @@
 
 #include "sodium.h"
 
+#ifdef __EMSCRIPTEN__
+# undef TEST_SRCDIR
+# define TEST_SRCDIR "/test-data"
+#endif
 #ifndef TEST_SRCDIR
 # define TEST_SRCDIR "."
 #endif

data/vendor/libsodium/test/default/{pre.js → pre.js.inc}

@@ -6,7 +6,7 @@ try {
 }
 Module['preRun'] = Module['preRun'] || [];
 Module['preRun'].push(function(){
-    var randombyte = null;    
+    var randombyte = null;
     try {
         function randombyte_standard() {
             var buf = new Int8Array(1);            
@@ -23,11 +23,17 @@ Module['preRun'].push(function(){
             }
             randombyte_node();
             randombyte = randombyte_node;
-        } catch(e) { }
+        } catch(e) {
+            throw 'No secure random number generator found';
+        }
     }
     FS.init();
+    FS.mkdir('/test-data');
+    FS.mount(NODEFS,  { root: '.' }, '/test-data');
+    FS.analyzePath('/dev/random').exists && FS.unlink('/dev/random');
+    FS.analyzePath('/dev/urandom') && FS.unlink('/dev/urandom');
     var devFolder = FS.findObject('/dev') ||
-        Module['FS_createFolder']('/', 'dev', true, true);    
+        Module['FS_createFolder']('/', 'dev', true, true);
     Module['FS_createDevice'](devFolder, 'random', randombyte);
-    Module['FS_createDevice'](devFolder, 'urandom', randombyte);    
+    Module['FS_createDevice'](devFolder, 'urandom', randombyte);
 });

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

@@ -2,6 +2,10 @@
 #define TEST_NAME "pwhash"
 #include "cmptest.h"
 
+#define OUT_LEN 128
+#define OPSLIMIT 1000000
+#define MEMLIMIT 10000000
+
 static void tv(void)
 {
     static struct {
@@ -267,8 +271,10 @@ static void tv3(void)
 
     do {
         out = (char *) sodium_malloc(strlen(tests[i].out) + 1U);
+        assert(out != NULL);
         memcpy(out, tests[i].out, strlen(tests[i].out) + 1U);
         passwd = (char *) sodium_malloc(strlen(tests[i].passwd) + 1U);
+        assert(passwd != NULL);
         memcpy(passwd, tests[i].passwd, strlen(tests[i].passwd) + 1U);
         if (crypto_pwhash_scryptsalsa208sha256_str_verify(
                 out, passwd, strlen(passwd)) != 0) {
@@ -279,10 +285,6 @@ static void tv3(void)
     } while (++i < (sizeof tests) / (sizeof tests[0]));
 }
 
-#define OUT_LEN 128
-#define OPSLIMIT 1000000
-#define MEMLIMIT 10000000
-
 int main(void)
 {
     char        str_out[crypto_pwhash_scryptsalsa208sha256_STRBYTES];

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

@@ -12,8 +12,6 @@ unsigned char alicepk_[crypto_scalarmult_SCALARBYTES]
         0xdc, 0xb4, 0x3e, 0xf7, 0x5a, 0x0d, 0xbf, 0x3a, 0x0d, 0x26, 0x38,
         0x1a, 0xf4, 0xeb, 0xa4, 0xa9, 0x8e, 0xaa, 0x9b, 0x4e, 0x6a };
 
-unsigned char k[32];
-
 int main(void)
 {
     unsigned char *k;

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

@@ -1091,7 +1091,7 @@ int main(void)
             printf("signature failure: [%u]\n", i);
             continue;
         }
-        if (crypto_sign_open(m, &mlen, sm, smlen, test_data[i].pk) != 0) {
+        if (crypto_sign_open(m, NULL, sm, smlen, test_data[i].pk) != 0) {
             printf("crypto_sign_open() failure: [%u]\n", i);
             continue;
         }

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

@@ -48,8 +48,9 @@ int main(void)
     for (i = 0U; i < 10000U; i++) {
         size = randombytes_uniform(100000U);
         buf = sodium_malloc(size);
+        assert(buf != NULL);
         memset(buf, i, size);
-        sodium_mprotect_readonly(buf);
+        sodium_mprotect_noaccess(buf);
         sodium_free(buf);
     }
     printf("OK\n");
@@ -65,12 +66,14 @@ int main(void)
 #endif
     size = randombytes_uniform(100000U);
     buf = sodium_malloc(size);
+    assert(buf != NULL);
     sodium_mprotect_readonly(buf);
     sodium_mprotect_readwrite(buf);
+#ifndef __EMSCRIPTEN__
     sodium_memzero(((unsigned char *)buf) + size, 1U);
     sodium_mprotect_noaccess(buf);
     sodium_free(buf);
     printf("Overflow not caught\n");
-
+#endif
     return 0;
 }

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

@@ -43,12 +43,14 @@ int main(void)
 #endif
     size = randombytes_uniform(100000U);
     buf = sodium_malloc(size);
+    assert(buf != NULL);
     sodium_mprotect_noaccess(buf);
     sodium_mprotect_readwrite(buf);
+#ifndef __EMSCRIPTEN__
     sodium_memzero(((unsigned char *)buf) - 8, 8U);
     sodium_mprotect_readonly(buf);
     sodium_free(buf);
     printf("Underflow not caught\n");
-
+#endif
     return 0;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbnacl-libsodium
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Artiom Di
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2015-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbnacl
@@ -184,6 +184,7 @@ files:
 - vendor/libsodium/dist-build/msys2-win32.sh
 - vendor/libsodium/dist-build/msys2-win64.sh
 - vendor/libsodium/install-sh
+- vendor/libsodium/libsodium-uninstalled.pc.in
 - vendor/libsodium/libsodium.pc.in
 - vendor/libsodium/libsodium.sln
 - vendor/libsodium/libsodium.vcxproj
@@ -572,7 +573,7 @@ files:
 - vendor/libsodium/test/default/onetimeauth2.exp
 - vendor/libsodium/test/default/onetimeauth7.c
 - vendor/libsodium/test/default/onetimeauth7.exp
-- vendor/libsodium/test/default/pre.js
+- vendor/libsodium/test/default/pre.js.inc
 - vendor/libsodium/test/default/pwhash.c
 - vendor/libsodium/test/default/pwhash.exp
 - vendor/libsodium/test/default/pwhash_scrypt_ll.c
@@ -647,7 +648,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: rbnacl with bundled libsodium