libsodium 1.0.19

jedisct1 · Sep 13, 2023 · d96986a · d96986a
1 parent 10289df
commit d96986a
Show file tree

Hide file tree

Showing 107 changed files with 1,011 additions and 87 deletions.
diff --git a/Makefile b/Makefile
@@ -71,15 +71,15 @@ $(MODULES_SUMO_DIR)/libsodium-sumo.js: wrapper/libsodium-pre.js wrapper/libsodiu
 	cat $(MODULES_SUMO_DIR)/libsodium-sumo.js $(MODULES_SUMO_DIR)/libsodium-wrappers.js > $(BROWSERS_SUMO_DIR)/sodium.js
 
 $(LIBSODIUM_DIR)/test/default/browser/sodium_core.html: $(LIBSODIUM_DIR)/configure
-	cd $(LIBSODIUM_DIR) && ./dist-build/emscripten.sh --browser-tests
+	cd $(LIBSODIUM_DIR) && env CPPFLAGS="-DFAVOR_PERFORMANCE" ./dist-build/emscripten.sh --browser-tests
 	rm -f $(LIBSODIUM_DIR)/test/default/browser/*.asm.html $(LIBSODIUM_DIR)/test/default/browser/*.asm.js
 	rm -fr $(BROWSERS_TEST_DIR) && cp -R $(LIBSODIUM_DIR)/test/default/browser $(BROWSERS_TEST_DIR)
 
 $(LIBSODIUM_JS_DIR)/lib/libsodium.js: $(LIBSODIUM_DIR)/configure
-	cd $(LIBSODIUM_DIR) && ./dist-build/emscripten.sh --standard
+	cd $(LIBSODIUM_DIR) && env CPPFLAGS="-DFAVOR_PERFORMANCE" ./dist-build/emscripten.sh --standard
 
 $(LIBSODIUM_JS_SUMO_DIR)/lib/libsodium.js: $(LIBSODIUM_DIR)/configure
-	cd $(LIBSODIUM_DIR) && ./dist-build/emscripten.sh --sumo
+	cd $(LIBSODIUM_DIR) && env CPPFLAGS="-DFAVOR_PERFORMANCE" ./dist-build/emscripten.sh --sumo
 
 $(LIBSODIUM_DIR)/configure: $(LIBSODIUM_DIR)/configure.ac
 	cd $(LIBSODIUM_DIR) && ./autogen.sh

diff --git a/browsers-test/secretstream.exp → browsers-test/aead_aegis128l.exp b/browsers-test/secretstream.exp → browsers-test/aead_aegis128l.exp
diff --git a/browsers-test/aead_aegis128l.html b/browsers-test/aead_aegis128l.html
@@ -0,0 +1,98 @@
+<!doctype html>
+<html>
+<head>
+<meta name="google" content="notranslate" />
+<style>
+body {
+  background: white;
+  color: black;  
+}
+.test p {
+  margin: 1px;
+}
+.test {
+  font-family: monospace;
+  white-space: pre;   
+}
+.err {
+  background: red;
+  color: white;
+}
+.passed {
+  background: green;
+  color: white; 
+}
+</style>
+</head>
+<body>
+<h1></h1>
+<section class="test" id="test-res"></section>
+<script>
+var performance;
+if (typeof performance !== 'object') {
+  performance = {
+    mark: function(s) { this[s] = new Date() },
+    measure: function(_t, s1, s2) { this.t = this[s2] - this[s1] },
+    getEntriesByName: function() { return [ { duration: this.t } ] }
+  };
+}
+
+var Module = { preRun: function() { performance.mark('bench_start') } };
+
+function runTest(tname) {
+    var xhr, expected, hn, idx = 0, passed = true;
+
+    function outputReceived(e) {
+        var found = e.data;
+        var p = document.createElement('p');
+        if (found !== expected[idx++]) {
+            p.className = 'err';
+            passed = false;
+        }
+        p.appendChild(document.createTextNode(found));
+        document.getElementById('test-res').appendChild(p);
+        if (idx >= expected.length) {
+            if (passed) {
+                performance.mark('bench_end')
+                performance.measure('bench', 'bench_start', 'bench_end');
+                var duration = Math.round(performance.getEntriesByName('bench')[0].duration);
+                hn.appendChild(document.createTextNode(' - PASSED (time: ' + duration + ' ms)'));
+                hn.className = 'passed';
+            } else {
+                hn.appendChild(document.createTextNode(' - FAILED'));
+                hn.className = 'err';
+            }
+        }        
+    }
+
+    hn = document.getElementsByTagName('h1')[0];
+    hn.appendChild(document.createTextNode('Test: ' + tname));
+
+    try {
+        xhr = new ActiveXObject('Microsoft.XMLHTTP');
+    } catch (e) {
+        xhr = new XMLHttpRequest();
+    }
+    xhr.open('GET', tname + '.exp');
+    xhr.onreadystatechange = function() {
+        if (xhr.readyState != 4 ||
+            (xhr.status != 200 && xhr.status != 302 && xhr.status != 0)) {
+            return;
+        }
+        expected = xhr.responseText.split('\n');
+        if (expected.length > 0 && expected[expected.length - 1] === '') {
+            expected.pop();
+        }
+        expected.push('--- SUCCESS ---');
+        window.addEventListener('test-output', outputReceived, false);
+        var s = document.getElementsByTagName('script')[0];
+        var st = document.createElement('script');
+        st.src = tname + '.js';
+        s.parentNode.insertBefore(st, s);
+    }
+    xhr.send(null);
+}
+runTest('aead_aegis128l');
+</script>
+</body>
+</html>
diff --git a/browsers-test/aead_aegis128l.js b/browsers-test/aead_aegis128l.js
diff --git a/browsers-test/aead_aegis256.exp b/browsers-test/aead_aegis256.exp
@@ -0,0 +1 @@
+OK
diff --git a/browsers-test/aead_aegis256.html b/browsers-test/aead_aegis256.html
@@ -0,0 +1,98 @@
+<!doctype html>
+<html>
+<head>
+<meta name="google" content="notranslate" />
+<style>
+body {
+  background: white;
+  color: black;  
+}
+.test p {
+  margin: 1px;
+}
+.test {
+  font-family: monospace;
+  white-space: pre;   
+}
+.err {
+  background: red;
+  color: white;
+}
+.passed {
+  background: green;
+  color: white; 
+}
+</style>
+</head>
+<body>
+<h1></h1>
+<section class="test" id="test-res"></section>
+<script>
+var performance;
+if (typeof performance !== 'object') {
+  performance = {
+    mark: function(s) { this[s] = new Date() },
+    measure: function(_t, s1, s2) { this.t = this[s2] - this[s1] },
+    getEntriesByName: function() { return [ { duration: this.t } ] }
+  };
+}
+
+var Module = { preRun: function() { performance.mark('bench_start') } };
+
+function runTest(tname) {
+    var xhr, expected, hn, idx = 0, passed = true;
+
+    function outputReceived(e) {
+        var found = e.data;
+        var p = document.createElement('p');
+        if (found !== expected[idx++]) {
+            p.className = 'err';
+            passed = false;
+        }
+        p.appendChild(document.createTextNode(found));
+        document.getElementById('test-res').appendChild(p);
+        if (idx >= expected.length) {
+            if (passed) {
+                performance.mark('bench_end')
+                performance.measure('bench', 'bench_start', 'bench_end');
+                var duration = Math.round(performance.getEntriesByName('bench')[0].duration);
+                hn.appendChild(document.createTextNode(' - PASSED (time: ' + duration + ' ms)'));
+                hn.className = 'passed';
+            } else {
+                hn.appendChild(document.createTextNode(' - FAILED'));
+                hn.className = 'err';
+            }
+        }        
+    }
+
+    hn = document.getElementsByTagName('h1')[0];
+    hn.appendChild(document.createTextNode('Test: ' + tname));
+
+    try {
+        xhr = new ActiveXObject('Microsoft.XMLHTTP');
+    } catch (e) {
+        xhr = new XMLHttpRequest();
+    }
+    xhr.open('GET', tname + '.exp');
+    xhr.onreadystatechange = function() {
+        if (xhr.readyState != 4 ||
+            (xhr.status != 200 && xhr.status != 302 && xhr.status != 0)) {
+            return;
+        }
+        expected = xhr.responseText.split('\n');
+        if (expected.length > 0 && expected[expected.length - 1] === '') {
+            expected.pop();
+        }
+        expected.push('--- SUCCESS ---');
+        window.addEventListener('test-output', outputReceived, false);
+        var s = document.getElementsByTagName('script')[0];
+        var st = document.createElement('script');
+        st.src = tname + '.js';
+        s.parentNode.insertBefore(st, s);
+    }
+    xhr.send(null);
+}
+runTest('aead_aegis256');
+</script>
+</body>
+</html>
diff --git a/browsers-test/aead_aegis256.js b/browsers-test/aead_aegis256.js
diff --git a/browsers-test/aead_aes256gcm.js b/browsers-test/aead_aes256gcm.js
diff --git a/browsers-test/aead_aes256gcm2.js b/browsers-test/aead_aes256gcm2.js
diff --git a/browsers-test/aead_chacha20poly1305.js b/browsers-test/aead_chacha20poly1305.js
diff --git a/browsers-test/aead_chacha20poly13052.js b/browsers-test/aead_chacha20poly13052.js
diff --git a/browsers-test/aead_xchacha20poly1305.js b/browsers-test/aead_xchacha20poly1305.js
diff --git a/browsers-test/auth.js b/browsers-test/auth.js
diff --git a/browsers-test/auth2.js b/browsers-test/auth2.js
diff --git a/browsers-test/auth3.js b/browsers-test/auth3.js
diff --git a/browsers-test/auth5.js b/browsers-test/auth5.js
diff --git a/browsers-test/auth6.js b/browsers-test/auth6.js
diff --git a/browsers-test/auth7.js b/browsers-test/auth7.js
diff --git a/browsers-test/box.js b/browsers-test/box.js
diff --git a/browsers-test/box2.js b/browsers-test/box2.js
diff --git a/browsers-test/box7.js b/browsers-test/box7.js
diff --git a/browsers-test/box8.js b/browsers-test/box8.js
diff --git a/browsers-test/box_easy.js b/browsers-test/box_easy.js
diff --git a/browsers-test/box_easy2.js b/browsers-test/box_easy2.js
diff --git a/browsers-test/box_seal.js b/browsers-test/box_seal.js
diff --git a/browsers-test/box_seed.js b/browsers-test/box_seed.js
diff --git a/browsers-test/chacha20.js b/browsers-test/chacha20.js
diff --git a/browsers-test/codecs.js b/browsers-test/codecs.js
diff --git a/browsers-test/core1.js b/browsers-test/core1.js
diff --git a/browsers-test/core2.js b/browsers-test/core2.js
diff --git a/browsers-test/core3.js b/browsers-test/core3.js
diff --git a/browsers-test/core4.js b/browsers-test/core4.js
diff --git a/browsers-test/core5.js b/browsers-test/core5.js
diff --git a/browsers-test/core6.js b/browsers-test/core6.js
diff --git a/browsers-test/core_ed25519.exp b/browsers-test/core_ed25519.exp
@@ -15,6 +15,21 @@ sub1: f67c79849de0253ba142949e1db6224b13121212121212121212121212121202
 add2: b02e8581ce62f69922427c23f970f7e951525252525252525252525252525202
 sub2: 3da570db4b001cbeb35a7b7fe588e72aaeadadadadadadadadadadadadadad0d
 mul: 4453ef38408c06677c1b810e4bf8b1991f01c88716fbfa2f075a518b77da400b
+from_uniform_deterministic (0): b18e62cf804b022fec392b0e2d6539d0f059732616c11913f510f73ae2544ebc
+from_uniform_deterministic (1): b9d23004e78c58e22da72e109550133e3d3bb9e46afcc066b82326319653d62c
+from_uniform_deterministic (2): 14063782c8b8a677dce09c4e51719b1cf942bf71bc765c1ec9832a8b4446983c
+from_uniform_deterministic (3): 02d6dbac70f6a14de72f4e17386016b08d6506336a086f10e719fbad8831d550
+from_uniform_deterministic (4): 11c851408e7892c2eae37584423a8f9c797e3649d45946b53e64319318a750b0
+from_uniform_deterministic (5): d4b9eaf70ffdc238c88725e294bdd02a6ce85577c5e7add7ca07041873019842
+from_uniform_deterministic (6): 740a6141079285c1b9e84ed463dcce5d3d40a167fa13129463eaf97d2a7bf654
+from_uniform_deterministic (7): e504a3e00bbf506cbe388784d85e85b10c428c37eba04ebd19a60948b71ad2cf
+from_uniform_deterministic (8): 67cd50902c40c943f22c479c587fb3e5da2f8f1ad402049ac49ddc45ec20884c
+from_uniform_deterministic (9): 658bffa23b425a91268ee17559073c4b1548209054ed7cf00ffe582696dda8dc
+from_uniform_deterministic (10): b55b93e7a0fe554f86f1f4c991871a27756fee359a8c6bb7554ec91d5d552c49
+from_uniform_deterministic (11): fbc2bb45df1d806489a5a6415898c719c45c932d3467b6ce948ee80c0e8122c9
+from_uniform_deterministic (12): 93164e57b5e3ae6826ac9e0c31ddecf94e21a39a29ba9d1d24e9e588fe065d95
+from_uniform_deterministic (13): 16824d74c9482890dc57b0ec843a0a5231b581d2ce3909934d7658389f169093
+from_uniform_deterministic (14): 2f5b0336c7f0af520badeae99450f92835c27224ab4cd117f55b176afb6f0001
 (L-1)*8: e5d3f55c1a631258d69cf7a2def9de1400000000000000000000000000000010
 8(L-1): e5d3f55c1a631258d69cf7a2def9de1400000000000000000000000000000010
 (L-1)^2: 0100000000000000000000000000000000000000000000000000000000000000

diff --git a/browsers-test/core_ed25519.js b/browsers-test/core_ed25519.js
diff --git a/browsers-test/core_ristretto255.js b/browsers-test/core_ristretto255.js
diff --git a/browsers-test/ed25519_convert.js b/browsers-test/ed25519_convert.js
diff --git a/browsers-test/generichash.js b/browsers-test/generichash.js
diff --git a/browsers-test/generichash2.js b/browsers-test/generichash2.js
diff --git a/browsers-test/generichash3.js b/browsers-test/generichash3.js
diff --git a/browsers-test/hash.js b/browsers-test/hash.js
diff --git a/browsers-test/hash3.js b/browsers-test/hash3.js
diff --git a/browsers-test/kdf.js b/browsers-test/kdf.js