Release new version

This commit is contained in:
Bart Butler 2017-07-06 16:27:44 -07:00
parent d33c46a33c
commit cc909f098c
6 changed files with 27 additions and 43 deletions

View File

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

48
dist/openpgp.js vendored
View File

@ -4603,7 +4603,10 @@ CleartextMessage.prototype.verifyDetached = function (signature, keys) {
verifiedSig.keyid = signatureList[i].issuerKeyId; verifiedSig.keyid = signatureList[i].issuerKeyId;
verifiedSig.valid = null; verifiedSig.valid = null;
} }
verifiedSig.signature = new sigModule.Signature([signatureList[i]]);
var packetlist = new _packet2.default.List();
packetlist.push(signatureList[i]);
verifiedSig.signature = new sigModule.Signature(packetlist);
result.push(verifiedSig); result.push(verifiedSig);
} }
@ -4836,8 +4839,8 @@ 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.4", versionstring: "OpenPGP.js v2.5.5",
commentstring: "http://openpgpjs.org", commentstring: "https://openpgpjs.org",
keyserver: "https://keyserver.ubuntu.com", keyserver: "https://keyserver.ubuntu.com",
node_store: './openpgp.store' node_store: './openpgp.store'
}; };
@ -12142,30 +12145,9 @@ var crc_table = [0x00000000, 0x00864cfb, 0x018ad50d, 0x010c99f6, 0x0393e6e1, 0x0
function createcrc24(input) { function createcrc24(input) {
var crc = 0xB704CE; var crc = 0xB704CE;
var index = 0;
while (input.length - index > 16) { for (var index = 0; index < input.length; index++) {
crc = crc << 8 ^ crc_table[(crc >> 16 ^ input[index]) & 0xff]; crc = crc << 8 ^ crc_table[(crc >> 16 ^ input[index]) & 0xff];
crc = crc << 8 ^ crc_table[(crc >> 16 ^ input[index + 1]) & 0xff];
crc = crc << 8 ^ crc_table[(crc >> 16 ^ input[index + 2]) & 0xff];
crc = crc << 8 ^ crc_table[(crc >> 16 ^ input[index + 3]) & 0xff];
crc = crc << 8 ^ crc_table[(crc >> 16 ^ input[index + 4]) & 0xff];
crc = crc << 8 ^ crc_table[(crc >> 16 ^ input[index + 5]) & 0xff];
crc = crc << 8 ^ crc_table[(crc >> 16 ^ input[index + 6]) & 0xff];
crc = crc << 8 ^ crc_table[(crc >> 16 ^ input[index + 7]) & 0xff];
crc = crc << 8 ^ crc_table[(crc >> 16 ^ input[index + 8]) & 0xff];
crc = crc << 8 ^ crc_table[(crc >> 16 ^ input[index + 9]) & 0xff];
crc = crc << 8 ^ crc_table[(crc >> 16 ^ input[index + 10]) & 0xff];
crc = crc << 8 ^ crc_table[(crc >> 16 ^ input[index + 11]) & 0xff];
crc = crc << 8 ^ crc_table[(crc >> 16 ^ input[index + 12]) & 0xff];
crc = crc << 8 ^ crc_table[(crc >> 16 ^ input[index + 13]) & 0xff];
crc = crc << 8 ^ crc_table[(crc >> 16 ^ input[index + 14]) & 0xff];
crc = crc << 8 ^ crc_table[(crc >> 16 ^ input[index + 15]) & 0xff];
index += 16;
}
for (var j = index; j < input.length; j++) {
crc = crc << 8 ^ crc_table[(crc >> 16 ^ input[index++]) & 0xff];
} }
return crc & 0xffffff; return crc & 0xffffff;
} }
@ -12221,15 +12203,14 @@ function verifyHeaders(headers) {
* and an attribute "checksum" containing the checksum. * and an attribute "checksum" containing the checksum.
*/ */
function splitChecksum(text) { function splitChecksum(text) {
var reChecksumStart = /^=/m;
var body = text; var body = text;
var checksum = ""; var checksum = "";
var matchResult = reChecksumStart.exec(text); var lastEquals = text.lastIndexOf("=");
if (matchResult !== null) { if (lastEquals >= 0) {
body = text.slice(0, matchResult.index); body = text.slice(0, lastEquals);
checksum = text.slice(matchResult.index + 1); checksum = text.slice(lastEquals + 1);
} }
return { body: body, checksum: checksum }; return { body: body, checksum: checksum };
@ -14449,7 +14430,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
* Initialization routine for the keyring. This method reads the * Initialization routine for the keyring. This method reads the
* keyring from HTML5 local storage and initializes this instance. * keyring from HTML5 local storage and initializes this instance.
* @constructor * @constructor
* @param {class} [storeHandler] class implementing load() and store() methods * @param {class} [storeHandler] class implementing loadPublic(), loadPrivate(), storePublic(), and storePrivate() methods
*/ */
function Keyring(storeHandler) { function Keyring(storeHandler) {
this.storeHandler = storeHandler || new _localstore2.default(); this.storeHandler = storeHandler || new _localstore2.default();
@ -15273,7 +15254,10 @@ function createVerificationObjects(signatureList, literalDataList, keys) {
verifiedSig.keyid = signatureList[i].issuerKeyId; verifiedSig.keyid = signatureList[i].issuerKeyId;
verifiedSig.valid = null; verifiedSig.valid = null;
} }
verifiedSig.signature = new sigModule.Signature([signatureList[i]]);
var packetlist = new _packet2.default.List();
packetlist.push(signatureList[i]);
verifiedSig.signature = new sigModule.Signature(packetlist);
result.push(verifiedSig); result.push(verifiedSig);
} }

14
dist/openpgp.min.js vendored

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
/*! OpenPGP.js v2.5.4 - 2017-04-05 - 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.5 - 2017-07-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]);

2
npm-shrinkwrap.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "openpgp", "name": "openpgp",
"version": "2.5.4", "version": "2.5.5",
"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.4", "version": "2.5.5",
"license": "LGPL-3.0+", "license": "LGPL-3.0+",
"homepage": "http://openpgpjs.org/", "homepage": "http://openpgpjs.org/",
"engines": { "engines": {