kbpgp - npm Package Compare versions

Comparing version 2.0.68 to 2.0.69

CHANGELOG.md

@@ -0,1 +1,5 @@
+## 2.0.67 (2017-04-07)
+
+- break up unbox into two pieces so that we can sanity-check a box without being to decrypt it
+
 ## 2.0.68 (2017-03-28)
@@ -2,0 +6,0 @@

lib/keybase/hilev.js

 // Generated by IcedCoffeeScript 108.0.11
 (function() {
-  var C, DH, EdDSA, EncKeyManager, Encryption, K, KeyManager, KeyManagerInterface, Signature, SignatureEngine, SignatureEngineInterface, akatch, alloc, asyncify, athrow, base64u, box, buffer_xor, bufferify, decode_sig, encode, errors, get_sig_body, iced, konst, make_esc, unbox, __iced_k, __iced_k_noop, _ref, _ref1,
+  var C, DH, EdDSA, EncKeyManager, Encryption, K, KeyManager, KeyManagerInterface, Signature, SignatureEngine, SignatureEngineInterface, akatch, alloc, asyncify, athrow, base64u, box, buffer_xor, bufferify, decode_sig, encode, errors, get_sig_body, iced, konst, make_esc, unbox, unbox_decode, __iced_k, __iced_k_noop, _ref, _ref1,
     __hasProp = {}.hasOwnProperty,
@@ -381,2 +381,25 @@ __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
 
+  unbox_decode = function(_arg) {
+    var armored, binary, e, err, rawobj, ret, _ref2;
+    armored = _arg.armored, binary = _arg.binary, rawobj = _arg.rawobj;
+    err = ret = null;
+    if ((armored == null) && (rawobj == null) && (binary == null)) {
+      err = new Error("need either 'armored' or 'binary' or 'rawobj'");
+      return [err, null];
+    }
+    if (armored != null) {
+      binary = new Buffer(armored, 'base64');
+    }
+    if (binary != null) {
+      try {
+        rawobj = encode.unseal(binary);
+      } catch (_error) {
+        e = _error;
+        return [e, null];
+      }
+    }
+    _ref2 = alloc(rawobj), err = _ref2[0], ret = _ref2[1];
+    return [err, ret, binary];
+  };
+
   unbox = function(_arg, cb) {
@@ -390,95 +413,56 @@ var armored, binary, encrypt_for, esc, packet, rawobj, res, ___iced_passed_deferral, __iced_deferrals, __iced_k;
       return (function(__iced_k) {
-        if ((armored == null) && (rawobj == null) && (binary == null)) {
-          (function(__iced_k) {
-            __iced_deferrals = new iced.Deferrals(__iced_k, {
-              parent: ___iced_passed_deferral,
-              filename: "/Users/max/src/keybase/kbpgp/src/keybase/hilev.iced"
-            });
-            athrow(new Error("need either 'armored' or 'binary' or 'rawobj'"), esc(__iced_deferrals.defer({
-              lineno: 165
-            })));
-            __iced_deferrals._fulfill();
-          })(__iced_k);
-        } else {
-          return __iced_k();
-        }
+        __iced_deferrals = new iced.Deferrals(__iced_k, {
+          parent: ___iced_passed_deferral,
+          filename: "/Users/max/src/keybase/kbpgp/src/keybase/hilev.iced"
+        });
+        asyncify(unbox_decode({
+          armored: armored,
+          binary: binary,
+          rawobj: rawobj
+        }), esc(__iced_deferrals.defer({
+          assign_fn: (function() {
+            return function() {
+              packet = arguments[0];
+              return binary = arguments[1];
+            };
+          })(),
+          lineno: 181
+        })));
+        __iced_deferrals._fulfill();
       });
     })(this)((function(_this) {
       return function() {
-        if (armored != null) {
-          binary = new Buffer(armored, 'base64');
-        }
         (function(__iced_k) {
-          if (binary != null) {
-            (function(__iced_k) {
-              __iced_deferrals = new iced.Deferrals(__iced_k, {
-                parent: ___iced_passed_deferral,
-                filename: "/Users/max/src/keybase/kbpgp/src/keybase/hilev.iced"
-              });
-              akatch((function() {
-                return encode.unseal(binary);
-              }), esc(__iced_deferrals.defer({
-                assign_fn: (function() {
-                  return function() {
-                    return rawobj = arguments[0];
-                  };
-                })(),
-                lineno: 170
-              })));
-              __iced_deferrals._fulfill();
-            })(__iced_k);
-          } else {
-            return __iced_k();
-          }
+          __iced_deferrals = new iced.Deferrals(__iced_k, {
+            parent: ___iced_passed_deferral,
+            filename: "/Users/max/src/keybase/kbpgp/src/keybase/hilev.iced"
+          });
+          packet.unbox({
+            encrypt_for: encrypt_for
+          }, esc(__iced_deferrals.defer({
+            assign_fn: (function() {
+              return function() {
+                return res = arguments[0];
+              };
+            })(),
+            lineno: 182
+          })));
+          __iced_deferrals._fulfill();
         })(function() {
-          (function(__iced_k) {
-            __iced_deferrals = new iced.Deferrals(__iced_k, {
-              parent: ___iced_passed_deferral,
-              filename: "/Users/max/src/keybase/kbpgp/src/keybase/hilev.iced"
+          if (res.keypair != null) {
+            res.km = new KeyManager({
+              key: res.keypair
             });
-            asyncify(alloc(rawobj), esc(__iced_deferrals.defer({
-              assign_fn: (function() {
-                return function() {
-                  return packet = arguments[0];
-                };
-              })(),
-              lineno: 172
-            })));
-            __iced_deferrals._fulfill();
-          })(function() {
-            (function(__iced_k) {
-              __iced_deferrals = new iced.Deferrals(__iced_k, {
-                parent: ___iced_passed_deferral,
-                filename: "/Users/max/src/keybase/kbpgp/src/keybase/hilev.iced"
-              });
-              packet.unbox({
-                encrypt_for: encrypt_for
-              }, esc(__iced_deferrals.defer({
-                assign_fn: (function() {
-                  return function() {
-                    return res = arguments[0];
-                  };
-                })(),
-                lineno: 173
-              })));
-              __iced_deferrals._fulfill();
-            })(function() {
-              if (res.keypair != null) {
-                res.km = new KeyManager({
-                  key: res.keypair
-                });
-              }
-              if (res.sender_keypair != null) {
-                res.sender_km = new KeyManager({
-                  key: res.sender_keypair
-                });
-              }
-              if (res.receiver_keypair != null) {
-                res.receiver_km = new KeyManager({
-                  key: res.receiver_keypair
-                });
-              }
-              return cb(null, res, binary);
+          }
+          if (res.sender_keypair != null) {
+            res.sender_km = new KeyManager({
+              key: res.sender_keypair
             });
-          });
+          }
+          if (res.receiver_keypair != null) {
+            res.receiver_km = new KeyManager({
+              key: res.receiver_keypair
+            });
+          }
+          return cb(null, res, binary);
         });
@@ -515,3 +499,3 @@ };
               })(),
-              lineno: 190
+              lineno: 199
             })));
@@ -535,3 +519,3 @@ __iced_deferrals._fulfill();
               })(),
-              lineno: 192
+              lineno: 201
             })));
@@ -607,3 +591,3 @@ __iced_deferrals._fulfill();
             })(),
-            lineno: 227
+            lineno: 236
           })));
@@ -626,3 +610,3 @@ __iced_deferrals._fulfill();
               })(),
-              lineno: 228
+              lineno: 237
             })));
@@ -665,3 +649,3 @@ __iced_deferrals._fulfill();
             })(),
-            lineno: 241
+            lineno: 250
           })));
@@ -711,3 +695,3 @@ __iced_deferrals._fulfill();
             })(),
-            lineno: 252
+            lineno: 261
           })));
@@ -737,2 +721,3 @@ __iced_deferrals._fulfill();
     unbox: unbox,
+    unbox_decode: unbox_decode,
     KeyManager: KeyManager,
@@ -739,0 +724,0 @@ EncKeyManager: EncKeyManager,

package.json

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

No alert changes

Worsened metrics

Total package byte prevSize

1232671

decreased by-0.04%

Lines of code

18120

decreased by-0.09%

No dependency changes