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

spacing

Browse Source
This commit is contained in:
Sanjana Rajan 2017-03-23 11:16:16 -07:00
parent 0f967331c6
commit d04c09687d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/message.js
View File

@ -104,12 +104,12 @@ Message.prototype.decrypt = function(privateKey, sessionKey, password) {
enums.packet.symEncryptedIntegrityProtected, enums.packet.symEncryptedIntegrityProtected,
enums.packet.symEncryptedAEADProtected enums.packet.symEncryptedAEADProtected
); );
if (symEncryptedPacketlist.length === 0) { if (symEncryptedPacketlist.length === 0) {
return; return;
} }
const symEncryptedPacket = symEncryptedPacketlist[0]; const symEncryptedPacket = symEncryptedPacketlist[0];
return symEncryptedPacket.decrypt(keyObj.algorithm, keyObj.data).then(() => { return symEncryptedPacket.decrypt(keyObj.algorithm, keyObj.data).then(() => {
const resultMsg = new Message(symEncryptedPacket.packets); const resultMsg = new Message(symEncryptedPacket.packets);
symEncryptedPacket.packets = new packet.List(); // remove packets after decryption symEncryptedPacket.packets = new packet.List(); // remove packets after decryption
@ -360,9 +360,11 @@ Message.prototype.sign = function(privateKeys=[], signature=null) {
signaturePacket.sign(signingKeyPacket, literalDataPacket); signaturePacket.sign(signingKeyPacket, literalDataPacket);
packetlist.push(signaturePacket); packetlist.push(signaturePacket);
} }
if (signature) { if (signature) {
packetlist.concat(existingSigPacketlist); packetlist.concat(existingSigPacketlist);
} }
return new Message(packetlist); return new Message(packetlist);
}; };

2
src/openpgp.js
View File

@ -247,7 +247,6 @@ export function decrypt({ message, privateKey, publicKeys, sessionKey, password,
return message.decrypt(privateKey, sessionKey, password).then(message => { return message.decrypt(privateKey, sessionKey, password).then(message => {
const result = parseMessage(message, format); const result = parseMessage(message, format);
if (result.data) { // verify if (result.data) { // verify
if (!publicKeys) { if (!publicKeys) {
publicKeys = []; publicKeys = [];
@ -286,6 +285,7 @@ export function decrypt({ message, privateKey, publicKeys, sessionKey, password,
export function sign({ data, privateKeys, armor=true, detached=false}) { export function sign({ data, privateKeys, armor=true, detached=false}) {
checkString(data); checkString(data);
privateKeys = toArray(privateKeys); privateKeys = toArray(privateKeys);
if (asyncProxy) { // use web worker if available if (asyncProxy) { // use web worker if available
return asyncProxy.delegate('sign', { data, privateKeys, armor, detached }); return asyncProxy.delegate('sign', { data, privateKeys, armor, detached });
} }