Support importing and decoding v1/v2 Login Files

nimiq · Nov 17, 2024 · 4da1229 · 4da1229
1 parent 7308b93
commit 4da1229
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/src/request/import/ImportFile.js b/src/request/import/ImportFile.js
@@ -1,5 +1,6 @@
 /* global Constants */
 /* global Nimiq */
+/* global NimiqPoW */
 /* global Key */
 /* global ImportWords */
 /* global FileImporter */
@@ -250,8 +251,24 @@ class ImportFile {
             // Make sure read position is at 0 even after a wrong password
             this._encryptedKey.reset();
 
-            // TODO: Load NimiqPoW for v1 and v2 encrypted keys
-            const secret = await Nimiq.Secret.fromEncrypted(this._encryptedKey, encryptionKey);
+            /** @type {Nimiq.Entropy | Nimiq.PrivateKey} */
+            let secret;
+
+            const version = this._encryptedKey[0];
+            if (version >= 3) {
+                // Nimiq PoS supports encryption from version 3
+                secret = await Nimiq.Secret.fromEncrypted(this._encryptedKey, encryptionKey);
+            } else {
+                // Load Nimiq PoW module to decode old encryptions
+                const _secret = await NimiqPoW.Secret.fromEncrypted(this._encryptedKey, encryptionKey);
+
+                // Convert PoW Entropy/PrivateKey objects to their PoS equivalent
+                if (_secret instanceof NimiqPoW.Entropy) {
+                    secret = Nimiq.Entropy.deserialize(new Nimiq.SerialBuffer(_secret.serialize()));
+                } else {
+                    secret = Nimiq.PrivateKey.deserialize(new Nimiq.SerialBuffer(_secret.serialize()));
+                }
+            }
 
             // If this code runs, the password was correct and the request returns
             /** @type {HTMLElement} */