kbpgp - npm Package Compare versions

Comparing version 2.0.59 to 2.0.60

CHANGELOG.md

@@ -1,4 +0,8 @@
-## 2.0.59
+## 2.0.60 (2016-12-7)
+ 
+Feature:
+  - Subpacket33 support
 
-Feature:
+## 2.0.59 (2016-11-10)
+
   - Curve25519 support
@@ -5,0 +9,0 @@

lib/const.js

@@ -56,2 +56,3 @@ // Generated by IcedCoffeeScript 108.0.11
       embedded_signature: 32,
+      issuer_fingerprint: 33,
       experimental_low: 101,
@@ -58,0 +59,0 @@ experimental_high: 110

lib/openpgp/packet/signature.js

 // Generated by IcedCoffeeScript 108.0.11
 (function() {
-  var C, CreationTime, EmbeddedSignature, Experimental, ExpirationTime, Exportable, Features, Issuer, KeyExpirationTime, KeyFlags, KeyServerPreferences, NotationData, Packet, Parser, PolicyURI, Preference, PreferredCompressionAlgorithms, PreferredHashAlgorithms, PreferredKeyServer, PreferredSymmetricAlgorithms, PrimaryUserId, ReasonForRevocation, RegularExpression, Revocable, RevocationKey, S, SHA1, SHA512, Signature, SignatureTarget, Signature_v2, Signature_v2_or_v3, Signature_v3, SignersUserID, SlicerBuffer, SubPacket, Time, Trust, alloc_or_throw, assert, asymmetric, encode_length, iced, make_esc, make_time_packet, packetsigs, uint_to_buffer, unix_time, util, __iced_k, __iced_k_noop, _ref, _ref1, _ref2,
+  var C, CreationTime, EmbeddedSignature, Experimental, ExpirationTime, Exportable, Features, Issuer, IssuerFingerprint, KeyExpirationTime, KeyFlags, KeyServerPreferences, NotationData, Packet, Parser, PolicyURI, Preference, PreferredCompressionAlgorithms, PreferredHashAlgorithms, PreferredKeyServer, PreferredSymmetricAlgorithms, PrimaryUserId, ReasonForRevocation, RegularExpression, Revocable, RevocationKey, S, SHA1, SHA512, Signature, SignatureTarget, Signature_v2, Signature_v2_or_v3, Signature_v3, SignersUserID, SlicerBuffer, SubPacket, Time, Trust, alloc_or_throw, assert, asymmetric, encode_length, iced, make_esc, make_time_packet, packetsigs, uint_to_buffer, unix_time, util, __iced_k, __iced_k_noop, _ref, _ref1, _ref2,
     __hasProp = {}.hasOwnProperty,
@@ -65,2 +65,6 @@ __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; };
 
+    Signature_v2_or_v3.prototype.get_issuer_fingerprint = function() {
+      return null;
+    };
+
     Signature_v2_or_v3.prototype.when_generated = function() {
@@ -127,3 +131,3 @@ return this.time;
                 })(),
-                lineno: 85
+                lineno: 86
               }));
@@ -292,3 +296,3 @@ __iced_deferrals._fulfill();
             })(),
-            lineno: 167
+            lineno: 168
           })));
@@ -324,3 +328,3 @@ __iced_deferrals._fulfill();
             })(),
-            lineno: 180
+            lineno: 181
           }));
@@ -379,3 +383,3 @@ __iced_deferrals._fulfill();
             })(),
-            lineno: 209
+            lineno: 210
           }), opts);
@@ -429,3 +433,3 @@ __iced_deferrals._fulfill();
                               })(),
-                              lineno: 219
+                              lineno: 220
                             }), opts);
@@ -527,3 +531,3 @@ __iced_deferrals._fulfill();
                 })(),
-                lineno: 269
+                lineno: 270
               }));
@@ -685,2 +689,7 @@ __iced_deferrals._fulfill();
 
+    Signature.prototype.get_issuer_fingerprint = function() {
+      var _ref3;
+      return (_ref3 = this.subpacket_index.all[S.issuer_fingerprint]) != null ? _ref3.fingerprint : void 0;
+    };
+
     return Signature;
@@ -1275,2 +1284,26 @@
 
+  IssuerFingerprint = (function(_super) {
+    __extends(IssuerFingerprint, _super);
+
+    function IssuerFingerprint(n, fingerprint) {
+      this.n = n;
+      this.fingerprint = fingerprint;
+      IssuerFingerprint.__super__.constructor.call(this, S.issuer_fingerprint);
+    }
+
+    IssuerFingerprint.parse = function(slice) {
+      var fp, n;
+      n = slice.read_uint8();
+      fp = slice.consume_rest_to_buffer();
+      return new IssuerFingerprint(n, fp);
+    };
+
+    IssuerFingerprint.prototype._v_to_buffer = function() {
+      return Buffer.concat([uint_to_buffer(8, this.n), this.fingerprint]);
+    };
+
+    return IssuerFingerprint;
+
+  })(SubPacket);
+
   exports.Signature = Signature;
@@ -1389,2 +1422,4 @@
             return EmbeddedSignature;
+          case S.issuer_fingerprint:
+            return IssuerFingerprint;
           default:
@@ -1391,0 +1426,0 @@ if (type >= S.experimental_low && type <= S.experimental_high) {

lib/openpgp/processor.js

@@ -149,4 +149,26 @@ // Generated by IcedCoffeeScript 108.0.11
 
+    KeyBlock.prototype._check_issuer = function(i, packet, primary) {
+      var fp, iid, pid, wanted;
+      if ((fp = packet.get_issuer_fingerprint()) != null) {
+        if (bufeq_secure(fp, (wanted = this.primary.get_fingerprint()))) {
+          return wanted;
+        } else {
+          this.warnings.push("Skipping signature by another issuer: " + (fp.toString('hex')) + " != " + (wanted != null ? wanted.toString('hex') : void 0));
+          return null;
+        }
+      }
+      if ((iid = packet.get_issuer_key_id()) != null) {
+        if (bufeq_secure(iid, (pid = this.primary.get_key_id()))) {
+          return pid;
+        } else {
+          this.warnings.push("Skipping signature by another issuer: " + (iid != null ? iid.toString('hex') : void 0) + " != " + (pid != null ? pid.toString('hex') : void 0));
+          return null;
+        }
+      }
+      this.warnings.push("Signature is missing an issuer (at packet=" + i + ")");
+      return null;
+    };
+
     KeyBlock.prototype._verify_sigs = function(cb) {
-      var err, i, iid, msg, n_sigs, p, pid, tmp, working_set, ___iced_passed_deferral, __iced_deferrals, __iced_k;
+      var err, i, issuer_id, msg, n_sigs, p, tmp, working_set, ___iced_passed_deferral, __iced_deferrals, __iced_k;
       __iced_k = __iced_k_noop;
@@ -184,34 +206,40 @@ ___iced_passed_deferral = iced.findDeferral(arguments);
                     }
-                    return __iced_k(!p.is_duplicate_primary() ? working_set.push(p) : void 0);
-                  } else {
+                    if (!p.is_duplicate_primary()) {
+                      working_set.push(p);
+                    }
                     (function(__iced_k) {
-                      if (!bufeq_secure((iid = p.get_issuer_key_id()), (pid = _this.primary.get_key_id()))) {
-                        n_sigs++;
-                        return __iced_k(_this.warnings.push("Skipping signature by another issuer: " + (iid != null ? iid.toString('hex') : void 0) + " != " + (pid != null ? pid.toString('hex') : void 0)));
-                      } else {
-                        n_sigs++;
-                        p.key = _this.primary.key;
-                        p.primary = _this.primary;
-                        (function(__iced_k) {
-                          __iced_deferrals = new iced.Deferrals(__iced_k, {
-                            parent: ___iced_passed_deferral,
-                            filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
-                            funcname: "KeyBlock._verify_sigs"
-                          });
-                          p.verify(working_set, __iced_deferrals.defer({
-                            assign_fn: (function() {
-                              return function() {
-                                return tmp = arguments[0];
-                              };
-                            })(),
-                            lineno: 111
-                          }), _this.opts);
-                          __iced_deferrals._fulfill();
-                        })(function() {
-                          return __iced_k(typeof tmp !== "undefined" && tmp !== null ? (msg = "Signature failure in packet " + i + ": " + tmp.message + " (" + (pid.toString('hex')) + ")", _this.warnings.push(msg)) : _this.verified_signatures.push(p));
-                        });
-                      }
+_continue()
                     })(__iced_k);
+                  } else {
+                    return __iced_k();
                   }
-                })(_next);
+                })(function() {
+                  n_sigs++;
+                  (function(__iced_k) {
+                    if ((issuer_id = _this._check_issuer(i, p, _this.primary)) != null) {
+                      p.key = _this.primary.key;
+                      p.primary = _this.primary;
+                      (function(__iced_k) {
+                        __iced_deferrals = new iced.Deferrals(__iced_k, {
+                          parent: ___iced_passed_deferral,
+                          filename: "/Users/max/src/keybase/kbpgp/src/openpgp/processor.iced",
+                          funcname: "KeyBlock._verify_sigs"
+                        });
+                        p.verify(working_set, __iced_deferrals.defer({
+                          assign_fn: (function() {
+                            return function() {
+                              return tmp = arguments[0];
+                            };
+                          })(),
+                          lineno: 132
+                        }), _this.opts);
+                        __iced_deferrals._fulfill();
+                      })(function() {
+                        return __iced_k(typeof tmp !== "undefined" && tmp !== null ? (msg = "Signature failure in packet " + i + ": " + tmp.message + " (" + (issuer_id.toString('hex')) + ")", _this.warnings.push(msg)) : _this.verified_signatures.push(p));
+                      });
+                    } else {
+                      return __iced_k();
+                    }
+                  })(_next);
+                });
               } else {
@@ -279,3 +307,3 @@ return _continue();
                 })(),
-                lineno: 152
+                lineno: 173
               }));
@@ -306,3 +334,3 @@ __iced_deferrals._fulfill();
                       })(),
-                      lineno: 158
+                      lineno: 179
                     }));
@@ -365,3 +393,3 @@ __iced_deferrals._fulfill();
                 })(),
-                lineno: 180
+                lineno: 201
               }));
@@ -408,3 +436,3 @@ __iced_deferrals._fulfill();
             })(),
-            lineno: 194
+            lineno: 215
           })));
@@ -429,3 +457,3 @@ __iced_deferrals._fulfill();
                   })(),
-                  lineno: 196
+                  lineno: 217
                 })));
@@ -446,3 +474,3 @@ __iced_deferrals._fulfill();
                     })(),
-                    lineno: 197
+                    lineno: 218
                   })));
@@ -463,3 +491,3 @@ __iced_deferrals._fulfill();
                       })(),
-                      lineno: 198
+                      lineno: 219
                     })));
@@ -520,3 +548,3 @@ __iced_deferrals._fulfill();
                   })(),
-                  lineno: 208
+                  lineno: 229
                 })));
@@ -539,3 +567,3 @@ __iced_deferrals._fulfill();
                         })(),
-                        lineno: 210
+                        lineno: 231
                       })));
@@ -617,3 +645,3 @@ __iced_deferrals._fulfill();
                 })(),
-                lineno: 249
+                lineno: 270
               }));
@@ -648,3 +676,3 @@ __iced_deferrals._fulfill();
                   })(),
-                  lineno: 264
+                  lineno: 285
                 }), {
@@ -698,3 +726,3 @@ now: _this.now
                 _this._verify_sig(sig, esc(__iced_deferrals.defer({
-                  lineno: 278
+                  lineno: 299
                 })));
@@ -742,3 +770,3 @@ __iced_deferrals._fulfill();
           _this._decrypt(esc(__iced_deferrals.defer({
-            lineno: 291
+            lineno: 312
           })));
@@ -756,3 +784,3 @@ __iced_deferrals._fulfill();
             _this._inflate(esc(__iced_deferrals.defer({
-              lineno: 292
+              lineno: 313
             })));
@@ -768,3 +796,3 @@ __iced_deferrals._fulfill();
               _this._verify(esc(__iced_deferrals.defer({
-                lineno: 293
+                lineno: 314
               })));
@@ -807,3 +835,3 @@ __iced_deferrals._fulfill();
                 })(),
-                lineno: 302
+                lineno: 323
               }));
@@ -839,3 +867,3 @@ __iced_deferrals._fulfill();
             })(_this),
-            lineno: 309
+            lineno: 330
           })));
@@ -853,3 +881,3 @@ __iced_deferrals._fulfill();
             _this._inflate(esc(__iced_deferrals.defer({
-              lineno: 310
+              lineno: 331
             })));
@@ -882,3 +910,3 @@ __iced_deferrals._fulfill();
             })(),
-            lineno: 317
+            lineno: 338
           })));
@@ -904,3 +932,3 @@ __iced_deferrals._fulfill();
               })(),
-              lineno: 318
+              lineno: 339
             })));
@@ -943,3 +971,3 @@ __iced_deferrals._fulfill();
                 })(),
-                lineno: 327
+                lineno: 348
               }));
@@ -982,3 +1010,3 @@ __iced_deferrals._fulfill();
                   })(),
-                  lineno: 336
+                  lineno: 357
                 }));
@@ -1005,3 +1033,3 @@ __iced_deferrals._fulfill();
                   })(),
-                  lineno: 338
+                  lineno: 359
                 }));
@@ -1027,3 +1055,3 @@ __iced_deferrals._fulfill();
                   })(),
-                  lineno: 340
+                  lineno: 361
                 }));
@@ -1094,3 +1122,3 @@ __iced_deferrals._fulfill();
               })(),
-              lineno: 386
+              lineno: 407
             }));
@@ -1097,0 +1125,0 @@ __iced_deferrals._fulfill();

package.json

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

No alert changes

Improved metrics

Total package byte prevSize

1227135

increased by0.25%

Lines of code

18068

increased by0.31%

Worsened metrics

Number of package files

156

decreased by-0.64%

No dependency changes