From 695b0f5f08bbe9f3ecd647c1c0026ab91849ddcd Mon Sep 17 00:00:00 2001 From: Maceeran Date: Mon, 16 Sep 2024 16:47:47 +0200 Subject: [PATCH] * Tweaked rnd_rndsig_validation.html comments * Added additional info text to the page * Render error & result information upon validation --- .../web/examples/rnd_rndsig_validation.html | 92 ++++++++++++------- 1 file changed, 58 insertions(+), 34 deletions(-) diff --git a/core/src.ts/web/examples/rnd_rndsig_validation.html b/core/src.ts/web/examples/rnd_rndsig_validation.html index 0272d84..3670b10 100644 --- a/core/src.ts/web/examples/rnd_rndsig_validation.html +++ b/core/src.ts/web/examples/rnd_rndsig_validation.html @@ -10,12 +10,13 @@ + integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous"> @@ -25,14 +26,17 @@

LibHaLo Demo

(Mobile only) RND/RNDSIG validation

+

+ Please tap a HaLo card on your smartphone to generate a unique signed URL, then paste it below to validate the signature. +

+ value="https://eth.vrfy.ch/?av=A02.03.000001.390DE7BD&v=01.C8.000005.E582A2D2&pk1=04F80774B09C70BD8C572F57C2D05835D0E324BE9133B49285EAC24E177BC56D92BCF464C3B12CECE362D91FAF37D7ACBA0996C61922A3535CBAEA855416EA6034&pk2=0463D44E9708131505F8E8C5917DF96919624173EEF726DF3F0569865CE83BC9CD9A018879E56C2FF8DC12531A354A6E669714871D0A5F2B5D63E100E98F930DA5&rnd=00000001FBAD9E01AA882F8669123390768FC8AF11916589DF638787A2C2700A&rndsig=304502203D6CBC47D7257FC8C324AB7ED3E9F00B478EFDE41967BDB2923D6C8393291B0C022100BE6601EA37CA66EEB74F3E38C9B37CE44ECC99B6CF1D49D7A5271BBB573BF58A04&cmd=0000&res=00">
- + 

 
@@ -55,6 +59,7 @@ 
LibHaLo Demo

             const pk2 = urlParams.get('pk2');
             const rnd = urlParams.get('rnd');
             const rndsig = urlParams.get('rndsig');
+
             // Handle displaying/hiding the noArgsError message
             if (!url) {
                 document
@@ -69,48 +74,67 @@ 
LibHaLo Demo

                     .display = 'none';
             }
 
-            // utility functions for hex encoding/decoding
-            function hex2arr(hexString) {
-                return new Uint8Array(
-                    hexString.match(/.{1,2}/g).map(
-                        byte => parseInt(byte, 16)));
-            }
-
-            function arr2hex(buffer) {
-                return [...new Uint8Array(buffer)]
-                    .map(x => x.toString(16).padStart(2, '0'))
-                    .join('');
-            }
-
-            // assemble the message to be verified
+            // Assemble the message to be verified
             const header = new TextEncoder().encode("\x19Attest counter pk2:\n");
             const rnd_b = hex2arr(rnd);
 
-            // \/ full message before hashing
+            // Message before hashing
             const data = [
                 ...header,
                 ...rnd_b
             ];
 
-            // hash the assembled message
-            const hashBuffer = await crypto.subtle.digest('SHA-256', Uint8Array.from(data));
-            const hashArray = Array.from(new Uint8Array(hashBuffer));
-            const hashHex = hashArray.map(b => b.toString(16).padStart(2, '0')).join('');
+            try {
+                // Hash the assembled message
+                const hashBuffer = await crypto
+                    .subtle
+                    .digest('SHA-256', Uint8Array.from(data));
+                const hashArray = Array.from(new Uint8Array(hashBuffer));
+                const hashHex = hashArray
+                    .map(b => b.toString(16).padStart(2, '0'))
+                    .join('');
+
+                // Trim the signature in case it contains excess null bytes
+                // (the signature could be padded with null bytes in case when it's shorter than the field
+                // reserved in the dynamic URL's query string, that's a performance optimization on the HaLo tag itself)
+                let sig = hex2arr(rndsig);
+                sig = sig.slice(0, sig[1] + 2);
+                sig = arr2hex(sig);
 
-            // trim the signature in case it contains excess null bytes
-            // (the signature could be padded with null bytes in case when it's shorter than the field
-            // reserved in the dynamic URL's query string, that's a performance optimization on the HaLo tag itself)
-            let sig = hex2arr(rndsig);
-            sig = sig.slice(0, sig[1] + 2);
-            sig = arr2hex(sig);
+                // Verify the signature
+                const ec = new elliptic.ec('secp256k1');
+                const key = ec.keyFromPublic(pk2, "hex");
+                const verificationResult = key.verify(hashHex, sig)
 
-            // actually verify the signature
-            const ec = new elliptic.ec('secp256k1');
-            const key = ec.keyFromPublic(pk2, "hex");
+                // Display the result of the verification
+                displayVerificationResult(verificationResult);
+            } catch (e) {
+                // Log any errors
+                log(e);
+            }
+        }
+
+        // Convert hex string to an array of 8-bit integers
+        function hex2arr(hexString) {
+            return new Uint8Array(hexString.match(/.{1,2}/g).map(byte => parseInt(byte, 16)));
+        }
 
-            console.log('verify result', key.verify(hashHex, sig));
+        // Convert an array of 8-bit integers to a hex string
+        function arr2hex(buffer) {
+            return [...new Uint8Array(buffer)]
+                .map(x => x.toString(16).padStart(2, '0'))
+                .join('');
+        }
+
+        // Display the result of the verification
+        function displayVerificationResult(verificationResult) {
+            if (verificationResult) {
+                log("Signature is valid");
+            } else {
+                log("Signature is invalid");
+            }
         }
     
 
 
-
+
\ No newline at end of file