浏览代码

PGP ops no longer require a key to be in date

n1474335 7 年之前
父节点
当前提交
df7c1721f5
共有 1 个文件被更改,包括 8 次插入2 次删除
  1. 8 2
      src/core/operations/PGP.js

+ 8 - 2
src/core/operations/PGP.js

@@ -90,13 +90,16 @@ const PGP = {
         try {
         try {
             const key = await promisify(kbpgp.KeyManager.import_from_armored_pgp)({
             const key = await promisify(kbpgp.KeyManager.import_from_armored_pgp)({
                 armored: privateKey,
                 armored: privateKey,
+                opts: {
+                    "no_check_keys": true
+                }
             });
             });
-            if (key.is_pgp_locked() && passphrase) {
+            if (key.is_pgp_locked()) {
                 if (passphrase) {
                 if (passphrase) {
                     await promisify(key.unlock_pgp.bind(key))({
                     await promisify(key.unlock_pgp.bind(key))({
                         passphrase
                         passphrase
                     });
                     });
-                } else if (!passphrase) {
+                } else {
                     throw "Did not provide passphrase with locked private key.";
                     throw "Did not provide passphrase with locked private key.";
                 }
                 }
             }
             }
@@ -118,6 +121,9 @@ const PGP = {
         try {
         try {
             const key = await promisify(kbpgp.KeyManager.import_from_armored_pgp)({
             const key = await promisify(kbpgp.KeyManager.import_from_armored_pgp)({
                 armored: publicKey,
                 armored: publicKey,
+                opts: {
+                    "no_check_keys": true
+                }
             });
             });
             return key;
             return key;
         } catch (err) {
         } catch (err) {