Release new version

This commit is contained in:
Bart Butler 2017-11-28 14:06:25 -08:00
parent 6c707057d5
commit e7e18777b0
7 changed files with 26 additions and 16 deletions

View File

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

20
dist/openpgp.js vendored
View File

@ -4841,7 +4841,7 @@ exports.default = {
tolerant: true, // ignore unsupported/unrecognizable packets instead of throwing an error tolerant: true, // ignore unsupported/unrecognizable packets instead of throwing an error
show_version: true, show_version: true,
show_comment: true, show_comment: true,
versionstring: "OpenPGP.js v2.5.13", versionstring: "OpenPGP.js v2.5.14",
commentstring: "https://openpgpjs.org", commentstring: "https://openpgpjs.org",
keyserver: "https://keyserver.ubuntu.com", keyserver: "https://keyserver.ubuntu.com",
node_store: './openpgp.store' node_store: './openpgp.store'
@ -12193,7 +12193,7 @@ function splitHeaders(text) {
*/ */
function verifyHeaders(headers) { function verifyHeaders(headers) {
for (var i = 0; i < headers.length; i++) { for (var i = 0; i < headers.length; i++) {
if (!/^[^:\s]+: .+$/.test(headers[i])) { if (!/^([^\s:]|[^\s:][^:]*[^\s:]): .+$/.test(headers[i])) {
throw new Error('Improperly formatted armor header: ' + headers[i]); throw new Error('Improperly formatted armor header: ' + headers[i]);
} }
if (_config2.default.debug && !/^(Version|Comment|MessageID|Hash|Charset): .+$/.test(headers[i])) { if (_config2.default.debug && !/^(Version|Comment|MessageID|Hash|Charset): .+$/.test(headers[i])) {
@ -14303,6 +14303,10 @@ function reformat(options) {
throw new Error('Only RSA Encrypt or Sign supported'); throw new Error('Only RSA Encrypt or Sign supported');
} }
if (!options.privateKey.decrypt()) {
throw new Error('Key not decrypted');
}
if (!options.passphrase) { if (!options.passphrase) {
// Key without passphrase is unlocked by definition // Key without passphrase is unlocked by definition
options.unlocked = true; options.unlocked = true;
@ -16124,8 +16128,11 @@ function onError(message, error) {
if (_config2.default.debug) { if (_config2.default.debug) {
console.error(error.stack); console.error(error.stack);
} }
// rethrow new high level error for api users
throw new Error(message + ': ' + error.message); // update error message
error.message = message + ': ' + error.message;
throw error;
} }
/** /**
@ -21161,7 +21168,10 @@ AsyncProxy.prototype.onMessage = function (event) {
case 'method-return': case 'method-return':
if (msg.err) { if (msg.err) {
// fail // fail
this.tasks[msg.id].reject(new Error(msg.err)); var err = new Error(msg.err);
// add worker stack
err.workerStack = msg.stack;
this.tasks[msg.id].reject(err);
} else { } else {
// success // success
this.tasks[msg.id].resolve(msg.data); this.tasks[msg.id].resolve(msg.data);

12
dist/openpgp.min.js vendored

File diff suppressed because one or more lines are too long

View File

@ -87,7 +87,7 @@ function delegate(id, method, options) {
// clone packets (for web worker structured cloning algorithm) // clone packets (for web worker structured cloning algorithm)
response({ id:id, event:'method-return', data:openpgp.packet.clone.clonePackets(data) }); response({ id:id, event:'method-return', data:openpgp.packet.clone.clonePackets(data) });
}).catch(function(e) { }).catch(function(e) {
response({ id:id, event:'method-return', err:e.message }); response({ id:id, event:'method-return', err:e.message, stack:e.stack });
}); });
} }

View File

@ -1 +1 @@
/*! OpenPGP.js v2.5.13 - 2017-11-06 - 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,c){return"function"!=typeof h[b]?void g({id:a,event:"method-return",err:"Unknown Worker Event"}):(c=h.packet.clone.parseClonedPackets(c,b),void h[b](c).then(function(b){g({id:a,event:"method-return",data:h.packet.clone.clonePackets(b)})})["catch"](function(b){g({id:a,event:"method-return",err:b.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.id,b.event,b.options||{})}}},{}]},{},[1]); /*! OpenPGP.js v2.5.14 - 2017-11-28 - 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,c){return"function"!=typeof h[b]?void g({id:a,event:"method-return",err:"Unknown Worker Event"}):(c=h.packet.clone.parseClonedPackets(c,b),void h[b](c).then(function(b){g({id:a,event:"method-return",data:h.packet.clone.clonePackets(b)})})["catch"](function(b){g({id:a,event:"method-return",err:b.message,stack:b.stack})}))}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.id,b.event,b.options||{})}}},{}]},{},[1]);

2
npm-shrinkwrap.json generated
View File

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

View File

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