Release new version

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "openpgp",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "license": "LGPL-3.0+",
   "homepage": "http://openpgpjs.org/",
   "authors": [

dist/openpgp.js

@@ -4773,7 +4773,7 @@ exports.default = {
   debug: false,
   show_version: true,
   show_comment: true,
-  versionstring: "OpenPGP.js v2.3.0",
+  versionstring: "OpenPGP.js v2.3.1",
   commentstring: "http://openpgpjs.org",
   keyserver: "https://keyserver.ubuntu.com",
   node_store: './openpgp.store'
@@ -16842,12 +16842,14 @@ Packetlist.prototype.read = function (bytes) {
     var parsed = _packet2.default.read(bytes, i, bytes.length - i);
     i = parsed.offset;
 
-    var tag = _enums2.default.read(_enums2.default.packet, parsed.tag);
-    var packet = packets.newPacketFromTag(tag);
-
-    this.push(packet);
-
-    packet.read(parsed.packet);
+    try {
+      var tag = _enums2.default.read(_enums2.default.packet, parsed.tag);
+      var packet = packets.newPacketFromTag(tag);
+      this.push(packet);
+      packet.read(parsed.packet);
+    } catch (e) {
+      this.pop(); // drop unsupported packet
+    }
   }
 };
 
@@ -16883,6 +16885,22 @@ Packetlist.prototype.push = function (packet) {
   this.length++;
 };
 
+/**
+ * Remove a packet from the list and return it.
+ * @return {Object}   The packet that was removed
+ */
+Packetlist.prototype.pop = function () {
+  if (this.length === 0) {
+    return;
+  }
+
+  var packet = this[this.length - 1];
+  delete this[this.length - 1];
+  this.length--;
+
+  return packet;
+};
+
 /**
 * Creates a new PacketList with all packets that pass the test implemented by the provided function.
 */

dist/openpgp.worker.js

@@ -28,39 +28,73 @@ var MAX_SIZE_RANDOM_BUFFER = 60000;
 
 openpgp.crypto.random.randomBuffer.init(MAX_SIZE_RANDOM_BUFFER);
 
-self.onmessage = function (event) {
-  var msg = event.data || {},
-      options = msg.options || {};
+/**
+ * Handle messages from the main window.
+ * @param  {Object} event   Contains event type and data
+ */
+self.onmessage = function(event) {
+  var msg = event.data || {};
 
   switch (msg.event) {
     case 'configure':
-      for (var i in msg.config) {
-        openpgp.config[i] = msg.config[i];
-      }
+      configure(msg.config);
       break;
 
     case 'seed-random':
-      if (!(msg.buf instanceof Uint8Array)) {
-        msg.buf = new Uint8Array(msg.buf);
-      }
-      openpgp.crypto.random.randomBuffer.set(msg.buf);
+      seedRandom(msg.buf);
       break;
 
     default:
-      if (typeof openpgp[msg.event] !== 'function') {
-        throw new Error('Unknown Worker Event');
-      }
-
-      // parse cloned packets
-      openpgp[msg.event](openpgp.packet.clone.parseClonedPackets(options, msg.event)).then(function(data) {
-        // clone packets (for web worker structured cloning algorithm)
-        response({ event:'method-return', data:openpgp.packet.clone.clonePackets(data) });
-      }).catch(function(e) {
-        response({ event:'method-return', err:e.message });
-      });
+      delegate(msg.event, msg.options || {});
   }
 };
 
+/**
+ * Set config from main context to worker context.
+ * @param  {Object} config   The openpgp configuration
+ */
+function configure(config) {
+  for (var i in config) {
+    openpgp.config[i] = config[i];
+  }
+}
+
+/**
+ * Seed the library with entropy gathered window.crypto.getRandomValues
+ * as this api is only avalible in the main window.
+ * @param  {ArrayBuffer} buffer   Some random bytes
+ */
+function seedRandom(buffer) {
+  if (!(buffer instanceof Uint8Array)) {
+    buffer = new Uint8Array(buffer);
+  }
+  openpgp.crypto.random.randomBuffer.set(buffer);
+}
+
+/**
+ * Generic proxy function that handles all commands from the public api.
+ * @param  {String} method    The public api function to be delegated to the worker thread
+ * @param  {Object} options   The api function's options
+ */
+function delegate(method, options) {
+  if (typeof openpgp[method] !== 'function') {
+    response({ event:'method-return', err:'Unknown Worker Event' });
+    return;
+  }
+  // parse cloned packets
+  options = openpgp.packet.clone.parseClonedPackets(options, method);
+  openpgp[method](options).then(function(data) {
+    // clone packets (for web worker structured cloning algorithm)
+    response({ event:'method-return', data:openpgp.packet.clone.clonePackets(data) });
+  }).catch(function(e) {
+    response({ event:'method-return', err:e.message });
+  });
+}
+
+/**
+ * Respond to the main window.
+ * @param  {Object} event  Contains event type and data
+ */
 function response(event) {
   if (openpgp.crypto.random.randomBuffer.size < MIN_SIZE_RANDOM_BUFFER) {
     self.postMessage({event: 'request-seed'});

dist/openpgp.worker.min.js

@@ -1 +1 @@
-/*! OpenPGP.js v2.3.0 - 2016-05-03 - this is LGPL licensed code, see LICENSE/our website http://openpgpjs.org/ for more information. */!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c?c:a)},k,k.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(a,b,c){function d(a){e.crypto.random.randomBuffer.size<f&&self.postMessage({event:"request-seed"}),self.postMessage(a,e.util.getTransferables.call(e.util,a.data))}self.window={},importScripts("openpgp.min.js");var e=window.openpgp,f=4e4,g=6e4;e.crypto.random.randomBuffer.init(g),self.onmessage=function(a){var b=a.data||{},c=b.options||{};switch(b.event){case"configure":for(var f in b.config)e.config[f]=b.config[f];break;case"seed-random":b.buf instanceof Uint8Array||(b.buf=new Uint8Array(b.buf)),e.crypto.random.randomBuffer.set(b.buf);break;default:if("function"!=typeof e[b.event])throw new Error("Unknown Worker Event");e[b.event](e.packet.clone.parseClonedPackets(c,b.event)).then(function(a){d({event:"method-return",data:e.packet.clone.clonePackets(a)})})["catch"](function(a){d({event:"method-return",err:a.message})})}}},{}]},{},[1]);
+/*! OpenPGP.js v2.3.1 - 2016-06-07 - this is LGPL licensed code, see LICENSE/our website http://openpgpjs.org/ for more information. */!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c?c:a)},k,k.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g<d.length;g++)e(d[g]);return e}({1:[function(a,b,c){function d(a){for(var b in a)h.config[b]=a[b]}function e(a){a instanceof Uint8Array||(a=new Uint8Array(a)),h.crypto.random.randomBuffer.set(a)}function f(a,b){return"function"!=typeof h[a]?void g({event:"method-return",err:"Unknown Worker Event"}):(b=h.packet.clone.parseClonedPackets(b,a),void h[a](b).then(function(a){g({event:"method-return",data:h.packet.clone.clonePackets(a)})})["catch"](function(a){g({event:"method-return",err:a.message})}))}function g(a){h.crypto.random.randomBuffer.size<i&&self.postMessage({event:"request-seed"}),self.postMessage(a,h.util.getTransferables.call(h.util,a.data))}self.window={},importScripts("openpgp.min.js");var h=window.openpgp,i=4e4,j=6e4;h.crypto.random.randomBuffer.init(j),self.onmessage=function(a){var b=a.data||{};switch(b.event){case"configure":d(b.config);break;case"seed-random":e(b.buf);break;default:f(b.event,b.options||{})}}},{}]},{},[1]);

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "openpgp",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "dependencies": {
     "asmcrypto-lite": {
       "version": "1.1.0",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "openpgp",
   "description": "OpenPGP.js is a Javascript implementation of the OpenPGP protocol. This is defined in RFC 4880.",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "license": "LGPL-3.0+",
   "homepage": "http://openpgpjs.org/",
   "engines": {