Merge branch 'stable' of github.com:jedisct1/libsodium into stable

* 'stable' of github.com:jedisct1/libsodium: Only run test-globals if it exists Put <meta> tag outside <style> fix for asm.js async loading
2026-08-25 08:37:13 +09:00 · 2021-02-12 17:19:46 +01:00
parent 9e625a0b2a c9608ed004
commit e3da8b137f
3 changed files with 20 additions and 12 deletions
@@ -67,7 +67,7 @@ jobs:

      - name: Check globals
        run: |
-          test/rename-globals.sh
+          [ -x test/rename-globals.sh ] && test/rename-globals.sh

  other-comp:
    runs-on: ubuntu-latest
@@ -118,20 +118,28 @@ if [ "$DIST" = yes ]; then
        }
      };
      Module.useBackupModule = function() {
-        var Module = {};
-        $(cat "${PREFIX}/lib/libsodium.asm.tmp.js" | sed 's|use asm||g')
-        Object.keys(_Module).forEach(function(k) {
-          if (k !== 'getRandomValue') {
-            delete _Module[k];
-          }
-        });
-        Object.keys(Module).forEach(function(k) {
-          _Module[k] = Module[k];
+        return new Promise(function(resolve, reject) {
+          var Module = {};
+          Module.onAbort = reject;
+
+          Module.onRuntimeInitialized = function() {
+            Object.keys(_Module).forEach(function(k) {
+              if (k !== 'getRandomValue') {
+                delete _Module[k];
+              }
+            });
+            Object.keys(Module).forEach(function(k) {
+              _Module[k] = Module[k];
+            });
+            resolve();
+          };
+
+          $(cat "${PREFIX}/lib/libsodium.asm.tmp.js" | sed 's|use asm||g')
        });
      };
      $(cat "${PREFIX}/lib/libsodium.wasm.tmp.js")
    }).catch(function() {
-      _Module.useBackupModule();
+      return _Module.useBackupModule();
    });
 EOM

@@ -1,8 +1,8 @@
 <!doctype html>
 <html>
 <head>
-<style>
 <meta name="google" content="notranslate" />
+<style>
 body {
  background: white;
  color: black;