kbpgp - npm Package Compare versions

Comparing version 0.3.1 to 0.3.2

CHANGELOG.md

@@ -1,5 +0,21 @@
-## 0.3.1
+## 0.3.2
 
+Bugfixes:
+
+  - Strip out stray debug message
+  - Use 'armored' rather than 'raw' in KeyManager interface, for consistency's sake.
+    Still allow 'raw' but mark it as DEPRECATED.
+  - Don't require unlock_pgp() to be called on an unlocked key. Do it internally
+    so as not to confuse people.
+  - Upgrade to Triplesec v3.0.18 for less-wasteful entropy generation
+
+Features:
+
+  - ASPs now accepted and supported in box/unbox operations
+  - API streamlining: easier to get the key_manager from a packetsig
+
+## 0.3.1 (2014-08-06)
+
 Tweaks:
-  
+
   - Rename generate_std to generate_rsa
@@ -19,4 +35,4 @@ - Alias KeyManager.export_pgp_private
 
-  - Change the KeyFetcher::fetch interface.  Callback now callsback 
-    with (err, key_manager, index) triple rather than the shmorgasbord 
+  - Change the KeyFetcher::fetch interface.  Callback now callsback
+    with (err, key_manager, index) triple rather than the shmorgasbord
     of parameters we had before.  Do a minor version update to show lack
@@ -29,3 +45,3 @@ of compatibility with previous 0.2.0 release
 
-  - RFC 6637: ECC crypto: ECDSA and ECDH. Experimental and not recommended, 
+  - RFC 6637: ECC crypto: ECDSA and ECDH. Experimental and not recommended,
     since more GPG clients do not support it.
@@ -110,3 +126,3 @@ - Add new API entrance points for cleaner code and consistent metaphors.
 Features:
-  
+
   - Add an RSA hiding feature, to hide what the public key is.  Also, blind the output ciphertext.
@@ -136,3 +152,3 @@
   - Strip out some profane debugging info (sorry)
-  - Allow unlocking of keys that were not actually locked. 
+  - Allow unlocking of keys that were not actually locked.
 
@@ -170,3 +186,3 @@ ## 0.1.12 (2014-04-24)
   - Better support for private key merging --- don't require an exact-key-for-key
-    match, but rather, allow only some of the secret subkeys (and not the primary) to 
+    match, but rather, allow only some of the secret subkeys (and not the primary) to
     be merged. This addresses [Keybase Issue #216](https://github.com/keybase/keybase-issues/issues/216)
@@ -267,3 +283,3 @@
 Bugfixes:
- 
+
   - Close #38 - Handle ElGamal encrypt and sign. Throw it away, don't puke
@@ -281,3 +297,3 @@ - Close keybase/keybase-issues#273 as well.
 Features:
- 
+
   - Figure out which keyid is primary
@@ -308,3 +324,3 @@
 
-  - Close keybase/keybase-issues#196: better support for v3 signatures mixed in 
+  - Close keybase/keybase-issues#196: better support for v3 signatures mixed in
     with v4 signatures in public key blocks.
@@ -311,0 +327,0 @@

lib/keymanager.js

@@ -148,3 +148,3 @@ // Generated by IcedCoffeeScript 1.7.1-c
                     parent: ___iced_passed_deferral,
-                    filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+                    filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
                     funcname: "Engine.sign_subkeys"
@@ -223,3 +223,3 @@ });
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
             funcname: "Engine.sign"
@@ -246,3 +246,3 @@ });
                   parent: ___iced_passed_deferral,
-                  filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+                  filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
                   funcname: "Engine.sign"
@@ -330,3 +330,3 @@ });
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
             funcname: "Engine.unlock_keys"
@@ -374,3 +374,3 @@ });
                       parent: ___iced_passed_deferral,
-                      filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+                      filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
                       funcname: "Engine.unlock_keys"
@@ -476,3 +476,3 @@ });
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
             funcname: "PgpEngine._v_self_sign_primary"
@@ -511,3 +511,3 @@ });
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
             funcname: "PgpEngine._v_sign_subkey"
@@ -753,3 +753,3 @@ });
               parent: ___iced_passed_deferral1,
-              filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced"
+              filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced"
             });
@@ -792,3 +792,3 @@ params.algo.generate({
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
             funcname: "KeyManager.generate"
@@ -841,3 +841,3 @@ });
                     parent: ___iced_passed_deferral,
-                    filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+                    filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
                     funcname: "KeyManager.generate"
@@ -933,14 +933,18 @@ });
     KeyManager.import_from_armored_pgp = function(_arg, cb) {
-      var armored, asp, err, msg, raw, ret, warnings, ___iced_passed_deferral, __iced_deferrals, __iced_k, _ref5, _ref6;
+      var armored, asp, binary, err, msg, raw, ret, warnings, ___iced_passed_deferral, __iced_deferrals, __iced_k, _ref5, _ref6;
       __iced_k = __iced_k_noop;
       ___iced_passed_deferral = iced.findDeferral(arguments);
-      armored = _arg.armored, raw = _arg.raw, asp = _arg.asp;
-      raw || (raw = armored);
-      asp = ASP.make(asp);
-      warnings = null;
-      ret = null;
-      _ref5 = decode(raw), err = _ref5[0], msg = _ref5[1];
-      if (err == null) {
-        if (!((_ref6 = msg.type) === C.message_types.public_key || _ref6 === C.message_types.private_key)) {
-          err = new Error("Wanted a public or private key; got: " + msg.type);
+      armored = _arg.armored, raw = _arg.raw, binary = _arg.binary, asp = _arg.asp;
+      msg = binary;
+      err = null;
+      if (msg == null) {
+        raw || (raw = armored);
+        asp = ASP.make(asp);
+        warnings = null;
+        ret = null;
+        _ref5 = decode(raw), err = _ref5[0], msg = _ref5[1];
+        if (err == null) {
+          if (!((_ref6 = msg.type) === C.message_types.public_key || _ref6 === C.message_types.private_key)) {
+            err = new Error("Wanted a public or private key; got: " + msg.type);
+          }
         }
@@ -954,3 +958,3 @@ }
                 parent: ___iced_passed_deferral,
-                filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+                filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
                 funcname: "KeyManager.import_from_armored_pgp"
@@ -969,3 +973,3 @@ });
                 })(),
-                lineno: 448
+                lineno: 461
               }));
@@ -980,3 +984,26 @@ __iced_deferrals._fulfill();
         return function() {
-          return cb(err, ret, warnings);
+          (function(__iced_k) {
+            if (!(err != null) && ret.has_pgp_private() && !ret.is_pgp_locked()) {
+              (function(__iced_k) {
+                __iced_deferrals = new iced.Deferrals(__iced_k, {
+                  parent: ___iced_passed_deferral,
+                  filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
+                  funcname: "KeyManager.import_from_armored_pgp"
+                });
+                ret.unlock_pgp({}, __iced_deferrals.defer({
+                  assign_fn: (function() {
+                    return function() {
+                      return err = arguments[0];
+                    };
+                  })(),
+                  lineno: 467
+                }));
+                __iced_deferrals._fulfill();
+              })(__iced_k);
+            } else {
+              return __iced_k();
+            }
+          })(function() {
+            return cb(err, ret, warnings);
+          });
         };
@@ -987,6 +1014,7 @@ })(this));
     KeyManager.import_from_p3skb = function(_arg, cb) {
-      var asp, err, km, msg, p3skb, raw, warnings, ___iced_passed_deferral, __iced_deferrals, __iced_k, _ref5;
+      var armored, asp, err, km, msg, p3skb, raw, warnings, ___iced_passed_deferral, __iced_deferrals, __iced_k, _ref5;
       __iced_k = __iced_k_noop;
       ___iced_passed_deferral = iced.findDeferral(arguments);
-      raw = _arg.raw, asp = _arg.asp;
+      raw = _arg.raw, armored = _arg.armored, asp = _arg.asp;
+      armored || (armored = raw);
       asp = ASP.make(asp);
@@ -996,3 +1024,3 @@ km = null;
       _ref5 = katch(function() {
-        return P3SKB.alloc(unbox(read_base64(raw)));
+        return P3SKB.alloc(unbox(read_base64(armored)));
       }), err = _ref5[0], p3skb = _ref5[1];
@@ -1009,3 +1037,3 @@ (function(_this) {
                 parent: ___iced_passed_deferral,
-                filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+                filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
                 funcname: "KeyManager.import_from_p3skb"
@@ -1024,3 +1052,3 @@ });
                 })(),
-                lineno: 461
+                lineno: 483
               }));
@@ -1057,3 +1085,3 @@ __iced_deferrals._fulfill();
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
             funcname: "KeyManager.unlock_p3skb"
@@ -1070,3 +1098,3 @@ });
             })(),
-            lineno: 471
+            lineno: 493
           }));
@@ -1086,3 +1114,3 @@ __iced_deferrals._fulfill();
                   parent: ___iced_passed_deferral,
-                  filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+                  filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
                   funcname: "KeyManager.unlock_p3skb"
@@ -1100,3 +1128,3 @@ });
                   })(),
-                  lineno: 474
+                  lineno: 496
                 }));
@@ -1118,3 +1146,3 @@ __iced_deferrals._fulfill();
                     parent: ___iced_passed_deferral,
-                    filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+                    filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
                     funcname: "KeyManager.unlock_p3skb"
@@ -1130,3 +1158,3 @@ });
                     })(),
-                    lineno: 483
+                    lineno: 505
                   }));
@@ -1164,3 +1192,3 @@ __iced_deferrals._fulfill();
                 parent: ___iced_passed_deferral,
-                filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+                filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
                 funcname: "KeyManager.import_from_pgp_message"
@@ -1174,3 +1202,3 @@ });
                 })(),
-                lineno: 498
+                lineno: 520
               }));
@@ -1211,6 +1239,6 @@ __iced_deferrals._fulfill();
     KeyManager.prototype.merge_pgp_private = function(_arg, cb) {
-      var asp, b2, err, raw, ___iced_passed_deferral, __iced_deferrals, __iced_k;
+      var armored, asp, b2, err, raw, ___iced_passed_deferral, __iced_deferrals, __iced_k;
       __iced_k = __iced_k_noop;
       ___iced_passed_deferral = iced.findDeferral(arguments);
-      raw = _arg.raw, asp = _arg.asp;
+      armored = _arg.armored, raw = _arg.raw, asp = _arg.asp;
       asp = ASP.make(asp);
@@ -1221,6 +1249,7 @@ (function(_this) {
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
             funcname: "KeyManager.merge_pgp_private"
           });
           KeyManager.import_from_armored_pgp({
+            armored: armored,
             raw: raw,
@@ -1235,3 +1264,3 @@ asp: asp
             })(),
-            lineno: 516
+            lineno: 538
           }));
@@ -1263,3 +1292,3 @@ __iced_deferrals._fulfill();
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
             funcname: "KeyManager.unlock_pgp"
@@ -1275,3 +1304,3 @@ });
             })(),
-            lineno: 530
+            lineno: 552
           }));
@@ -1323,3 +1352,3 @@ __iced_deferrals._fulfill();
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
             funcname: "KeyManager.unlock_keybase"
@@ -1336,3 +1365,3 @@ });
             })(),
-            lineno: 548
+            lineno: 570
           }));
@@ -1362,3 +1391,3 @@ __iced_deferrals._fulfill();
                 parent: ___iced_passed_deferral,
-                filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+                filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
                 funcname: "KeyManager.export_private_to_server"
@@ -1375,3 +1404,3 @@ });
                 })(),
-                lineno: 561
+                lineno: 583
               }));
@@ -1449,3 +1478,3 @@ __iced_deferrals._fulfill();
                 parent: ___iced_passed_deferral,
-                filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+                filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
                 funcname: "KeyManager.export_private"
@@ -1463,3 +1492,3 @@ });
                 })(),
-                lineno: 597
+                lineno: 620
               }));
@@ -1472,3 +1501,3 @@ __iced_deferrals._fulfill();
                 parent: ___iced_passed_deferral,
-                filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+                filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
                 funcname: "KeyManager.export_private"
@@ -1486,3 +1515,3 @@ });
                 })(),
-                lineno: 599
+                lineno: 622
               }));
@@ -1524,3 +1553,3 @@ __iced_deferrals._fulfill();
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
             funcname: "KeyManager.sign"
@@ -1536,3 +1565,3 @@ });
             })(),
-            lineno: 612
+            lineno: 635
           }));
@@ -1704,3 +1733,3 @@ __iced_deferrals._fulfill();
                     parent: ___iced_passed_deferral,
-                    filename: "/Users/max/src/keybase/kbpgp/src/keymanager.iced",
+                    filename: "/home/max/src/keybase/kbpgp/src/keymanager.iced",
                     funcname: "KeyManager._apply_to_engines"
@@ -1714,3 +1743,3 @@ });
                     })(),
-                    lineno: 705
+                    lineno: 728
                   }));
@@ -1717,0 +1746,0 @@ __iced_deferrals._fulfill();

lib/main.js

@@ -5,3 +5,3 @@ // Generated by IcedCoffeeScript 1.7.1-c
 
-  mods = [require("./keymanager"), require("./basex"), require("./openpgp/burner"), require("./openpgp/hilev")];
+  mods = [require("./keymanager"), require("./basex"), require("./openpgp/burner"), require("./openpgp/hilev"), require("./keyfetch"), require("./keyring")];
 
@@ -8,0 +8,0 @@ for (_i = 0, _len = mods.length; _i < _len; _i++) {

lib/openpgp/baseburner.js

 // Generated by IcedCoffeeScript 1.7.1-c
 (function() {
-  var BaseBurner, iced, make_esc, __iced_k, __iced_k_noop;
+  var ASP, BaseBurner, iced, make_esc, __iced_k, __iced_k_noop;
 
@@ -10,5 +10,8 @@ iced = require('iced-runtime').iced;
 
+  ASP = require('pgp-utils').util.ASP;
+
   exports.BaseBurner = BaseBurner = (function() {
     function BaseBurner(_arg) {
-      this.sign_with = _arg.sign_with, this.encrypt_for = _arg.encrypt_for, this.signing_key = _arg.signing_key, this.encryption_key = _arg.encryption_key;
+      this.sign_with = _arg.sign_with, this.encrypt_for = _arg.encrypt_for, this.signing_key = _arg.signing_key, this.encryption_key = _arg.encryption_key, this.asp = _arg.asp;
+      this.asp = ASP.make(this.asp);
     }
@@ -25,7 +28,7 @@
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/kbpgp/src/openpgp/baseburner.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/openpgp/baseburner.iced",
             funcname: "BaseBurner._find_keys"
           });
           _this._find_signing_key(esc(__iced_deferrals.defer({
-            lineno: 15
+            lineno: 17
           })));
@@ -39,7 +42,7 @@ __iced_deferrals._fulfill();
               parent: ___iced_passed_deferral,
-              filename: "/Users/max/src/kbpgp/src/openpgp/baseburner.iced",
+              filename: "/home/max/src/keybase/kbpgp/src/openpgp/baseburner.iced",
               funcname: "BaseBurner._find_keys"
             });
             _this._find_encryption_key(esc(__iced_deferrals.defer({
-              lineno: 16
+              lineno: 18
             })));
@@ -51,7 +54,7 @@ __iced_deferrals._fulfill();
                 parent: ___iced_passed_deferral,
-                filename: "/Users/max/src/kbpgp/src/openpgp/baseburner.iced",
+                filename: "/home/max/src/keybase/kbpgp/src/openpgp/baseburner.iced",
                 funcname: "BaseBurner._find_keys"
               });
               _this._assert_one(esc(__iced_deferrals.defer({
-                lineno: 17
+                lineno: 19
               })));
@@ -58,0 +61,0 @@ __iced_deferrals._fulfill();

lib/openpgp/burner.js

@@ -59,4 +59,4 @@ // Generated by IcedCoffeeScript 1.7.1-c
     function Burner(_arg) {
-      var encrypt_for, encryption_key, sign_with, signing_key;
-      this.literals = _arg.literals, this.opts = _arg.opts, sign_with = _arg.sign_with, encrypt_for = _arg.encrypt_for, signing_key = _arg.signing_key, encryption_key = _arg.encryption_key;
+      var asp, encrypt_for, encryption_key, sign_with, signing_key;
+      this.literals = _arg.literals, this.opts = _arg.opts, sign_with = _arg.sign_with, encrypt_for = _arg.encrypt_for, signing_key = _arg.signing_key, encryption_key = _arg.encryption_key, asp = _arg.asp;
       Burner.__super__.constructor.call(this, {
@@ -66,3 +66,4 @@ sign_with: sign_with,
         signing_key: signing_key,
-        encryption_key: encryption_key
+        encryption_key: encryption_key,
+        asp: asp
       });
@@ -110,3 +111,3 @@ this.packets = [];
                   parent: ___iced_passed_deferral,
-                  filename: "/Users/max/src/kbpgp/src/openpgp/burner.iced",
+                  filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
                   funcname: "Burner._frame_literals"
@@ -139,3 +140,3 @@ });
     Burner.prototype._sign = function(cb) {
-      var err, esc, fp, ops, ops_framed, sig, ___iced_passed_deferral, __iced_deferrals, __iced_k;
+      var esc, fp, ops, ops_framed, sig, ___iced_passed_deferral, __iced_deferrals, __iced_k;
       __iced_k = __iced_k_noop;
@@ -155,3 +156,3 @@ ___iced_passed_deferral = iced.findDeferral(arguments);
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/kbpgp/src/openpgp/burner.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
             funcname: "Burner._sign"
@@ -180,21 +181,50 @@ });
               parent: ___iced_passed_deferral,
-              filename: "/Users/max/src/kbpgp/src/openpgp/burner.iced",
+              filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
               funcname: "Burner._sign"
             });
-            sig.write(_this.signed_payload, __iced_deferrals.defer({
-              assign_fn: (function() {
-                return function() {
-                  err = arguments[0];
-                  return fp = arguments[1];
-                };
-              })(),
+            _this.asp.progress({
+              what: 'sign',
+              i: 0,
+              total: 1
+            }, esc(__iced_deferrals.defer({
               lineno: 74
-            }));
+            })));
             __iced_deferrals._fulfill();
           })(function() {
-            if (typeof err === "undefined" || err === null) {
-              _this.packets.unshift(ops_framed);
-              _this.packets.push(fp);
-            }
-            return cb(err);
+            (function(__iced_k) {
+              __iced_deferrals = new iced.Deferrals(__iced_k, {
+                parent: ___iced_passed_deferral,
+                filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
+                funcname: "Burner._sign"
+              });
+              sig.write(_this.signed_payload, esc(__iced_deferrals.defer({
+                assign_fn: (function() {
+                  return function() {
+                    return fp = arguments[0];
+                  };
+                })(),
+                lineno: 75
+              })));
+              __iced_deferrals._fulfill();
+            })(function() {
+              (function(__iced_k) {
+                __iced_deferrals = new iced.Deferrals(__iced_k, {
+                  parent: ___iced_passed_deferral,
+                  filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
+                  funcname: "Burner._sign"
+                });
+                _this.asp.progress({
+                  what: 'sign',
+                  i: 1,
+                  total: 1
+                }, esc(__iced_deferrals.defer({
+                  lineno: 76
+                })));
+                __iced_deferrals._fulfill();
+              })(function() {
+                _this.packets.unshift(ops_framed);
+                _this.packets.push(fp);
+                return cb(null);
+              });
+            });
           });
@@ -213,5 +243,6 @@ };
     Burner.prototype._compress = function(cb) {
-      var err, inflated, opkt, pkt, ___iced_passed_deferral, __iced_deferrals, __iced_k;
+      var esc, inflated, opkt, pkt, ___iced_passed_deferral, __iced_deferrals, __iced_k;
       __iced_k = __iced_k_noop;
       ___iced_passed_deferral = iced.findDeferral(arguments);
+      esc = make_esc(cb, "Burner::_compress");
       inflated = this.collect_packets();
@@ -226,14 +257,12 @@ pkt = new Compressed({
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/kbpgp/src/openpgp/burner.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
             funcname: "Burner._compress"
           });
-          pkt.write(__iced_deferrals.defer({
-            assign_fn: (function() {
-              return function() {
-                err = arguments[0];
-                return opkt = arguments[1];
-              };
-            })(),
-            lineno: 92
-          }));
+          _this.asp.progress({
+            what: 'compress',
+            i: 0,
+            total: 1
+          }, esc(__iced_deferrals.defer({
+            lineno: 94
+          })));
           __iced_deferrals._fulfill();
@@ -243,6 +272,37 @@ });
         return function() {
-          if (typeof err === "undefined" || err === null) {
-            _this.packets.push(opkt);
-          }
-          return cb(err);
+          (function(__iced_k) {
+            __iced_deferrals = new iced.Deferrals(__iced_k, {
+              parent: ___iced_passed_deferral,
+              filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
+              funcname: "Burner._compress"
+            });
+            pkt.write(esc(__iced_deferrals.defer({
+              assign_fn: (function() {
+                return function() {
+                  return opkt = arguments[0];
+                };
+              })(),
+              lineno: 95
+            })));
+            __iced_deferrals._fulfill();
+          })(function() {
+            (function(__iced_k) {
+              __iced_deferrals = new iced.Deferrals(__iced_k, {
+                parent: ___iced_passed_deferral,
+                filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
+                funcname: "Burner._compress"
+              });
+              _this.asp.progress({
+                what: 'compress',
+                i: 1,
+                total: 1
+              }, esc(__iced_deferrals.defer({
+                lineno: 96
+              })));
+              __iced_deferrals._fulfill();
+            })(function() {
+              _this.packets.push(opkt);
+              return cb(null);
+            });
+          });
         };
@@ -262,3 +322,3 @@ })(this));
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/kbpgp/src/openpgp/burner.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
             funcname: "Burner._make_session_key"
@@ -272,3 +332,3 @@ });
             })(_this),
-            lineno: 102
+            lineno: 105
           }));
@@ -306,14 +366,11 @@ __iced_deferrals._fulfill();
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/kbpgp/src/openpgp/burner.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
             funcname: "Burner._encrypt_session_key"
           });
-          pub_k.pad_and_encrypt(payload, {
-            fingerprint: fingerprint
+          _this.asp.progress({
+            what: 'session key encrypt',
+            i: 0,
+            total: 1
           }, esc(__iced_deferrals.defer({
-            assign_fn: (function() {
-              return function() {
-                return ekey = arguments[0];
-              };
-            })(),
-            lineno: 119
+            lineno: 122
           })));
@@ -325,46 +382,113 @@ __iced_deferrals._fulfill();
           (function(__iced_k) {
-            if (_this.opts.hide) {
-              key_id = dummy_key_id;
-              (function(__iced_k) {
-                var _ref3, _ref4;
-                __iced_deferrals = new iced.Deferrals(__iced_k, {
-                  parent: ___iced_passed_deferral,
-                  filename: "/Users/max/src/kbpgp/src/openpgp/burner.iced",
-                  funcname: "Burner._encrypt_session_key"
-                });
-                ekey.hide({
-                  max: (_ref3 = _this.opts.hide) != null ? _ref3.max : void 0,
-                  slosh: (_ref4 = _this.opts.hide) != null ? _ref4.slosh : void 0,
-                  key: pub_k
-                }, esc(__iced_deferrals.defer({
-                  lineno: 122
-                })));
-                __iced_deferrals._fulfill();
-              })(__iced_k);
-            } else {
-              return __iced_k(key_id = _this.encryption_key.get_key_id());
-            }
+            __iced_deferrals = new iced.Deferrals(__iced_k, {
+              parent: ___iced_passed_deferral,
+              filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
+              funcname: "Burner._encrypt_session_key"
+            });
+            pub_k.pad_and_encrypt(payload, {
+              fingerprint: fingerprint
+            }, esc(__iced_deferrals.defer({
+              assign_fn: (function() {
+                return function() {
+                  return ekey = arguments[0];
+                };
+              })(),
+              lineno: 123
+            })));
+            __iced_deferrals._fulfill();
           })(function() {
-            pkt = new PKESK({
-              crypto_type: pub_k.type,
-              key_id: key_id,
-              ekey: ekey
-            });
             (function(__iced_k) {
               __iced_deferrals = new iced.Deferrals(__iced_k, {
                 parent: ___iced_passed_deferral,
-                filename: "/Users/max/src/kbpgp/src/openpgp/burner.iced",
+                filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
                 funcname: "Burner._encrypt_session_key"
               });
-              pkt.write(esc(__iced_deferrals.defer({
-                assign_fn: (function(__slot_1) {
-                  return function() {
-                    return __slot_1._pkesk = arguments[0];
-                  };
-                })(_this),
-                lineno: 130
+              _this.asp.progress({
+                what: 'session key encrypt',
+                i: 1,
+                total: 1
+              }, esc(__iced_deferrals.defer({
+                lineno: 124
               })));
               __iced_deferrals._fulfill();
             })(function() {
-              return cb(null);
+              (function(__iced_k) {
+                if (_this.opts.hide) {
+                  key_id = dummy_key_id;
+                  (function(__iced_k) {
+                    __iced_deferrals = new iced.Deferrals(__iced_k, {
+                      parent: ___iced_passed_deferral,
+                      filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
+                      funcname: "Burner._encrypt_session_key"
+                    });
+                    _this.asp.progress({
+                      what: 'hide encryption',
+                      i: 0,
+                      total: 1
+                    }, esc(__iced_deferrals.defer({
+                      lineno: 127
+                    })));
+                    __iced_deferrals._fulfill();
+                  })(function() {
+                    (function(__iced_k) {
+                      var _ref3, _ref4;
+                      __iced_deferrals = new iced.Deferrals(__iced_k, {
+                        parent: ___iced_passed_deferral,
+                        filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
+                        funcname: "Burner._encrypt_session_key"
+                      });
+                      ekey.hide({
+                        max: (_ref3 = _this.opts.hide) != null ? _ref3.max : void 0,
+                        slosh: (_ref4 = _this.opts.hide) != null ? _ref4.slosh : void 0,
+                        key: pub_k
+                      }, esc(__iced_deferrals.defer({
+                        lineno: 128
+                      })));
+                      __iced_deferrals._fulfill();
+                    })(function() {
+                      (function(__iced_k) {
+                        __iced_deferrals = new iced.Deferrals(__iced_k, {
+                          parent: ___iced_passed_deferral,
+                          filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
+                          funcname: "Burner._encrypt_session_key"
+                        });
+                        _this.asp.progress({
+                          what: 'hide encryption',
+                          i: 1,
+                          total: 1
+                        }, esc(__iced_deferrals.defer({
+                          lineno: 129
+                        })));
+                        __iced_deferrals._fulfill();
+                      })(__iced_k);
+                    });
+                  });
+                } else {
+                  return __iced_k(key_id = _this.encryption_key.get_key_id());
+                }
+              })(function() {
+                pkt = new PKESK({
+                  crypto_type: pub_k.type,
+                  key_id: key_id,
+                  ekey: ekey
+                });
+                (function(__iced_k) {
+                  __iced_deferrals = new iced.Deferrals(__iced_k, {
+                    parent: ___iced_passed_deferral,
+                    filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
+                    funcname: "Burner._encrypt_session_key"
+                  });
+                  pkt.write(esc(__iced_deferrals.defer({
+                    assign_fn: (function(__slot_1) {
+                      return function() {
+                        return __slot_1._pkesk = arguments[0];
+                      };
+                    })(_this),
+                    lineno: 137
+                  })));
+                  __iced_deferrals._fulfill();
+                })(function() {
+                  return cb(null);
+                });
+              });
             });
@@ -377,3 +501,3 @@ });
     Burner.prototype._encrypt_payload = function(cb) {
-      var esc, pkt, plaintext, prefixrandom, ___iced_passed_deferral, __iced_deferrals, __iced_k;
+      var asp, esc, pkt, plaintext, prefixrandom, ___iced_passed_deferral, __iced_deferrals, __iced_k;
       __iced_k = __iced_k_noop;
@@ -387,3 +511,3 @@ ___iced_passed_deferral = iced.findDeferral(arguments);
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/kbpgp/src/openpgp/burner.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
             funcname: "Burner._encrypt_payload"
@@ -397,3 +521,3 @@ });
             })(),
-            lineno: 138
+            lineno: 145
           }));
@@ -405,6 +529,7 @@ __iced_deferrals._fulfill();
           pkt = new SEIPD({});
+          asp = _this.asp.section('encrypt payload');
           (function(__iced_k) {
             __iced_deferrals = new iced.Deferrals(__iced_k, {
               parent: ___iced_passed_deferral,
-              filename: "/Users/max/src/kbpgp/src/openpgp/burner.iced",
+              filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
               funcname: "Burner._encrypt_payload"
@@ -415,5 +540,6 @@ });
               plaintext: plaintext,
-              prefixrandom: prefixrandom
+              prefixrandom: prefixrandom,
+              asp: asp
             }, esc(__iced_deferrals.defer({
-              lineno: 140
+              lineno: 148
             })));
@@ -425,3 +551,3 @@ __iced_deferrals._fulfill();
                 parent: ___iced_passed_deferral,
-                filename: "/Users/max/src/kbpgp/src/openpgp/burner.iced",
+                filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
                 funcname: "Burner._encrypt_payload"
@@ -435,3 +561,3 @@ });
                 })(),
-                lineno: 141
+                lineno: 149
               })));
@@ -458,7 +584,7 @@ __iced_deferrals._fulfill();
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/kbpgp/src/openpgp/burner.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
             funcname: "Burner._encrypt"
           });
           _this._make_session_key(esc(__iced_deferrals.defer({
-            lineno: 150
+            lineno: 158
           })));
@@ -472,7 +598,7 @@ __iced_deferrals._fulfill();
               parent: ___iced_passed_deferral,
-              filename: "/Users/max/src/kbpgp/src/openpgp/burner.iced",
+              filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
               funcname: "Burner._encrypt"
             });
             _this._encrypt_session_key(esc(__iced_deferrals.defer({
-              lineno: 151
+              lineno: 159
             })));
@@ -484,7 +610,7 @@ __iced_deferrals._fulfill();
                 parent: ___iced_passed_deferral,
-                filename: "/Users/max/src/kbpgp/src/openpgp/burner.iced",
+                filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
                 funcname: "Burner._encrypt"
               });
               _this._encrypt_payload(esc(__iced_deferrals.defer({
-                lineno: 152
+                lineno: 160
               })));
@@ -511,7 +637,7 @@ __iced_deferrals._fulfill();
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/kbpgp/src/openpgp/burner.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
             funcname: "Burner.burn"
           });
           _this._find_keys(esc(__iced_deferrals.defer({
-            lineno: 163
+            lineno: 171
           })));
@@ -525,7 +651,7 @@ __iced_deferrals._fulfill();
               parent: ___iced_passed_deferral,
-              filename: "/Users/max/src/kbpgp/src/openpgp/burner.iced",
+              filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
               funcname: "Burner.burn"
             });
             _this._frame_literals(esc(__iced_deferrals.defer({
-              lineno: 164
+              lineno: 172
             })));
@@ -539,7 +665,7 @@ __iced_deferrals._fulfill();
                     parent: ___iced_passed_deferral,
-                    filename: "/Users/max/src/kbpgp/src/openpgp/burner.iced",
+                    filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
                     funcname: "Burner.burn"
                   });
                   _this._sign(esc(__iced_deferrals.defer({
-                    lineno: 166
+                    lineno: 174
                   })));
@@ -555,7 +681,7 @@ __iced_deferrals._fulfill();
                   parent: ___iced_passed_deferral,
-                  filename: "/Users/max/src/kbpgp/src/openpgp/burner.iced",
+                  filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
                   funcname: "Burner.burn"
                 });
                 _this._compress(esc(__iced_deferrals.defer({
-                  lineno: 167
+                  lineno: 175
                 })));
@@ -569,7 +695,7 @@ __iced_deferrals._fulfill();
                         parent: ___iced_passed_deferral,
-                        filename: "/Users/max/src/kbpgp/src/openpgp/burner.iced",
+                        filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
                         funcname: "Burner.burn"
                       });
                       _this._encrypt(esc(__iced_deferrals.defer({
-                        lineno: 169
+                        lineno: 177
                       })));
@@ -613,6 +739,6 @@ __iced_deferrals._fulfill();
   exports.burn = function(_arg, cb) {
-    var aout, b, encrypt_for, encryption_key, err, literals, msg, opts, raw, sign_with, signing_key, ___iced_passed_deferral, __iced_deferrals, __iced_k;
+    var aout, asp, b, encrypt_for, encryption_key, err, literals, msg, opts, raw, sign_with, signing_key, ___iced_passed_deferral, __iced_deferrals, __iced_k;
     __iced_k = __iced_k_noop;
     ___iced_passed_deferral = iced.findDeferral(arguments);
-    msg = _arg.msg, literals = _arg.literals, sign_with = _arg.sign_with, encrypt_for = _arg.encrypt_for, signing_key = _arg.signing_key, encryption_key = _arg.encryption_key, opts = _arg.opts;
+    msg = _arg.msg, literals = _arg.literals, sign_with = _arg.sign_with, encrypt_for = _arg.encrypt_for, signing_key = _arg.signing_key, encryption_key = _arg.encryption_key, asp = _arg.asp, opts = _arg.opts;
     if ((msg != null) && (literals == null)) {
@@ -627,2 +753,3 @@ literals = make_simple_literals(msg);
       encryption_key: encryption_key,
+      asp: asp,
       opts: opts
@@ -634,3 +761,3 @@ });
           parent: ___iced_passed_deferral,
-          filename: "/Users/max/src/kbpgp/src/openpgp/burner.iced",
+          filename: "/home/max/src/keybase/kbpgp/src/openpgp/burner.iced",
           funcname: "burn"
@@ -645,3 +772,3 @@ });
           })(),
-          lineno: 229
+          lineno: 237
         }));
@@ -648,0 +775,0 @@ __iced_deferrals._fulfill();

lib/openpgp/ocfb.js

 // Generated by IcedCoffeeScript 1.7.1-c
 (function() {
-  var AES, Base, Decryptor, Encryptor, SlicerBuffer, WordArray, decrypt, encrypt, repeat, rng, test, triplesec,
+  var AES, ASP, Base, Decryptor, Encryptor, SlicerBuffer, WordArray, decrypt, encrypt, iced, make_esc, repeat, rng, test, triplesec, __iced_k, __iced_k_noop,
     __hasProp = {}.hasOwnProperty,
     __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; };
 
+  iced = require('iced-runtime').iced;
+  __iced_k = __iced_k_noop = function() {};
+
   WordArray = require('triplesec').WordArray;
@@ -15,2 +18,6 @@
 
+  ASP = require('pgp-utils').util.ASP;
+
+  make_esc = require('iced-error').make_esc;
+
   repeat = function(b, n) {
@@ -22,4 +29,4 @@ return Buffer.concat([b, b.slice(b.length - n)]);
     function Base(_arg) {
-      var key;
-      this.block_cipher_class = _arg.block_cipher_class, key = _arg.key, this.cipher = _arg.cipher, this.resync = _arg.resync;
+      var asp, key;
+      this.block_cipher_class = _arg.block_cipher_class, key = _arg.key, this.cipher = _arg.cipher, this.resync = _arg.resync, asp = _arg.asp;
       this.block_cipher_class || (this.block_cipher_class = AES);
@@ -29,2 +36,3 @@ this.cipher || (this.cipher = new this.block_cipher_class(WordArray.from_buffer(key)));
       this.out_bufs = [];
+      this.asp = ASP.make(asp);
     }
@@ -47,4 +55,4 @@
     function Encryptor(_arg) {
-      var block_cipher_class, cipher, key, prefixrandom, resync;
-      block_cipher_class = _arg.block_cipher_class, key = _arg.key, cipher = _arg.cipher, prefixrandom = _arg.prefixrandom, resync = _arg.resync;
+      var asp, block_cipher_class, cipher, key, prefixrandom, resync;
+      block_cipher_class = _arg.block_cipher_class, key = _arg.key, cipher = _arg.cipher, prefixrandom = _arg.prefixrandom, resync = _arg.resync, asp = _arg.asp;
       Encryptor.__super__.constructor.call(this, {
@@ -54,3 +62,4 @@ block_cipher_class: block_cipher_class,
         cipher: cipher,
-        resync: resync
+        resync: resync,
+        asp: asp
       });
@@ -119,5 +128,8 @@ this._init(prefixrandom);
 
-    Encryptor.prototype.enc = function(plaintext) {
-      var buf, ct, n_wanted, ret, sb, wa;
+    Encryptor.prototype.enc = function(plaintext, cb) {
+      var buf, ct, esc, j, n_wanted, ret, sb, total, wa, ___iced_passed_deferral, __iced_deferrals, __iced_k;
+      __iced_k = __iced_k_noop;
+      ___iced_passed_deferral = iced.findDeferral(arguments);
       sb = new SlicerBuffer(plaintext);
+      esc = make_esc(cb, "Encryptor::enc");
       if (this.resync) {
@@ -134,9 +146,74 @@ this._emit_sb(sb);
       }
-      while (sb.rem()) {
-        this._enc();
-        this._emit_sb(sb);
-      }
-      ret = this.compact();
-      n_wanted = plaintext.length + this.block_size + 2;
-      return ret.slice(0, n_wanted);
+      total = sb.rem();
+      (function(_this) {
+        return (function(__iced_k) {
+          __iced_deferrals = new iced.Deferrals(__iced_k, {
+            parent: ___iced_passed_deferral,
+            filename: "/home/max/src/keybase/kbpgp/src/openpgp/ocfb.iced",
+            funcname: "Encryptor.enc"
+          });
+          _this.asp.progress({
+            what: "ofcb encryption",
+            i: 0,
+            total: total
+          }, esc(__iced_deferrals.defer({
+            lineno: 168
+          })));
+          __iced_deferrals._fulfill();
+        });
+      })(this)((function(_this) {
+        return function() {
+          (function(__iced_k) {
+            var _results, _while;
+            _results = [];
+            _while = function(__iced_k) {
+              var _break, _continue, _i, _next;
+              _break = function() {
+                return __iced_k(_results);
+              };
+              _continue = function() {
+                return iced.trampoline(function() {
+                  return _while(__iced_k);
+                });
+              };
+              _next = function(__iced_next_arg) {
+                _results.push(__iced_next_arg);
+                return _continue();
+              };
+              if (!(j = sb.rem())) {
+                return _break();
+              } else {
+                for (_i = 0; _i < 4096; _i++) {
+                  _this._enc();
+                  _this._emit_sb(sb);
+                  if (!(j = sb.rem())) {
+                    break;
+                  }
+                }
+                (function(__iced_k) {
+                  __iced_deferrals = new iced.Deferrals(__iced_k, {
+                    parent: ___iced_passed_deferral,
+                    filename: "/home/max/src/keybase/kbpgp/src/openpgp/ocfb.iced",
+                    funcname: "Encryptor.enc"
+                  });
+                  _this.asp.progress({
+                    what: "ofcb encryption",
+                    i: total - j,
+                    total: total
+                  }, esc(__iced_deferrals.defer({
+                    lineno: 177
+                  })));
+                  __iced_deferrals._fulfill();
+                })(_next);
+              }
+            };
+            _while(__iced_k);
+          })(function() {
+            ret = _this.compact();
+            n_wanted = plaintext.length + _this.block_size + 2;
+            ret = ret.slice(0, n_wanted);
+            return cb(null, ret);
+          });
+        };
+      })(this));
     };
@@ -152,4 +229,4 @@
     function Decryptor(_arg) {
-      var block_cipher_class, cipher, key, prefixrandom, resync;
-      block_cipher_class = _arg.block_cipher_class, key = _arg.key, cipher = _arg.cipher, prefixrandom = _arg.prefixrandom, resync = _arg.resync, this.ciphertext = _arg.ciphertext;
+      var asp, block_cipher_class, cipher, key, prefixrandom, resync;
+      block_cipher_class = _arg.block_cipher_class, key = _arg.key, cipher = _arg.cipher, prefixrandom = _arg.prefixrandom, resync = _arg.resync, this.ciphertext = _arg.ciphertext, asp = _arg.asp;
       Decryptor.__super__.constructor.call(this, {
@@ -159,3 +236,4 @@ block_cipher_class: block_cipher_class,
         cipher: cipher,
-        resync: resync
+        resync: resync,
+        asp: asp
       });
@@ -181,4 +259,4 @@ this._init();
 
-    Decryptor.prototype.check = function() {
-      var ablock, i, iblock, lhs, rhs;
+    Decryptor.prototype.check = function(cb) {
+      var ablock, err, i, iblock, lhs, rhs;
       this.reset();
@@ -200,11 +278,10 @@ iblock = new WordArray((function() {
       rhs = (ablock.words[0] >>> 16) ^ (this.sb.peek_uint16());
-      if (lhs === rhs) {
-        return null;
-      } else {
-        return new Error("Canary block mismatch: " + lhs + " != " + rhs);
-      }
+      err = lhs === rhs ? null : new Error("Canary block mismatch: " + lhs + " != " + rhs);
+      return cb(err);
     };
 
-    Decryptor.prototype.dec = function() {
-      var ablock, iblock, out;
+    Decryptor.prototype.dec = function(cb) {
+      var ablock, esc, iblock, j, out, total, ___iced_passed_deferral, __iced_deferrals, __iced_k;
+      __iced_k = __iced_k_noop;
+      ___iced_passed_deferral = iced.findDeferral(arguments);
       this.reset();
@@ -215,14 +292,79 @@ if (this.resync) {
       iblock = this.next_block();
-      while (this.sb.rem()) {
-        ablock = iblock;
-        this.cipher.encryptBlock(ablock.words, 0);
-        iblock = this.next_block();
-        ablock.xor(iblock, {});
-        this.out_bufs.push(ablock.to_buffer().slice(0, iblock.sigBytes));
-      }
-      out = this.compact();
-      if (!this.resync) {
-        out = out.slice(2);
-      }
-      return out;
+      esc = make_esc(cb, "Decryption::dec");
+      total = this.sb.rem();
+      (function(_this) {
+        return (function(__iced_k) {
+          __iced_deferrals = new iced.Deferrals(__iced_k, {
+            parent: ___iced_passed_deferral,
+            filename: "/home/max/src/keybase/kbpgp/src/openpgp/ocfb.iced",
+            funcname: "Decryptor.dec"
+          });
+          _this.asp.progress({
+            what: "ofcb decrypt",
+            i: 0,
+            total: total
+          }, esc(__iced_deferrals.defer({
+            lineno: 239
+          })));
+          __iced_deferrals._fulfill();
+        });
+      })(this)((function(_this) {
+        return function() {
+          (function(__iced_k) {
+            var _results, _while;
+            _results = [];
+            _while = function(__iced_k) {
+              var _break, _continue, _i, _next;
+              _break = function() {
+                return __iced_k(_results);
+              };
+              _continue = function() {
+                return iced.trampoline(function() {
+                  return _while(__iced_k);
+                });
+              };
+              _next = function(__iced_next_arg) {
+                _results.push(__iced_next_arg);
+                return _continue();
+              };
+              if (!(j = _this.sb.rem())) {
+                return _break();
+              } else {
+                for (_i = 0; _i < 4096; _i++) {
+                  ablock = iblock;
+                  _this.cipher.encryptBlock(ablock.words, 0);
+                  iblock = _this.next_block();
+                  ablock.xor(iblock, {});
+                  _this.out_bufs.push(ablock.to_buffer().slice(0, iblock.sigBytes));
+                  if (!(j = _this.sb.rem())) {
+                    break;
+                  }
+                }
+                (function(__iced_k) {
+                  __iced_deferrals = new iced.Deferrals(__iced_k, {
+                    parent: ___iced_passed_deferral,
+                    filename: "/home/max/src/keybase/kbpgp/src/openpgp/ocfb.iced",
+                    funcname: "Decryptor.dec"
+                  });
+                  _this.asp.progress({
+                    what: "ofcb decrypt",
+                    i: total - j,
+                    total: total
+                  }, esc(__iced_deferrals.defer({
+                    lineno: 251
+                  })));
+                  __iced_deferrals._fulfill();
+                })(_next);
+              }
+            };
+            _while(__iced_k);
+          })(function() {
+            out = _this.compact();
+            if (!_this.resync) {
+              out = out.slice(2);
+            }
+            return cb(null, out);
+          });
+        };
+      })(this));
     };
@@ -234,5 +376,5 @@
 
-  encrypt = function(_arg) {
-    var block_cipher_class, cipher, eng, key, plaintext, prefixrandom, resync;
-    block_cipher_class = _arg.block_cipher_class, key = _arg.key, cipher = _arg.cipher, prefixrandom = _arg.prefixrandom, resync = _arg.resync, plaintext = _arg.plaintext;
+  encrypt = function(_arg, cb) {
+    var asp, block_cipher_class, cipher, eng, key, plaintext, prefixrandom, resync;
+    block_cipher_class = _arg.block_cipher_class, key = _arg.key, cipher = _arg.cipher, prefixrandom = _arg.prefixrandom, resync = _arg.resync, plaintext = _arg.plaintext, asp = _arg.asp;
     eng = new Encryptor({
@@ -243,10 +385,13 @@ block_cipher_class: block_cipher_class,
       prefixrandom: prefixrandom,
-      resync: resync
+      resync: resync,
+      asp: asp
     });
-    return eng.enc(plaintext);
+    return eng.enc(plaintext, cb);
   };
 
-  decrypt = function(_arg) {
-    var block_cipher_class, cipher, ciphertext, eng, err, key, resync;
-    block_cipher_class = _arg.block_cipher_class, key = _arg.key, cipher = _arg.cipher, resync = _arg.resync, ciphertext = _arg.ciphertext;
+  decrypt = function(_arg, cb) {
+    var asp, block_cipher_class, cipher, ciphertext, eng, err, key, pt, resync, ___iced_passed_deferral, __iced_deferrals, __iced_k;
+    __iced_k = __iced_k_noop;
+    ___iced_passed_deferral = iced.findDeferral(arguments);
+    block_cipher_class = _arg.block_cipher_class, key = _arg.key, cipher = _arg.cipher, resync = _arg.resync, ciphertext = _arg.ciphertext, asp = _arg.asp;
     eng = new Decryptor({
@@ -257,9 +402,49 @@ block_cipher_class: block_cipher_class,
       resync: resync,
-      ciphertext: ciphertext
+      ciphertext: ciphertext,
+      asp: asp
     });
-    err = eng.check();
-    if (err != null) {
-      throw err;
-    }
-    return eng.dec();
+    (function(_this) {
+      return (function(__iced_k) {
+        __iced_deferrals = new iced.Deferrals(__iced_k, {
+          parent: ___iced_passed_deferral,
+          filename: "/home/max/src/keybase/kbpgp/src/openpgp/ocfb.iced"
+        });
+        eng.check(__iced_deferrals.defer({
+          assign_fn: (function() {
+            return function() {
+              return err = arguments[0];
+            };
+          })(),
+          lineno: 267
+        }));
+        __iced_deferrals._fulfill();
+      });
+    })(this)((function(_this) {
+      return function() {
+        (function(__iced_k) {
+          if (typeof err === "undefined" || err === null) {
+            (function(__iced_k) {
+              __iced_deferrals = new iced.Deferrals(__iced_k, {
+                parent: ___iced_passed_deferral,
+                filename: "/home/max/src/keybase/kbpgp/src/openpgp/ocfb.iced"
+              });
+              eng.dec(__iced_deferrals.defer({
+                assign_fn: (function() {
+                  return function() {
+                    err = arguments[0];
+                    return pt = arguments[1];
+                  };
+                })(),
+                lineno: 268
+              }));
+              __iced_deferrals._fulfill();
+            })(__iced_k);
+          } else {
+            return __iced_k();
+          }
+        })(function() {
+          return cb(err, pt);
+        });
+      };
+    })(this));
   };
@@ -266,0 +451,0 @@

lib/openpgp/packet/compressed.js

@@ -61,3 +61,3 @@ // Generated by IcedCoffeeScript 1.7.1-c
           parent: ___iced_passed_deferral,
-          filename: "/Users/max/src/keybase/kbpgp/src/openpgp/packet/compressed.iced"
+          filename: "/home/max/src/keybase/kbpgp/src/openpgp/packet/compressed.iced"
         });
@@ -70,3 +70,3 @@ inflater.write(buf, __iced_deferrals.defer({
           })(),
-          lineno: 42
+          lineno: 53
         }));
@@ -82,3 +82,3 @@ __iced_deferrals._fulfill();
                 parent: ___iced_passed_deferral,
-                filename: "/Users/max/src/keybase/kbpgp/src/openpgp/packet/compressed.iced"
+                filename: "/home/max/src/keybase/kbpgp/src/openpgp/packet/compressed.iced"
               });
@@ -108,3 +108,3 @@ inflater.end(err);
           parent: ___iced_passed_deferral,
-          filename: "/Users/max/src/keybase/kbpgp/src/openpgp/packet/compressed.iced"
+          filename: "/home/max/src/keybase/kbpgp/src/openpgp/packet/compressed.iced"
         });
@@ -118,3 +118,3 @@ zlib.deflate(buf, __iced_deferrals.defer({
           })(),
-          lineno: 51
+          lineno: 62
         }));
@@ -170,3 +170,3 @@ __iced_deferrals._fulfill();
                   parent: ___iced_passed_deferral,
-                  filename: "/Users/max/src/keybase/kbpgp/src/openpgp/packet/compressed.iced",
+                  filename: "/home/max/src/keybase/kbpgp/src/openpgp/packet/compressed.iced",
                   funcname: "Compressed.inflate"
@@ -181,3 +181,3 @@ });
                   })(),
-                  lineno: 85
+                  lineno: 96
                 }));
@@ -188,7 +188,6 @@ __iced_deferrals._fulfill();
             case C.compression.zip:
-              console.log("ok, i'm unzipping now!");
               (function(__iced_k) {
                 __iced_deferrals = new iced.Deferrals(__iced_k, {
                   parent: ___iced_passed_deferral,
-                  filename: "/Users/max/src/keybase/kbpgp/src/openpgp/packet/compressed.iced",
+                  filename: "/home/max/src/keybase/kbpgp/src/openpgp/packet/compressed.iced",
                   funcname: "Compressed.inflate"
@@ -203,3 +202,3 @@ });
                   })(),
-                  lineno: 88
+                  lineno: 98
                 }));
@@ -213,3 +212,3 @@ __iced_deferrals._fulfill();
                   parent: ___iced_passed_deferral,
-                  filename: "/Users/max/src/keybase/kbpgp/src/openpgp/packet/compressed.iced",
+                  filename: "/home/max/src/keybase/kbpgp/src/openpgp/packet/compressed.iced",
                   funcname: "Compressed.inflate"
@@ -224,3 +223,3 @@ });
                   })(),
-                  lineno: 90
+                  lineno: 100
                 }));
@@ -255,3 +254,3 @@ __iced_deferrals._fulfill();
                   parent: ___iced_passed_deferral,
-                  filename: "/Users/max/src/keybase/kbpgp/src/openpgp/packet/compressed.iced",
+                  filename: "/home/max/src/keybase/kbpgp/src/openpgp/packet/compressed.iced",
                   funcname: "Compressed.deflate"
@@ -266,3 +265,3 @@ });
                   })(),
-                  lineno: 102
+                  lineno: 112
                 }));
@@ -276,3 +275,3 @@ __iced_deferrals._fulfill();
                   parent: ___iced_passed_deferral,
-                  filename: "/Users/max/src/keybase/kbpgp/src/openpgp/packet/compressed.iced",
+                  filename: "/home/max/src/keybase/kbpgp/src/openpgp/packet/compressed.iced",
                   funcname: "Compressed.deflate"
@@ -287,3 +286,3 @@ });
                   })(),
-                  lineno: 104
+                  lineno: 114
                 }));
@@ -313,3 +312,3 @@ __iced_deferrals._fulfill();
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/keybase/kbpgp/src/openpgp/packet/compressed.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/openpgp/packet/compressed.iced",
             funcname: "Compressed.write_unframed"
@@ -324,3 +323,3 @@ });
             })(_this),
-            lineno: 113
+            lineno: 123
           }));
@@ -349,3 +348,3 @@ __iced_deferrals._fulfill();
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/keybase/kbpgp/src/openpgp/packet/compressed.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/openpgp/packet/compressed.iced",
             funcname: "Compressed.write"
@@ -360,3 +359,3 @@ });
             })(),
-            lineno: 123
+            lineno: 133
           }));
@@ -363,0 +362,0 @@ __iced_deferrals._fulfill();

lib/openpgp/packet/literal.js

@@ -31,6 +31,13 @@ // Generated by IcedCoffeeScript 1.7.1-c
 
-    Literal.prototype.toString = function() {
-      return this.data.toString(this.buffer_format());
+    Literal.prototype.toString = function(encoding) {
+      if (encoding == null) {
+        encoding = null;
+      }
+      return this.data.toString(encoding || this.buffer_format());
     };
 
+    Literal.prototype.toBuffer = function() {
+      return this.data;
+    };
+
     Literal.prototype.buffer_format = function() {
@@ -68,3 +75,3 @@ switch (this.format) {
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/kbpgp/src/openpgp/packet/literal.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/openpgp/packet/literal.iced",
             funcname: "Literal.write"
@@ -79,3 +86,3 @@ });
             })(),
-            lineno: 40
+            lineno: 41
           }));
@@ -82,0 +89,0 @@ __iced_deferrals._fulfill();

lib/openpgp/packet/packetsigs.js

@@ -85,2 +85,7 @@ // Generated by IcedCoffeeScript 1.7.1-c
 
+    Data.prototype.get_key_manager = function() {
+      var _ref;
+      return (_ref = this.sig) != null ? _ref.key_manager : void 0;
+    };
+
     return Data;
@@ -87,0 +92,0 @@

lib/openpgp/packet/sess.js

 // Generated by IcedCoffeeScript 1.7.1-c
 (function() {
-  var C, Decryptor, MDC, MDC_Parser, PKESK, PKESK_Parser, Packet, SEIPD, SEIPD_Parser, SHA1, asymmetric, bufeq_fast, bufeq_secure, encrypt, iced, uint_to_buffer, __iced_k, __iced_k_noop, _ref, _ref1,
+  var ASP, C, Decryptor, MDC, MDC_Parser, PKESK, PKESK_Parser, Packet, SEIPD, SEIPD_Parser, SHA1, asymmetric, bufeq_fast, bufeq_secure, encrypt, iced, make_esc, streamers, uint_to_buffer, __iced_k, __iced_k_noop, _ref, _ref1, _ref2,
     __hasProp = {}.hasOwnProperty,
@@ -16,8 +16,12 @@ __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; };
 
-  SHA1 = require('../../hash').SHA1;
+  _ref = require('../../hash'), SHA1 = _ref.SHA1, streamers = _ref.streamers;
 
-  _ref = require('../../util'), uint_to_buffer = _ref.uint_to_buffer, bufeq_secure = _ref.bufeq_secure, bufeq_fast = _ref.bufeq_fast;
+  _ref1 = require('../../util'), uint_to_buffer = _ref1.uint_to_buffer, bufeq_secure = _ref1.bufeq_secure, bufeq_fast = _ref1.bufeq_fast;
 
-  _ref1 = require('../ocfb'), encrypt = _ref1.encrypt, Decryptor = _ref1.Decryptor;
+  _ref2 = require('../ocfb'), encrypt = _ref2.encrypt, Decryptor = _ref2.Decryptor;
 
+  ASP = require('pgp-utils').util.ASP;
+
+  make_esc = require('iced-error').make_esc;
+
   PKESK = (function(_super) {
@@ -59,3 +63,3 @@ __extends(PKESK, _super);
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/kbpgp/src/openpgp/packet/sess.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/openpgp/packet/sess.iced",
             funcname: "PKESK.write"
@@ -70,3 +74,3 @@ });
             })(),
-            lineno: 34
+            lineno: 36
           }));
@@ -106,40 +110,126 @@ __iced_deferrals._fulfill();
 
-    SEIPD.prototype.decrypt = function(cipher) {
-      var eng, err, mdc, plaintext, prefix, pt, _ref2;
+    SEIPD.prototype.decrypt = function(_arg, cb) {
+      var asp, cipher, eng, err, esc, mdc, plaintext, prefix, pt, ___iced_passed_deferral, __iced_deferrals, __iced_k;
+      __iced_k = __iced_k_noop;
+      ___iced_passed_deferral = iced.findDeferral(arguments);
+      cipher = _arg.cipher, asp = _arg.asp;
       eng = new Decryptor({
         cipher: cipher,
-        ciphertext: this.ciphertext
+        ciphertext: this.ciphertext,
+        asp: asp
       });
-      err = eng.check();
-      if (err != null) {
-        throw err;
-      }
-      pt = eng.dec();
-      _ref2 = MDC.parse(pt), mdc = _ref2[0], plaintext = _ref2[1];
-      prefix = eng.get_prefix();
-      mdc.compute({
-        prefix: prefix,
-        plaintext: plaintext
-      });
-      if (!mdc.check()) {
-        throw new Error("MDC mismatch");
-      }
-      return plaintext;
+      esc = make_esc(cb, "SEIPD::decrypt");
+      asp = ASP.make(asp);
+      (function(_this) {
+        return (function(__iced_k) {
+          __iced_deferrals = new iced.Deferrals(__iced_k, {
+            parent: ___iced_passed_deferral,
+            filename: "/home/max/src/keybase/kbpgp/src/openpgp/packet/sess.iced",
+            funcname: "SEIPD.decrypt"
+          });
+          eng.check(esc(__iced_deferrals.defer({
+            lineno: 63
+          })));
+          __iced_deferrals._fulfill();
+        });
+      })(this)((function(_this) {
+        return function() {
+          (function(__iced_k) {
+            __iced_deferrals = new iced.Deferrals(__iced_k, {
+              parent: ___iced_passed_deferral,
+              filename: "/home/max/src/keybase/kbpgp/src/openpgp/packet/sess.iced",
+              funcname: "SEIPD.decrypt"
+            });
+            eng.dec(esc(__iced_deferrals.defer({
+              assign_fn: (function() {
+                return function() {
+                  return pt = arguments[0];
+                };
+              })(),
+              lineno: 64
+            })));
+            __iced_deferrals._fulfill();
+          })(function() {
+            var _ref3;
+            _ref3 = MDC.parse(pt), mdc = _ref3[0], plaintext = _ref3[1];
+            prefix = eng.get_prefix();
+            (function(__iced_k) {
+              __iced_deferrals = new iced.Deferrals(__iced_k, {
+                parent: ___iced_passed_deferral,
+                filename: "/home/max/src/keybase/kbpgp/src/openpgp/packet/sess.iced",
+                funcname: "SEIPD.decrypt"
+              });
+              mdc.compute({
+                prefix: prefix,
+                plaintext: plaintext,
+                asp: asp
+              }, esc(__iced_deferrals.defer({
+                lineno: 70
+              })));
+              __iced_deferrals._fulfill();
+            })(function() {
+              err = mdc.check() ? null : new Error("MDC mismatch");
+              return cb(err, plaintext);
+            });
+          });
+        };
+      })(this));
     };
 
     SEIPD.prototype.encrypt = function(_arg, cb) {
-      var cipher, mdc, mdc_buf, plaintext, prefixrandom;
-      cipher = _arg.cipher, plaintext = _arg.plaintext, prefixrandom = _arg.prefixrandom;
+      var asp, cipher, esc, mdc, mdc_buf, plaintext, prefixrandom, ___iced_passed_deferral, __iced_deferrals, __iced_k;
+      __iced_k = __iced_k_noop;
+      ___iced_passed_deferral = iced.findDeferral(arguments);
+      cipher = _arg.cipher, plaintext = _arg.plaintext, prefixrandom = _arg.prefixrandom, asp = _arg.asp;
       mdc = new MDC({});
-      mdc_buf = mdc.compute({
-        plaintext: plaintext,
-        prefix: prefixrandom
-      });
-      plaintext = Buffer.concat([plaintext, MDC.header, mdc_buf]);
-      this.ciphertext = encrypt({
-        cipher: cipher,
-        plaintext: plaintext,
-        prefixrandom: prefixrandom
-      });
-      return cb(null);
+      esc = make_esc(cb, "SEIPD::encrypt");
+      asp = ASP.make(asp);
+      (function(_this) {
+        return (function(__iced_k) {
+          __iced_deferrals = new iced.Deferrals(__iced_k, {
+            parent: ___iced_passed_deferral,
+            filename: "/home/max/src/keybase/kbpgp/src/openpgp/packet/sess.iced",
+            funcname: "SEIPD.encrypt"
+          });
+          mdc.compute({
+            plaintext: plaintext,
+            prefix: prefixrandom,
+            asp: asp
+          }, esc(__iced_deferrals.defer({
+            assign_fn: (function() {
+              return function() {
+                return mdc_buf = arguments[0];
+              };
+            })(),
+            lineno: 81
+          })));
+          __iced_deferrals._fulfill();
+        });
+      })(this)((function(_this) {
+        return function() {
+          plaintext = Buffer.concat([plaintext, MDC.header, mdc_buf]);
+          (function(__iced_k) {
+            __iced_deferrals = new iced.Deferrals(__iced_k, {
+              parent: ___iced_passed_deferral,
+              filename: "/home/max/src/keybase/kbpgp/src/openpgp/packet/sess.iced",
+              funcname: "SEIPD.encrypt"
+            });
+            encrypt({
+              cipher: cipher,
+              plaintext: plaintext,
+              prefixrandom: prefixrandom
+            }, esc(__iced_deferrals.defer({
+              assign_fn: (function(__slot_1) {
+                return function() {
+                  return __slot_1.ciphertext = arguments[0];
+                };
+              })(_this),
+              lineno: 83
+            })));
+            __iced_deferrals._fulfill();
+          })(function() {
+            return cb(null);
+          });
+        };
+      })(this));
     };
@@ -163,3 +253,3 @@
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/kbpgp/src/openpgp/packet/sess.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/openpgp/packet/sess.iced",
             funcname: "SEIPD.write"
@@ -174,3 +264,3 @@ });
             })(),
-            lineno: 90
+            lineno: 97
           }));
@@ -208,7 +298,70 @@ __iced_deferrals._fulfill();
 
-    MDC.prototype.compute = function(_arg) {
-      var plaintext, prefix;
-      plaintext = _arg.plaintext, prefix = _arg.prefix;
-      this.computed = SHA1(Buffer.concat([prefix, prefix.slice(-2), plaintext, this.header]));
-      return this.computed;
+    MDC.prototype.compute = function(_arg, cb) {
+      var asp, esc, hasher, i, plaintext, prefix, step, ___iced_passed_deferral, __iced_deferrals, __iced_k, _begin, _end, _positive;
+      __iced_k = __iced_k_noop;
+      ___iced_passed_deferral = iced.findDeferral(arguments);
+      plaintext = _arg.plaintext, prefix = _arg.prefix, asp = _arg.asp;
+      asp = ASP.make(asp);
+      hasher = streamers.SHA1();
+      hasher.update(Buffer.concat([prefix, prefix.slice(-2)]));
+      esc = make_esc(cb, "MDC::compute");
+      step = 0x100000;
+      (function(_this) {
+        return (function(__iced_k) {
+          var _i, _results, _while;
+          i = 0;
+          _begin = 0;
+          _end = plaintext.length;
+          _positive = _end > _begin;
+          _results = [];
+          _while = function(__iced_k) {
+            var _break, _continue, _next;
+            _break = function() {
+              return __iced_k(_results);
+            };
+            _continue = function() {
+              return iced.trampoline(function() {
+                if (_positive) {
+                  i += step;
+                } else {
+                  i -= step;
+                }
+                return _while(__iced_k);
+              });
+            };
+            _next = function(__iced_next_arg) {
+              _results.push(__iced_next_arg);
+              return _continue();
+            };
+            if (!!((_positive === true && i >= plaintext.length) || (_positive === false && i <= plaintext.length))) {
+              return _break();
+            } else {
+
+              hasher.update(plaintext.slice(i, i + step));
+              (function(__iced_k) {
+                __iced_deferrals = new iced.Deferrals(__iced_k, {
+                  parent: ___iced_passed_deferral,
+                  filename: "/home/max/src/keybase/kbpgp/src/openpgp/packet/sess.iced",
+                  funcname: "MDC.compute"
+                });
+                asp.progress({
+                  what: "MDC",
+                  total: plaintext.length,
+                  i: i
+                }, esc(__iced_deferrals.defer({
+                  lineno: 122
+                })));
+                __iced_deferrals._fulfill();
+              })(_next);
+            }
+          };
+          _while(__iced_k);
+        });
+      })(this)((function(_this) {
+        return function() {
+          hasher.update(_this.header);
+          _this.computed = hasher();
+          return cb(null, _this.computed);
+        };
+      })(this));
     };
@@ -215,0 +368,0 @@

lib/openpgp/processor.js

 // Generated by IcedCoffeeScript 1.7.1-c
 (function() {
-  var C, KeyBlock, Message, OPS, Warnings, armor, athrow, bufeq_secure, do_message, hashmod, iced, import_key_pgp, konst, make_esc, parse, unix_time, util, verify_clearsign, verify_detached, __iced_k, __iced_k_noop, _ref;
+  var C, KeyBlock, Message, OPS, Warnings, armor, athrow, bufeq_secure, do_message, hashmod, iced, import_key_pgp, katch, konst, make_esc, parse, unix_time, util, verify_clearsign, verify_detached, __iced_k, __iced_k_noop, _ref;
 
@@ -16,3 +16,3 @@ iced = require('iced-runtime').iced;
 
-  _ref = require('../util'), unix_time = _ref.unix_time, athrow = _ref.athrow, Warnings = _ref.Warnings, bufeq_secure = _ref.bufeq_secure;
+  _ref = require('../util'), katch = _ref.katch, unix_time = _ref.unix_time, athrow = _ref.athrow, Warnings = _ref.Warnings, bufeq_secure = _ref.bufeq_secure;
 
@@ -118,3 +118,3 @@ parse = require('./parser').parse;
                 parent: ___iced_passed_deferral,
-                filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+                filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
                 funcname: "KeyBlock.process"
@@ -199,3 +199,3 @@ });
                             parent: ___iced_passed_deferral,
-                            filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+                            filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
                             funcname: "KeyBlock._verify_sigs"
@@ -269,3 +269,3 @@ });
                 parent: ___iced_passed_deferral,
-                filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+                filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
                 funcname: "Message._get_session_key"
@@ -294,3 +294,3 @@ });
                       parent: ___iced_passed_deferral,
-                      filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+                      filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
                       funcname: "Message._get_session_key"
@@ -340,12 +340,39 @@ });
     Message.prototype._decrypt_with_session_key = function(sesskey, edat, pkcs5, cb) {
-      var cipher, e, err, ret;
-      err = null;
-      try {
-        cipher = import_key_pgp(sesskey, pkcs5);
-        ret = edat.decrypt(cipher);
-      } catch (_error) {
-        e = _error;
-        err = e;
-      }
-      return cb(err, ret);
+      var cipher, err, ret, ___iced_passed_deferral, __iced_deferrals, __iced_k, _ref1;
+      __iced_k = __iced_k_noop;
+      ___iced_passed_deferral = iced.findDeferral(arguments);
+      _ref1 = katch(function() {
+        return import_key_pgp(sesskey, pkcs5);
+      }), err = _ref1[0], cipher = _ref1[1];
+      (function(_this) {
+        return (function(__iced_k) {
+          if (err == null) {
+            (function(__iced_k) {
+              __iced_deferrals = new iced.Deferrals(__iced_k, {
+                parent: ___iced_passed_deferral,
+                filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+                funcname: "Message._decrypt_with_session_key"
+              });
+              edat.decrypt({
+                cipher: cipher
+              }, __iced_deferrals.defer({
+                assign_fn: (function() {
+                  return function() {
+                    err = arguments[0];
+                    return ret = arguments[1];
+                  };
+                })(),
+                lineno: 175
+              }));
+              __iced_deferrals._fulfill();
+            })(__iced_k);
+          } else {
+            return __iced_k();
+          }
+        });
+      })(this)((function(_this) {
+        return function() {
+          return cb(err, ret);
+        };
+      })(this));
     };
@@ -369,3 +396,3 @@
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
             funcname: "Message._decrypt"
@@ -381,3 +408,3 @@ });
             })(),
-            lineno: 192
+            lineno: 189
           })));
@@ -393,3 +420,3 @@ __iced_deferrals._fulfill();
                   parent: ___iced_passed_deferral,
-                  filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+                  filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
                   funcname: "Message._decrypt"
@@ -403,3 +430,3 @@ });
                   })(),
-                  lineno: 194
+                  lineno: 191
                 })));
@@ -411,3 +438,3 @@ __iced_deferrals._fulfill();
                     parent: ___iced_passed_deferral,
-                    filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+                    filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
                     funcname: "Message._decrypt"
@@ -421,3 +448,3 @@ });
                     })(),
-                    lineno: 195
+                    lineno: 192
                   })));
@@ -429,3 +456,3 @@ __iced_deferrals._fulfill();
                       parent: ___iced_passed_deferral,
-                      filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+                      filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
                       funcname: "Message._decrypt"
@@ -439,3 +466,3 @@ });
                       })(),
-                      lineno: 196
+                      lineno: 193
                     })));
@@ -493,3 +520,3 @@ __iced_deferrals._fulfill();
                   parent: ___iced_passed_deferral,
-                  filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+                  filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
                   funcname: "Message._inflate"
@@ -503,3 +530,3 @@ });
                   })(),
-                  lineno: 206
+                  lineno: 203
                 })));
@@ -513,3 +540,3 @@ __iced_deferrals._fulfill();
                         parent: ___iced_passed_deferral,
-                        filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+                        filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
                         funcname: "Message._inflate"
@@ -523,3 +550,3 @@ });
                         })(),
-                        lineno: 208
+                        lineno: 205
                       })));
@@ -590,3 +617,3 @@ __iced_deferrals._fulfill();
                 parent: ___iced_passed_deferral,
-                filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+                filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
                 funcname: "Message._verify_sig"
@@ -602,3 +629,3 @@ });
                 })(),
-                lineno: 246
+                lineno: 243
               }));
@@ -621,3 +648,3 @@ __iced_deferrals._fulfill();
                   parent: ___iced_passed_deferral,
-                  filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+                  filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
                   funcname: "Message._verify_sig"
@@ -631,3 +658,3 @@ });
                   })(),
-                  lineno: 257
+                  lineno: 254
                 }));
@@ -681,7 +708,7 @@ __iced_deferrals._fulfill();
                   parent: ___iced_passed_deferral,
-                  filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+                  filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
                   funcname: "Message._verify"
                 });
                 _this._verify_sig(sig, esc(__iced_deferrals.defer({
-                  lineno: 267
+                  lineno: 264
                 })));
@@ -725,7 +752,7 @@ __iced_deferrals._fulfill();
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
             funcname: "Message._process_generic"
           });
           _this._decrypt(esc(__iced_deferrals.defer({
-            lineno: 280
+            lineno: 277
           })));
@@ -739,7 +766,7 @@ __iced_deferrals._fulfill();
               parent: ___iced_passed_deferral,
-              filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+              filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
               funcname: "Message._process_generic"
             });
             _this._inflate(esc(__iced_deferrals.defer({
-              lineno: 281
+              lineno: 278
             })));
@@ -751,7 +778,7 @@ __iced_deferrals._fulfill();
                 parent: ___iced_passed_deferral,
-                filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+                filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
                 funcname: "Message._process_generic"
               });
               _this._verify(esc(__iced_deferrals.defer({
-                lineno: 282
+                lineno: 279
               })));
@@ -780,3 +807,3 @@ __iced_deferrals._fulfill();
                 parent: ___iced_passed_deferral,
-                filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+                filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
                 funcname: "Message._verify_clearsign"
@@ -795,3 +822,3 @@ });
                 })(),
-                lineno: 291
+                lineno: 288
               }));
@@ -818,3 +845,3 @@ __iced_deferrals._fulfill();
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
             funcname: "Message.parse_and_process"
@@ -828,3 +855,3 @@ });
             })(),
-            lineno: 298
+            lineno: 295
           })));
@@ -838,3 +865,3 @@ __iced_deferrals._fulfill();
               parent: ___iced_passed_deferral,
-              filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+              filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
               funcname: "Message.parse_and_process"
@@ -851,3 +878,3 @@ });
               })(),
-              lineno: 299
+              lineno: 296
             })));
@@ -875,3 +902,3 @@ __iced_deferrals._fulfill();
                 parent: ___iced_passed_deferral,
-                filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+                filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
                 funcname: "Message._verify_signature"
@@ -890,3 +917,3 @@ });
                 })(),
-                lineno: 308
+                lineno: 305
               }));
@@ -917,3 +944,3 @@ __iced_deferrals._fulfill();
                   parent: ___iced_passed_deferral,
-                  filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+                  filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
                   funcname: "Message._process"
@@ -930,3 +957,3 @@ });
                   })(),
-                  lineno: 317
+                  lineno: 314
                 }));
@@ -940,3 +967,3 @@ __iced_deferrals._fulfill();
                   parent: ___iced_passed_deferral,
-                  filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+                  filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
                   funcname: "Message._process"
@@ -954,3 +981,3 @@ });
                   })(),
-                  lineno: 319
+                  lineno: 316
                 }));
@@ -964,3 +991,3 @@ __iced_deferrals._fulfill();
                   parent: ___iced_passed_deferral,
-                  filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+                  filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced",
                   funcname: "Message._process"
@@ -977,3 +1004,3 @@ });
                   })(),
-                  lineno: 321
+                  lineno: 318
                 }));
@@ -1027,3 +1054,3 @@ __iced_deferrals._fulfill();
               parent: ___iced_passed_deferral,
-              filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced"
+              filename: "/home/max/src/keybase/kbpgp/src/openpgp/processor.iced"
             });
@@ -1037,3 +1064,3 @@ proc.parse_and_process(msg, __iced_deferrals.defer({
               })(),
-              lineno: 359
+              lineno: 356
             }));
@@ -1040,0 +1067,0 @@ __iced_deferrals._fulfill();

lib/openpgp/verifier.js

@@ -33,3 +33,3 @@ // Generated by IcedCoffeeScript 1.7.1-c
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/keybase/kbpgp/src/openpgp/verifier.iced",
+            filename: "/home/max/src/keybase/kbpgp/src/openpgp/verifier.iced",
             funcname: "Base._fetch_key"
@@ -36,0 +36,0 @@ });

package.json

@@ -10,3 +10,3 @@ {
   "author": "Maxwell Krohn",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "license": "BSD-3-Clause",
@@ -32,3 +32,3 @@ "main": "./lib/main.js",
     "purepack": ">=1.0.1",
-    "triplesec": ">=3.0.16"
+    "triplesec": ">=3.0.18"
   },
@@ -35,0 +35,0 @@ "devDependencies": {

SIGNED.md

@@ -5,11 +5,11 @@ ##### Signed by https://keybase.io/max
 Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
-Comment: GPGTools - https://gpgtools.org
+Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABCgAGBQJT4lCLAAoJEJgKPw0B/gTfaqkIAL4jRYcdcZ3ew5lh1N+WIucT
-YJ2ZdFYZywdbXD4AP6Skocl74Bd24A2B7owyCKWT82uKov71NNp6hOUklRRFMygA
-Vq7Wz6JgT2sDn83egIXq4Jf0UKocO6gTaJOnlrZfJUpJWHMDDVRAlLpiso/5512F
-sZY+W/yOlOsC9wZrPMAjXRD3iWYaYOaKPq+/24kv75lhs6O917ZXqVsh8ln92xuv
-ubWZ1rpDydRB3OudIxEDTl7lPiBMSo0yctEs7r4Wc2VEAGMCnd84nEG9tJK56UV7
-9cQi6Mh8IMhmy/ZNoK/bLmt/aDPLogmL2Hqtd8ZEhCaaeVEpsAAlCmpOF5PO83c=
-=tiGY
+iQEcBAABAgAGBQJT72JZAAoJEJgKPw0B/gTfATMIALWz8ezKxTnhukDUjrX0NTV1
+5imQ34v3goUa539ZchdYC1u8t5c/4M4Z+FukH0bCm1H6SKsnFvCB7/4Q+aGN9X4S
+TvalUyXWV5EqM64pGKMmCKLgQWxpuueJhrP62y2e92nz1aFUpSeHfGUsE9rM81+z
+GcQXiJjQS5ep0tDXshTat13xe4pN/F61DIXnxd1QNzDP06c+047EBmDy7AVd0MkR
+Ori29SIeW46N57HZq5abj/vGfwX4A7gII6tI3Ok6Do04nDSKiVRykGfjydSGBsx+
+dbQsUmozsMHTFNnv1GlRhxpIWhjKcf/uaxf/NjBimYcRUKvHsmhjmrDkUQkd4PA=
+=hSwV
 -----END PGP SIGNATURE-----
@@ -30,3 +30,3 @@
 31               .npmignore                          18894d4475fffb5e284a7bdfb00a9633ffdd660396a780b7fc5e14f013f95783                                                                 
-8984             CHANGELOG.md                        86ab92244d9c79723a5b6ba218666fc795a47b1d390048d775e886dc0d4481ce                                                                 
+9500             CHANGELOG.md                        f15a489cda8441de953e266d63edbb68da8d418b950ce93a3ab4b717fa33c375                                                                 
 1483             LICENSE                             333be7050513d91d9e77ca9acb4a91261721f0050209636076ed58676bfc643d                                                                 
@@ -88,12 +88,12 @@ 2759             Makefile                            79277def75623d4146be210a7f3f3cf6d7839e2d95df434430fa8c5b58c7ce2f
 330                keyfetch.js                       f8c05474c9e37b5d11c4ec991f20958d6f308a96703dfa939f3c85b9f6f19bc7                                                                 
-57080              keymanager.js                     8927c6c28f5f32b5404a2f8c15d9d631e7dee97dc46d14e4d015cc4df8aa5d5d                                                                 
+58216              keymanager.js                     122e4b990082f169c0f9002b50279eb649ed6ab1c30a06a59ffb57e09aacd9f1                                                                 
 2641               keyring.js                        df5afbb75be8b00a6a6326ce7615bf813a4ba65794d44bc3a4e3c7c4b9a1e437                                                                 
 2224               keywrapper.js                     04d92f8ae35e6321cbc8a312942915f7ea72f4c710031b5246b7d0b935fb805c                                                                 
 3195               lock.js                           597a7bf31a347553bf4a4f7c9628edde1196f4b0a4f11d8b4e162d833f4e540c                                                                 
-856                main.js                           f5c3573a3bc18e3d02474f062c8b35a56b7f590e32d717668c2d5bd127b0b8f9                                                                 
+901                main.js                           fbabe7a53ff0d5efd64b36705152074023c394aeaa72066529cae34ae7c5577e                                                                 
                    openpgp/                                                                                                                                                           
 2533                 armor.js                        45b5677fcbd83a729b216a3615459d5f65e3a3fd8754a2bab0c6bdae2c6f300b                                                                 
-3569                 baseburner.js                   6166d63241b17a24076ed33d23ad4b6266486724330f41dc96def21af99a1179                                                                 
+3693                 baseburner.js                   d69bddd376c13c8df81d823f7c206aca5b54123e280819fa29ef3f9d313d00f0                                                                 
 3407                 buffer.js                       f35590b328b6b8671516607691f9ef0695115c7ab5d1a10459326e50eb426c8f                                                                 
-22544                burner.js                       7b8eed96ea72399271428332c6a4e53aa6cbdc7d84cc14c3de4ab70e15f1feeb                                                                 
+27905                burner.js                       b58b435cce41bfc16c5b8ba972efb1dea5f62aa453bb4bb8636413d797b28c0f                                                                 
 36498                cast5.js                        6f5dd34f8e223fa58d6cd6f0c4fb3de322e5e708eb7b0becb9cfd61005d93b62                                                                 
@@ -104,13 +104,13 @@ 2485                 cfb.js                          965f142ee47a889b3dc5284061a674145aff2cbdff910563d949e6c8e808513a
 2294                 hilev.js                        f18ec73b060130fd74955b1433221f8e1714414db6543b08e681e0ae1c0909e1                                                                 
-8958                 ocfb.js                         26ca754f440a21c27ed34c5db8fbfbe74c870bd4d94870e4b7f3d7c55d3b027e                                                                 
+15859                ocfb.js                         48059a052b678e815d48e47fd863fec8606b4d5606970899ceec577b0b311884                                                                 
                      packet/                                                                                                                                                          
 238                    all.js                        b3107bcc0993a1a9848e6a08a30a32dae36323f65385cdc4df355cac3cbf91f0                                                                 
 2224                   base.js                       c7c55e94b808e996982bd9d2d00cc0aa5ae9eb74e5a3782ef0a7166c995601b0                                                                 
-12907                  compressed.js                 ee7aadf37fa13cd2440b24855b6dcea631ed27a0288d3f831191f80878f38350                                                                 
+12845                  compressed.js                 9821196d59129bc45159b035f68cdc95a4cb92e9307b49323b7d6c54aa0a9782                                                                 
 681                    generic.js                    b71bde7d0b2327dbc2f270cd06336cd9eff38e026b69d83a33f87d043d9c672a                                                                 
 27589                  keymaterial.js                2190e4c89884b56af4cbfb8c55d5f6a0b1d0161e1ababdbd8a18bdd9d2364cfb                                                                 
-4256                   literal.js                    8927b88c3c1b0071c0ceacc41d900c315b3ba2a55024e4ee7297307826c82531                                                                 
+4424                   literal.js                    9e56f1991ba15e3ff07ba67fa48180bb86ab84106b998932e7e9fcc90c2cd6f2                                                                 
 3804                   one_pass_sig.js               0c10840149552af05a0c98690b8dfcc05c60de308be7a09cd1748c50909cddd9                                                                 
-4785                   packetsigs.js                 0f7041ca085ce3eb25dbb6fe7945bbf1f75a1bbea37661ef04611ff950e2af79                                                                 
-8393                   sess.js                       5b9a1cde400b9680a66b6d17d3cb328d31748f33c10adf748f753885293b924b                                                                 
+4927                   packetsigs.js                 05e94c79edb8adcba2e6da44225e9aed09f9ff8d03b15bfeb2eda123a296ec89                                                                 
+14279                  sess.js                       25a1ba963ebdd58e3426ff5b2948a7e7114f08f77078cb4fcd81b655283527fa                                                                 
 43593                  signature.js                  a8b2c1eadce7616bac958b03f36fd5bb9237b2f5095b05ed67e29e020d99e6fe                                                                 
@@ -120,6 +120,6 @@ 1781                   user_attribute.js             a8121babda05665b05e742e71aa020abedd2cf18aac20f7950363f2626d34957
 5807                 parser.js                       832fea89ecc84b4a38ef0c51a8792bebd4d4a579d99bb4465f2ec4b7a1c6c0a4                                                                 
-36533                processor.js                    1e63e55e74b08be28ffe9f7f0c476f8de31f0a1cde49b141c7e447f94eb57371                                                                 
+37624                processor.js                    c74b85b99275dc71f7a9033b58b160829ccb79e84290ef374dc9035b3be07176                                                                 
 4404                 s2k.js                          7af616feea0983261ccc5e84164eccd947e505798ff3043012c444460d4b0dcd                                                                 
 1547                 util.js                         c10cd4d3cc3e7b231bb81db7af9ea72abb925ab33c8b0ae4fc3b11a4f2ecf380                                                                 
-2097                 verifier.js                     cd08c5424b6b1d174f5c8a3686dc877c33bb8df9649492dbff6008edee85eb72                                                                 
+2096                 verifier.js                     d54bad151e7e7de7b72d37a45aa840937cb177c96464a63da92a364306eb6432                                                                 
 8387               pad.js                            0a23379c02219bc0deef51b671bc114bf46aedd6d023577f1d6065714eaf9682                                                                 
@@ -133,3 +133,3 @@ 17446              primegen.js                       7dc276b57b09ba87e8a4c39dc884dae686b9802e4e54a8208de8c8938360c807
 308                util.js                           09c0292aca20f6e8f32989db027b2fa9ce46a8cd26893d0550de57eb852b429c                                                                 
-1002             package.json                        56a51c154d1e071b2bb6027308bd7067f16c16b387c71d2b2b8fc734cc91e45d                                                                 
+1002             package.json                        30a9fefdb10f64d6bf533ee52df8ef0da10e5fc0fa63d76e2c007aedeacf6f1e                                                                 
                  ref/                                                                                                                                                                 
@@ -177,12 +177,12 @@ 239671             nist-curves.pdf                   f42d43be9a49de789ca6dd2539258825187628e391fe0c225a1e5af4bf32e107|abd5e66e46aa8f1005a942a39acba0e7950cc7d6fec09dec80526aede74a2f7c
 856                keyfetch.iced                     10037e667a57ab8bd04d8239836c4d3e97ebe2fc72166020ab4f73203d6a1963                                                                 
-22367              keymanager.iced                   5431950f8ca8033906c0912d1a1316bc8ffcbe516d1c06111b3a155c21968b63                                                                 
+23220              keymanager.iced                   1972f1527f7a4e0cb4711119660bc927f2382f93f1c0e2825d8cc46e32470769                                                                 
 1626               keyring.iced                      8357f83439f997d056163b79ff315a2a46e540c24e904422588520d043c18de9                                                                 
 1475               keywrapper.iced                   c4a522c888684a1a05b93e8faffdd3589eff9cc12fe98b62146194849dfb4128                                                                 
 1943               lock.iced                         69ffa5d4715acb25f06cbf4853dc50aa4124a3be00db6677321a9cecf715d37f                                                                 
-776                main.iced                         6cfa50e2a4998c77a4cd442e4d6f9b12030cad34f1073ca9fb4191a794b7dafb                                                                 
+820                main.iced                         8942212ea84ed1dbf26ebfecfac5e1449c4ac162dda35fc8ed08c5e5f20e55d0                                                                 
                    openpgp/                                                                                                                                                           
 1860                 armor.iced                      844940075a814c94776068adf27d101f1e7023554bd12954b0a3923164600dcc                                                                 
-1421                 baseburner.iced                 834887c1edec4e3d3385469c4c4591f6a19e38eed54f118916002b8f323a6c76                                                                 
+1484                 baseburner.iced                 0b91f43b55f3818271cb22d78690023ff60928fa279aa8211cfa23c10c1f623c                                                                 
 1972                 buffer.iced                     f7869b08373cc7f603af1056c2a0e70eef20978217a05335df08be495f05b683                                                                 
-7502                 burner.iced                     c0b20aaca1e117d5325c5f59583038f1bc0ff02f727e68e5567ab0ed60723c07                                                                 
+8205                 burner.iced                     5bdc02702376e4f20cd5f40dc09695fc7c8b273010544bc1efc13f88fb9fec61                                                                 
 35636                cast5.iced                      9931b6c18476e8ee81b4597b10fe4dd95ba647e5370667cbb2505e633138b82e                                                                 
@@ -193,3 +193,3 @@ 2500                 cfb.iced                        a1a9d1aa336d99bb69de44cc77e925336fd0b2299c627290afead87d9aae204e
 705                  hilev.iced                      83dea830c28f5551b6c0ff492cf50de7a50ebc6242572c4f900d07a0a530cd87                                                                 
-8588                 ocfb.iced                       75e81214a67a59ac6e104e4bfb613dfd2a4941a5a882818b6f24e8f8cc36e686                                                                 
+9418                 ocfb.iced                       907951ce199b0e59b0e4d21b503f910aaa3a1c9bc57994d3437f333e3be902fb                                                                 
                      packet/                                                                                                                                                          
@@ -201,6 +201,6 @@ 157                    all.iced                      42724a5bfbf1329c4932e74ba60ec0cda51f4b8a1062e34d41abf6773275c09b
 16229                  keymaterial.iced              4c4d3f3158b8550046e80864d25ebf9180850b3a6b77fa08309584a9f25f6469                                                                 
-2142                   literal.iced                  a7aed106cadb16882dd9f60143c99db62570571ee3e8fff987f0a8926c16ad40                                                                 
+2193                   literal.iced                  f6424f833f745fdb4287d0ab0ed1a5e43e0a53e9dc3bc9b5095951d155399bbb                                                                 
 2115                   one_pass_sig.iced             d0e2d1a35b42e9e92205ffe4651b7b650f5395a9b1f60dbe85f8c8c3cd8911b1                                                                 
-3080                   packetsigs.iced               76216495f471ca7151e64e36da288a5f73a251dd1daaa088e4844d9a234ee8ac                                                                 
-4923                   sess.iced                     9bd44065c82d2599128b545c311c8152e089a842394a4cab54914f6f8bea2900                                                                 
+3117                   packetsigs.iced               8ac7e620eb240a980ad75bd340fa21287e18677d3ea31c2cfab9ad91617c364e                                                                 
+5607                   sess.iced                     8867703460996686a50e30686fc976610c4f92a43e725872e99dce314ee71b63                                                                 
 21235                  signature.iced                398dbe75e949fa14d5bb3d56b218ad261c47c83a90b586e7872d30dabf02954b                                                                 
@@ -210,3 +210,3 @@ 1322                   user_attribute.iced           1a478736ca1a087fd544fe73afdd2028203e5ef176f3bb41faa9f75381e04611
 4149                 parser.iced                     54a415da348c62680a7876fe1fd8b4641c01cffe23dfd068cbe1f7b831d4c8d7                                                                 
-11002                processor.iced                  8d0f0dde59c1dfe491bd2605c5f87b2430b6353882cd7a53c13cdd9e6dd3d9a5                                                                 
+11009                processor.iced                  e0643d6e149d98218fc461537f27885e8007dc97a1a1fbc7149635677659287b                                                                 
 5937                 s2k.iced                        af09de1da25cea11e0cdda54c78ba8f6ec3b13a6af6f9e6e66853cbca4c22426                                                                 
@@ -245,4 +245,4 @@ 1795                 util.iced                       267788a2659c0850edc8019a71f67ab53a0913031c98920f5ad32eeddc287693
 7114                 decoder.iced                    f5862f9073dd00e1cd37e3dd1d9f1d8daea9ae66e652730e3b7c2080cc91b4c5                                                                 
-17586                decrypt_verify_msg.iced         a30cae39a845efa5061f1b4c5935f3336d7d67b3154859bdd3c921ae1e558f58                                                                 
-4394                 dsa.iced                        79b8648a559bbf8b3ae38ceddd33320473cec8ebcacd14a11f232ffae4bca920                                                                 
+17584                decrypt_verify_msg.iced         c00ef85f2f7166db859cbd8400df1d09f69c103853b95f77f5a7d845f39c01f8                                                                 
+4396                 dsa.iced                        51c628e28c7e52a1a2ec75e6bdba9ebfd16329c9dae59bc0e82d54e2fb38610e                                                                 
 10269                ecc1.iced                       1cbbf415bfeedff0182ac4897dfc37417b92124a7e501c3de383e843462d2285                                                                 
@@ -249,0 +249,0 @@ 5626                 ecc2.iced                       769b221f770301a7d8b97724eb020b4a7e6e97a0cf61ae1237c730afed1debc1|a9b21d5854c38808dd3b5c2156704891b26f73e6943f9c375d1fb51207745d68

No alert changes

Improved metrics

Total package byte prevSize

1043693

increased by2.41%

Lines of code

15242

increased by3.57%

Dependency changes

• Updatedtriplesec@>=3.0.18