Release new version

bower.json

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

dist/openpgp.js

@@ -5195,7 +5195,7 @@ exports.default = {
   tolerant: true, // ignore unsupported/unrecognizable packets instead of throwing an error
   show_version: true,
   show_comment: true,
-  versionstring: "OpenPGP.js v2.6.0",
+  versionstring: "OpenPGP.js v2.6.1",
   commentstring: "https://openpgpjs.org",
   keyserver: "https://keyserver.ubuntu.com",
   node_store: './openpgp.store'
@@ -15445,21 +15445,21 @@ Message.prototype.encrypt = function (keys, passwords, sessionKey) {
       msg = void 0,
       symEncryptedPacket = void 0;
   return Promise.resolve().then(function () {
-    if (keys) {
-      symAlgo = _enums2.default.read(_enums2.default.symmetric, keyModule.getPreferredSymAlgo(keys));
-    } else if (passwords) {
-      symAlgo = _enums2.default.read(_enums2.default.symmetric, _config2.default.encryption_cipher);
-    } else {
-      throw new Error('No keys or passwords');
-    }
-
     if (sessionKey) {
       if (!_util2.default.isUint8Array(sessionKey.data) || !_util2.default.isString(sessionKey.algorithm)) {
         throw new Error('Invalid session key for encryption.');
       }
       symAlgo = sessionKey.algorithm;
       sessionKey = sessionKey.data;
+    } else if (keys && keys.length) {
+      symAlgo = _enums2.default.read(_enums2.default.symmetric, keyModule.getPreferredSymAlgo(keys));
+    } else if (passwords && passwords.length) {
+      symAlgo = _enums2.default.read(_enums2.default.symmetric, _config2.default.encryption_cipher);
     } else {
+      throw new Error('No keys, passwords, or session key provided.');
+    }
+
+    if (!sessionKey) {
       sessionKey = _crypto2.default.generateSessionKey(symAlgo);
     }
 
@@ -16181,18 +16181,17 @@ function decrypt(_ref6) {
   return message.decrypt(privateKey, sessionKey, password).then(function (message) {
 
     var result = parseMessage(message, format);
-    if (result.data) {
-      // verify
-      if (!publicKeys) {
-        publicKeys = [];
-      }
-      if (signature) {
-        //detached signature
-        result.signatures = message.verifyDetached(signature, publicKeys);
-      } else {
-        result.signatures = message.verify(publicKeys);
-      }
+
+    if (!publicKeys) {
+      publicKeys = [];
     }
+    if (signature) {
+      //detached signature
+      result.signatures = message.verifyDetached(signature, publicKeys);
+    } else {
+      result.signatures = message.verify(publicKeys);
+    }
+
     return result;
   }).catch(onError.bind(null, 'Error decrypting message'));
 }
@@ -16250,13 +16249,13 @@ function sign(_ref7) {
       }
     } else {
       message = message.sign(privateKeys);
+      if (armor) {
+        result.data = message.armor();
+      } else {
+        result.message = message;
+      }
     }
 
-    if (armor) {
-      result.data = message.armor();
-    } else {
-      result.message = message;
-    }
     return result;
   }, 'Error signing cleartext message');
 }

dist/openpgp.worker.min.js

@@ -1,2 +1,2 @@
-/*! OpenPGP.js v2.6.0 - 2017-12-02 - this is LGPL licensed code, see LICENSE/our website http://openpgpjs.org/ for more information. */
+/*! OpenPGP.js v2.6.1 - 2017-12-22 - this is LGPL licensed code, see LICENSE/our website http://openpgpjs.org/ for more information. */
 !function e(n,r,t){function o(i,f){if(!r[i]){if(!n[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(a)return a(i,!0);var s=new Error("Cannot find module '"+i+"'");throw s.code="MODULE_NOT_FOUND",s}var u=r[i]={exports:{}};n[i][0].call(u.exports,function(e){var r=n[i][1][e];return o(r||e)},u,u.exports,e,n,r,t)}return r[i].exports}for(var a="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}({1:[function(e,n,r){function t(e){o.crypto.random.randomBuffer.size<a&&self.postMessage({event:"request-seed"}),self.postMessage(e,o.util.getTransferables.call(o.util,e.data))}self.window={},importScripts("openpgp.min.js");var o=window.openpgp,a=4e4;o.crypto.random.randomBuffer.init(6e4),self.onmessage=function(e){var n=e.data||{};switch(n.event){case"configure":!function(e){for(var n in e)o.config[n]=e[n]}(n.config);break;case"seed-random":!function(e){e instanceof Uint8Array||(e=new Uint8Array(e)),o.crypto.random.randomBuffer.set(e)}(n.buf);break;default:!function(e,n,r){"function"==typeof o[n]?(r=o.packet.clone.parseClonedPackets(r,n),o[n](r).then(function(n){t({id:e,event:"method-return",data:o.packet.clone.clonePackets(n)})}).catch(function(n){t({id:e,event:"method-return",err:n.message,stack:n.stack})})):t({id:e,event:"method-return",err:"Unknown Worker Event"})}(n.id,n.event,n.options||{})}}},{}]},{},[1]);

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "openpgp",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "dependencies": {
     "abbrev": {
       "version": "1.1.1",

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.6.0",
+  "version": "2.6.1",
   "license": "LGPL-3.0+",
   "homepage": "http://openpgpjs.org/",
   "engines": {