kbpgp - npm Package Compare versions

Comparing version 1.1.2 to 1.1.3

CHANGELOG.md

@@ -0,1 +1,8 @@
+## 1.1.3 (2014-10-08)
+
+Bugfixes:
+ - After merging a private key, try to "unlock" it if it's not
+   PW-protected. We were already doing the same for import, but
+   need it here for keybase's key_path.iced
+
 ## 1.1.2 (2014-10-04)
@@ -2,0 +9,0 @@

lib/keymanager.js

@@ -1041,3 +1041,3 @@ // Generated by IcedCoffeeScript 1.7.1-c
           (function(__iced_k) {
-            if (!(err != null) && ret.has_pgp_private() && !ret.is_pgp_locked()) {
+            if (!(err != null)) {
               (function(__iced_k) {
@@ -1049,3 +1049,3 @@ __iced_deferrals = new iced.Deferrals(__iced_k, {
                 });
-                ret.unlock_pgp({}, __iced_deferrals.defer({
+                ret.simple_unlock({}, __iced_deferrals.defer({
                   assign_fn: (function() {
@@ -1070,2 +1070,37 @@ return function() {
 
+    KeyManager.prototype.simple_unlock = function(opts, cb) {
+      var err, ___iced_passed_deferral, __iced_deferrals, __iced_k;
+      __iced_k = __iced_k_noop;
+      ___iced_passed_deferral = iced.findDeferral(arguments);
+      err = null;
+      (function(_this) {
+        return (function(__iced_k) {
+          if (_this.has_pgp_private() && !_this.is_pgp_locked()) {
+            (function(__iced_k) {
+              __iced_deferrals = new iced.Deferrals(__iced_k, {
+                parent: ___iced_passed_deferral,
+                filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+                funcname: "KeyManager.simple_unlock"
+              });
+              _this.unlock_pgp({}, __iced_deferrals.defer({
+                assign_fn: (function() {
+                  return function() {
+                    return err = arguments[0];
+                  };
+                })(),
+                lineno: 488
+              }));
+              __iced_deferrals._fulfill();
+            })(__iced_k);
+          } else {
+            return __iced_k();
+          }
+        });
+      })(this)((function(_this) {
+        return function() {
+          return cb(err);
+        };
+      })(this));
+    };
+
     KeyManager.import_from_p3skb = function(_arg, cb) {
@@ -1107,3 +1142,3 @@ var armored, asp, err, km, msg, p3skb, raw, warnings, ___iced_passed_deferral, __iced_deferrals, __iced_k, _ref5;
                 })(),
-                lineno: 492
+                lineno: 503
               }));
@@ -1152,3 +1187,3 @@ __iced_deferrals._fulfill();
             })(),
-            lineno: 502
+            lineno: 513
           }));
@@ -1181,3 +1216,3 @@ __iced_deferrals._fulfill();
                   })(),
-                  lineno: 505
+                  lineno: 516
                 }));
@@ -1210,3 +1245,3 @@ __iced_deferrals._fulfill();
                     })(),
-                    lineno: 514
+                    lineno: 525
                   }));
@@ -1253,3 +1288,3 @@ __iced_deferrals._fulfill();
                 })(),
-                lineno: 529
+                lineno: 540
               }));
@@ -1298,3 +1333,3 @@ __iced_deferrals._fulfill();
                   })(),
-                  lineno: 539
+                  lineno: 550
                 }));
@@ -1314,3 +1349,3 @@ __iced_deferrals._fulfill();
     KeyManager.prototype.merge_pgp_private = function(_arg, cb) {
-      var armored, asp, b2, err, raw, ___iced_passed_deferral, __iced_deferrals, __iced_k;
+      var armored, asp, b2, err, esc, raw, ___iced_passed_deferral, __iced_deferrals, __iced_k;
       __iced_k = __iced_k_noop;
@@ -1320,2 +1355,3 @@ ___iced_passed_deferral = iced.findDeferral(arguments);
       asp = ASP.make(asp);
+      esc = make_esc(cb, "merge_pgp_private");
       (function(_this) {
@@ -1332,11 +1368,10 @@ return (function(__iced_k) {
             asp: asp
-          }, __iced_deferrals.defer({
+          }, esc(__iced_deferrals.defer({
             assign_fn: (function() {
               return function() {
-                err = arguments[0];
-                return b2 = arguments[1];
+                return b2 = arguments[0];
               };
             })(),
-            lineno: 549
-          }));
+            lineno: 561
+          })));
           __iced_deferrals._fulfill();
@@ -1346,6 +1381,22 @@ });
         return function() {
-          if (typeof err === "undefined" || err === null) {
-            err = _this.pgp.merge_private(b2.pgp);
-          }
-          return cb(err);
+          err = _this.pgp.merge_private(b2.pgp);
+          (function(__iced_k) {
+            if (err == null) {
+              (function(__iced_k) {
+                __iced_deferrals = new iced.Deferrals(__iced_k, {
+                  parent: ___iced_passed_deferral,
+                  filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+                  funcname: "KeyManager.merge_pgp_private"
+                });
+                _this.simple_unlock({}, esc(__iced_deferrals.defer({
+                  lineno: 563
+                })));
+                __iced_deferrals._fulfill();
+              })(__iced_k);
+            } else {
+              return __iced_k();
+            }
+          })(function() {
+            return cb(err);
+          });
         };
@@ -1379,3 +1430,3 @@ })(this));
             })(),
-            lineno: 563
+            lineno: 576
           }));
@@ -1439,3 +1490,3 @@ __iced_deferrals._fulfill();
             })(),
-            lineno: 581
+            lineno: 594
           }));
@@ -1477,3 +1528,3 @@ __iced_deferrals._fulfill();
                 })(),
-                lineno: 594
+                lineno: 607
               }));
@@ -1566,3 +1617,3 @@ __iced_deferrals._fulfill();
                 })(),
-                lineno: 631
+                lineno: 644
               }));
@@ -1588,3 +1639,3 @@ __iced_deferrals._fulfill();
                 })(),
-                lineno: 633
+                lineno: 646
               }));
@@ -1637,3 +1688,3 @@ __iced_deferrals._fulfill();
             })(),
-            lineno: 646
+            lineno: 659
           }));
@@ -1818,3 +1869,3 @@ __iced_deferrals._fulfill();
                     })(),
-                    lineno: 744
+                    lineno: 757
                   }));
@@ -1821,0 +1872,0 @@ __iced_deferrals._fulfill();

package.json

@@ -10,3 +10,3 @@ {
   "author": "Maxwell Krohn",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "license": "BSD-3-Clause",
@@ -13,0 +13,0 @@ "main": "./lib/main.js",

SIGNED.md

@@ -7,9 +7,9 @@ ##### Signed by https://keybase.io/max
 
-iQEcBAABCgAGBQJULv2aAAoJEJgKPw0B/gTfZowH/iiS0xKgh4lxloCD31Rtaxyo
-rnwWrg964GgKaEPqsm4DdULfNGe753Uxj5PCCC6Sl06t3fYoQu58uDmaPFXUxFxy
-rYO+InTyJRqcMDqlUbON1Vtz4lqTo08qbATXAFrlQAmYnXV4mUPiXjELNuiYcdVL
-xhaICoBtFLCBuYkhVZtCXHrffcN6LyKHqOf4RBCFLgwANFRhZVLLhzmB9CwwExqV
-w5a12CQH8CvD5q7dI2vAX/5713Sk8ukXTyjrAgfiExmbgc+FrpLmTvSOaG2HOeFx
-uW6HpwaQeYdawk2mXUE9g55cM4S58a0VuHj+cYgwv5pwJGKO3PFek1hflgBRLag=
-=2bHp
+iQEcBAABCgAGBQJUNYp4AAoJEJgKPw0B/gTfiEUH/1dzw8H4hLJsOfXi8MVKpwj8
++PDj3jOs1gf4GTu7xPBemS7ExbyXgu3rmD94QnS72Fwfi1bRYo/GFjJrq/Xl/lCq
+GCyCyI4xq57zzhMfL08A8ex4W1Q3FmPaXpGFmWj+iq999Ifgwdhm9wG3YVpCfUoW
+Uer7+Qxgm0rj3uj0VVaR/PnYJPuqQ3PkPFuZoAeF516sMeIHZ8b6pEnLF30euSWy
+4lZoqXPAGGSvhCp6O71nwHEFQMITlVJ5eaKI/5NsnJVwjLFawoYMyfuBqtjCNySV
+Buiwq9DWwxJgJVQUXhMA0SLv/hJfL66Elf4UKQDaV3dVWRMjTIfNXNMspNhNKuY=
+=DTrp
 -----END PGP SIGNATURE-----
@@ -30,3 +30,3 @@
 31               .npmignore                          18894d4475fffb5e284a7bdfb00a9633ffdd660396a780b7fc5e14f013f95783                                                                 
-10854            CHANGELOG.md                        e335ba453f354ab0e9c2029e45fa117b416c144810c16c81ab51f55636c59096                                                                 
+11059            CHANGELOG.md                        2ce208678af901cd1fab3400fc397abd746ade12792956c1efe414fb089a74ab                                                                 
 1483             LICENSE                             333be7050513d91d9e77ca9acb4a91261721f0050209636076ed58676bfc643d                                                                 
@@ -38,3 +38,3 @@ 3109             Makefile                            771bacfba1be35b15591ecce2c3cfb5657acfcffc9db340dfb8e4cb4af3b9815
                  browser/                                                                                                                                                             
-1543203            kbpgp.js                          b636a2a36a169cbfc7de4f295f5b748a4c1e15e9b4e99bb2f71e7943c281a568                                                                 
+1556826            kbpgp.js                          c139655aa1bcbf57fe8cbdaf8737f78810aa35d4205aafc35106f7b3b7a8fe03                                                                 
                  dev/                                                                                                                                                                 
@@ -89,3 +89,3 @@ 329                bdecode_hex.iced                  9792d642d4fa9b1551f09b055f24c61f222754716f33d1370096e74b384cb92d
 330                keyfetch.js                       f8c05474c9e37b5d11c4ec991f20958d6f308a96703dfa939f3c85b9f6f19bc7                                                                 
-61555              keymanager.js                     0f4be6058c6031c02eda7220521dee82f0126c2749c98ac6316f8d71108b7e00                                                                 
+63345              keymanager.js                     6f05164d3779aa2493207c7169c4abd5328b23fb68acee6e559f8139366372a8                                                                 
 2674               keyring.js                        ef06f5e99f89fd7b2fddc29da977f2afa62a06f8140b464629548ee00a282a11                                                                 
@@ -132,3 +132,3 @@ 2224               keywrapper.js                     04d92f8ae35e6321cbc8a312942915f7ea72f4c710031b5246b7d0b935fb805c
 308                util.js                           09c0292aca20f6e8f32989db027b2fa9ce46a8cd26893d0550de57eb852b429c                                                                 
-1004             package.json                        e41dac1a8ed964c8b4d3a35cc5ee6d054b57ba71a696d5c50b9bee9481539cdb                                                                 
+1004             package.json                        08f704207cb51de593025a68c0047403177564301e823d5155c65dd4eb073dba                                                                 
                  ref/                                                                                                                                                                 
@@ -138,21 +138,2 @@ 239671             nist-curves.pdf                   f42d43be9a49de789ca6dd2539258825187628e391fe0c225a1e5af4bf32e107|0d73b0ee488e91d581c3ae326ef7ef0ea3ec833c88adc521face3a51cf3a40c8
                  rel/                                                                                                                                                                 
-805687             kbpgp-0.2.0-min.js                b4a878a738f83c33fa497323a0257dec27d8d13f53b6dd14aed1fd8716eba226                                                                 
-1247393            kbpgp-0.2.0.js                    67622a7d7249737f87edacba7171a89913d6afd2d59591952b7535dd14479d71|d60ec881841701ad4d3cf451c3c7980bbc9dc0dd97001deaa9f46f8ed3c7d6b5
-904269             kbpgp-0.3.0-min.js                fd4c4024fe68674c491fb9955d996fc0958a6d11f207040c17ff2908e9ec8fcb                                                                 
-1521046            kbpgp-0.3.0.js                    2dc8a1240eb0da5f72510287707d64c91f02e7424e1a8222cff2b116f311d145                                                                 
-918203             kbpgp-1.0.0-min.js                8a104dfd634fdeaab4d3a54ba1e8aeb192ed1780bfa3ca832d7bbbe0b4167cfe                                                                 
-562712             kbpgp-1.0.0-signed-release.zip    54d24c1d81d3e197eb9c2b60f39a3b289005154e76803517a78d20bc63f52ad1|5bd66524dea7706dcb4c3853af869d8108782eb8381750a12d56b9ee62a1db9b
-1544543            kbpgp-1.0.0.js                    86b367c42b89f0f14030600e9f63b6b1e56ecbd2888bdc3d78d3f85be36ed739                                                                 
-910039             kbpgp-1.0.2-min.js                c44740f5a87bf4dddffec07cbd7b8b1e866864dccd2098761666838000445f45                                                                 
-558378             kbpgp-1.0.2-signed-release.zip    3d80ead914d5edf82a8c818b431c223bec2f4421d37c86854f558e7be346b0c8|7bb5656a54145712061e8d3e515924dd8b778378f2e7ba5a33d3fa03a4be5017
-1533087            kbpgp-1.0.2.js                    da855244c0857a3b3c1ffdd5c8ec00346001ef15837439e8e474b37d007a8347                                                                 
-922251             kbpgp-1.0.3-min.js                8d1a8e4b1111f4f312c41c44b51ea3b7f8e8456dd9e6870dd9bc3a530321b4d8                                                                 
-564013             kbpgp-1.0.3-signed-release.zip    ffc7fb5b2498aa743628d782336e2a24caef1af38828e231948809267f478b4e|c35387fff53c7b2c8300f8111f57ea0ced7fadd22f0609287ed77454ff798b2a
-1551120            kbpgp-1.0.3.js                    aa5ad1aed630eed29cb403db78b5a79782b2e3bd0904448be55683f2bf9080cd                                                                 
-922558             kbpgp-1.0.4-min.js                21ce1fbba3b8cf79acb0dc07f08e5538add08fce3040ee6af0a88e2e8faa6122                                                                 
-564230             kbpgp-1.0.4-signed-release.zip    cb7ea195af898fd3a45eba3626f163ca15133748871b10bfb7d76c4ed33d125b|1b27f4a2aec0bbe06a7adab3b66100de597a26bda116527786f33aca3c820fa5
-1551547            kbpgp-1.0.4.js                    6a368bfce1492d134f27922089a97c41e17b0e75201fc7fc0a7dd470a63bd1de                                                                 
-922570             kbpgp-1.0.5-min.js                55eea344b43829fdbed8a54db21227f0b84fca2a5572d5f52e734f1121de92f4                                                                 
-564253             kbpgp-1.0.5-signed-release.zip    dccba42131f3a254c242ee9ff3de87f91ca6581a2028a2b2cdc291d09853f36b|05566e2065a459ff5fbebae806f4e6df0232314b3185417db8393936ea59b156
-1551567            kbpgp-1.0.5.js                    ed4c72ba4e297f56054c404ba51c1f6129da1f208ff8f77900365b52bc345a37                                                                 
 925282             kbpgp-1.1.0-min.js                e3104de79cd0e81f69b5644e088c62a24b8593f98f42b86b8d5e4f6409391819                                                                 
@@ -164,2 +145,5 @@ 565163             kbpgp-1.1.0-signed-release.zip    0dab110f6b60d8e5a31d0111936ec20bf134f6b51735d471ed5cc86ffbd3cd15|9a75d7de3e8c519cf7764eac5821346c04ccf4315793555673d49c2385597052
 1543203            kbpgp-1.1.1.js                    b636a2a36a169cbfc7de4f295f5b748a4c1e15e9b4e99bb2f71e7943c281a568                                                                 
+925895             kbpgp-1.1.2-min.js                f2523501a976f594f054b3f4dea096368d2b3301b7eddf1edd26338e8aae825b                                                                 
+565363             kbpgp-1.1.2-signed-release.zip    bb28a4ad8d3a18f5f6c471ff0e80930fcf11ced0a4ca42eb4f5123f8c5fb6930|08351b80b4f8cb65d0733f22f48bf2a9bb505bd66c3d8477cc65a1c99439d93e
+1556826            kbpgp-1.1.2.js                    c139655aa1bcbf57fe8cbdaf8737f78810aa35d4205aafc35106f7b3b7a8fe03                                                                 
                  src/                                                                                                                                                                 
@@ -195,3 +179,3 @@ 591                asymmetric.iced                   f9819323225e9be460c5aa991b99021018f575556ddef2e326316d022ca2c5c8
 856                keyfetch.iced                     10037e667a57ab8bd04d8239836c4d3e97ebe2fc72166020ab4f73203d6a1963                                                                 
-23563              keymanager.iced                   edec828dfac560201cb22783eac865ddf5ec72819f3aa6b53578ed61054d4235                                                                 
+23961              keymanager.iced                   9db017ba15aebb370ed167d016dc259465927b213b958dd6dec9e0020d07fd37                                                                 
 1655               keyring.iced                      8b2beea41852ca977c61b0dd937e609e86bcf75da80f4743c08ee2128df4842a                                                                 
@@ -198,0 +182,0 @@ 1475               keywrapper.iced                   c4a522c888684a1a05b93e8faffdd3589eff9cc12fe98b62146194849dfb4128

No alert changes

Improved metrics

Lines of code

15597

increased by0.32%

Worsened metrics

Total package byte prevSize

1065357

decreased by-0.05%

No dependency changes