suzanne.soy/fork-openpgpjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Release new version

Browse Source
This commit is contained in:
Bart Butler 2017-03-28 13:17:39 -07:00
parent e4cb79640b
commit 4044501d6d
6 changed files with 74 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

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

86
dist/openpgp.js vendored
View File

@ -4503,7 +4503,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
* @classdesc Class that represents an OpenPGP cleartext signed message.
* See {@link http://tools.ietf.org/html/rfc4880#section-7}
* @param {String} text The cleartext of the signed message
* @param {module:Signature} signature The detached signature or an empty signature if message not yet signed
* @param {module:signature} signature The detached signature or an empty signature if message not yet signed
*/
function CleartextMessage(text, signature) {
@ -4835,7 +4835,7 @@ exports.default = {
debug: false,
show_version: true,
show_comment: true,
versionstring: "OpenPGP.js v2.5.1",
versionstring: "OpenPGP.js v2.5.2",
commentstring: "http://openpgpjs.org",
keyserver: "https://keyserver.ubuntu.com",
node_store: './openpgp.store'
@ -15095,10 +15095,14 @@ function encryptSessionKey(sessionKey, symAlgo, publicKeys, passwords) {
/**
* Sign the message (the literal data packet of the message)
* @param {Array<module:key~Key>} privateKey private keys with decrypted secret key data for signing
* @return {module:message~Message} new message with signed content
* @param {Array<module:key~Key>} privateKey private keys with decrypted secret key data for signing
* @param {Signature} signature (optional) any existing detached signature to add to the message
* @return {module:message~Message} new message with signed content
*/
Message.prototype.sign = function (privateKeys) {
Message.prototype.sign = function () {
var privateKeys = arguments.length <= 0 || arguments[0] === undefined ? [] : arguments[0];
var signature = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];
var packetlist = new _packet2.default.List();
@ -15109,12 +15113,30 @@ Message.prototype.sign = function (privateKeys) {
var literalFormat = _enums2.default.write(_enums2.default.literal, literalDataPacket.format);
var signatureType = literalFormat === _enums2.default.literal.binary ? _enums2.default.signature.binary : _enums2.default.signature.text;
var i, signingKeyPacket;
var i, signingKeyPacket, existingSigPacketlist, onePassSig;
if (signature) {
existingSigPacketlist = signature.packets.filterByTag(_enums2.default.packet.signature);
if (existingSigPacketlist.length) {
for (i = existingSigPacketlist.length - 1; i >= 0; i--) {
var sigPacket = existingSigPacketlist[i];
onePassSig = new _packet2.default.OnePassSignature();
onePassSig.type = signatureType;
onePassSig.hashAlgorithm = _config2.default.prefer_hash_algorithm;
onePassSig.publicKeyAlgorithm = sigPacket.publicKeyAlgorithm;
onePassSig.signingKeyId = sigPacket.issuerKeyId;
if (!privateKeys.length && i === 0) {
onePassSig.flags = 1;
}
packetlist.push(onePassSig);
}
}
}
for (i = 0; i < privateKeys.length; i++) {
if (privateKeys[i].isPublic()) {
throw new Error('Need private key for signing');
}
var onePassSig = new _packet2.default.OnePassSignature();
onePassSig = new _packet2.default.OnePassSignature();
onePassSig.type = signatureType;
//TODO get preferred hashg algo from key signature
onePassSig.hashAlgorithm = _config2.default.prefer_hash_algorithm;
@ -15144,15 +15166,23 @@ Message.prototype.sign = function (privateKeys) {
packetlist.push(signaturePacket);
}
if (signature) {
packetlist.concat(existingSigPacketlist);
}
return new Message(packetlist);
};
/**
* Create a detached signature for the message (the literal data packet of the message)
* @param {Array<module:key~Key>} privateKey private keys with decrypted secret key data for signing
* @param {Array<module:key~Key>} privateKey private keys with decrypted secret key data for signing
* @param {Signature} signature (optional) any existing detached signature
* @return {module:signature~Signature} new detached signature of message content
*/
Message.prototype.signDetached = function (privateKeys) {
Message.prototype.signDetached = function () {
var privateKeys = arguments.length <= 0 || arguments[0] === undefined ? [] : arguments[0];
var signature = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1];
var packetlist = new _packet2.default.List();
@ -15176,6 +15206,10 @@ Message.prototype.signDetached = function (privateKeys) {
signaturePacket.sign(signingKeyPacket, literalDataPacket);
packetlist.push(signaturePacket);
}
if (signature) {
var existingSigPacketlist = signature.packets.filterByTag(_enums2.default.packet.signature);
packetlist.concat(existingSigPacketlist);
}
return new sigModule.Signature(packetlist);
};
@ -15525,7 +15559,7 @@ function generateKey() {
}
/**
* Generates a new OpenPGP key pair. Currently only supports RSA keys. Primary and subkey will be of same type.
* Reformats signature packets for a key and rewraps key object.
* @param {Array<Object>} userIds array of user IDs e.g. [{ name:'Phil Zimmermann', email:'phil@openpgp.org' }]
* @param {String} passphrase (optional) The passphrase used to encrypt the resulting private key
* @param {Boolean} unlocked (optional) If the returned secret part of the generated key is unlocked
@ -15607,6 +15641,7 @@ function decryptKey(_ref4) {
* @param {String} filename (optional) a filename for the literal data packet
* @param {Boolean} armor (optional) if the return values should be ascii armored or the message/signature objects
* @param {Boolean} detached (optional) if the signature should be detached (if true, signature will be added to returned object)
* @param {Signature} signature (optional) a detached signature to add to the encrypted message
* @return {Promise<Object>} encrypted (and optionally signed message) in the form:
* {data: ASCII armored message if 'armor' is true,
* message: full Message object if 'armor' is false, signature: detached signature if 'detached' is true}
@ -15622,28 +15657,33 @@ function encrypt(_ref5) {
var armor = _ref5$armor === undefined ? true : _ref5$armor;
var _ref5$detached = _ref5.detached;
var detached = _ref5$detached === undefined ? false : _ref5$detached;
var _ref5$signature = _ref5.signature;
var signature = _ref5$signature === undefined ? null : _ref5$signature;
checkData(data);publicKeys = toArray(publicKeys);privateKeys = toArray(privateKeys);passwords = toArray(passwords);
if (!nativeAEAD() && asyncProxy) {
// use web worker if web crypto apis are not supported
return asyncProxy.delegate('encrypt', { data: data, publicKeys: publicKeys, privateKeys: privateKeys, passwords: passwords, filename: filename, armor: armor, detached: detached });
return asyncProxy.delegate('encrypt', { data: data, publicKeys: publicKeys, privateKeys: privateKeys, passwords: passwords, filename: filename, armor: armor, detached: detached, signature: signature });
}
var result = {};
return Promise.resolve().then(function () {
var message = createMessage(data, filename);
if (privateKeys) {
// sign the message only if private keys are specified
if (!privateKeys) {
privateKeys = [];
}
if (privateKeys.length || signature) {
// sign the message only if private keys or signature is specified
if (detached) {
var signature = message.signDetached(privateKeys);
var detachedSignature = message.signDetached(privateKeys, signature);
if (armor) {
result.signature = signature.armor();
result.signature = detachedSignature.armor();
} else {
result.signature = signature;
result.signature = detachedSignature;
}
} else {
message = message.sign(privateKeys);
message = message.sign(privateKeys, signature);
}
}
return message.encrypt(publicKeys, passwords);
@ -15719,6 +15759,7 @@ function decrypt(_ref6) {
* @param {String} data cleartext input to be signed
* @param {Key|Array<Key>} privateKeys array of keys or single key with decrypted secret key data to sign cleartext
* @param {Boolean} armor (optional) if the return value should be ascii armored or the message object
* @param {Boolean} detached (optional) if the return value should contain a detached signature
* @return {Promise<Object>} signed cleartext in the form:
* {data: ASCII armored message if 'armor' is true,
* message: full Message object if 'armor' is false, signature: detached signature if 'detached' is true}
@ -19921,7 +19962,7 @@ Signature.prototype.armor = function () {
/**
* reads an OpenPGP armored signature and returns a signature object
* @param {String} armoredText text to be parsed
* @return {module:signature~Signature} new signature object
* @return {Signature} new signature object
* @static
*/
function readArmored(armoredText) {
@ -20670,9 +20711,12 @@ exports.default = {
throw new Error('Uint8Array2str: Data must be in the form of a Uint8Array');
}
var result = [];
for (var i = 0; i < bin.length; i++) {
result[i] = String.fromCharCode(bin[i]);
var result = [],
bs = 16384,
j = bin.length;
for (var i = 0; i < j; i += bs) {
result.push(String.fromCharCode.apply(String, bin.subarray(i, i + bs < j ? i + bs : j)));
}
return result.join('');
},

10
dist/openpgp.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/openpgp.worker.min.js vendored
View File

@ -1 +1 @@
/*! OpenPGP.js v2.5.1 - 2017-03-15 - 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.2 - 2017-03-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})}))}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",
"version": "2.5.1",
"version": "2.5.2",
"dependencies": {
"asmcrypto-lite": {
"version": "1.1.0",

2
package.json
View File

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