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

signatureInput -> signature

Browse Source
This commit is contained in:
Sanjana Rajan 2017-03-23 13:01:12 -07:00
parent 484d5aa1ab
commit 16c6d2f162
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/openpgp.js
View File

@ -180,17 +180,17 @@ export function decryptKey({ privateKey, passphrase }) {
* @param {String} filename (optional) a filename for the literal data packet * @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} 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 {Boolean} detached (optional) if the signature should be detached (if true, signature will be added to returned object)
* @param {Signature} signatureInput (optional) a detached signature to add to the encrypted message * @param {Signature} signature (optional) a detached signature to add to the encrypted message
* @return {Promise<Object>} encrypted (and optionally signed message) in the form: * @return {Promise<Object>} encrypted (and optionally signed message) in the form:
* {data: ASCII armored message if 'armor' is true, * {data: ASCII armored message if 'armor' is true,
* message: full Message object if 'armor' is false, signature: detached signature if 'detached' is true} * message: full Message object if 'armor' is false, signature: detached signature if 'detached' is true}
* @static * @static
*/ */
export function encrypt({ data, publicKeys, privateKeys, passwords, filename, armor=true, detached=false, signatureInput=null }) { export function encrypt({ data, publicKeys, privateKeys, passwords, filename, armor=true, detached=false, signature=null }) {
checkData(data); publicKeys = toArray(publicKeys); privateKeys = toArray(privateKeys); passwords = toArray(passwords); checkData(data); publicKeys = toArray(publicKeys); privateKeys = toArray(privateKeys); passwords = toArray(passwords);
if (!nativeAEAD() && asyncProxy) { // use web worker if web crypto apis are not supported if (!nativeAEAD() && asyncProxy) { // use web worker if web crypto apis are not supported
return asyncProxy.delegate('encrypt', { data, publicKeys, privateKeys, passwords, filename, armor, detached }); return asyncProxy.delegate('encrypt', { data, publicKeys, privateKeys, passwords, filename, armor, detached, signature });
} }
var result = {}; var result = {};
return Promise.resolve().then(() => { return Promise.resolve().then(() => {
@ -199,16 +199,16 @@ export function encrypt({ data, publicKeys, privateKeys, passwords, filename, ar
if (!privateKeys) { if (!privateKeys) {
privateKeys = []; privateKeys = [];
} }
if (privateKeys.length || signatureInput) { // sign the message only if private keys or signatureInput is specified if (privateKeys.length || signature) { // sign the message only if private keys or signature is specified
if (detached) { if (detached) {
var signature = message.signDetached(privateKeys, signatureInput); var detachedSignature = message.signDetached(privateKeys, signature);
if (armor) { if (armor) {
result.signature = signature.armor(); result.signature = detachedSignature.armor();
} else { } else {
result.signature = signature; result.signature = detachedSignature;
} }
} else { } else {
message = message.sign(privateKeys, signatureInput); message = message.sign(privateKeys, signature);
} }
} }
return message.encrypt(publicKeys, passwords); return message.encrypt(publicKeys, passwords);

8
test/general/openpgp.js
View File

@ -708,7 +708,7 @@ describe('OpenPGP.js public api tests', function() {
}; };
openpgp.sign(signOpt).then(function(signed) { openpgp.sign(signOpt).then(function(signed) {
encOpt.signatureInput = openpgp.signature.readArmored(signed.signature); encOpt.signature = openpgp.signature.readArmored(signed.signature);
return openpgp.encrypt(encOpt); return openpgp.encrypt(encOpt);
}).then(function(encrypted) { }).then(function(encrypted) {
decOpt.message = openpgp.message.readArmored(encrypted.data); decOpt.message = openpgp.message.readArmored(encrypted.data);
@ -747,7 +747,7 @@ describe('OpenPGP.js public api tests', function() {
}; };
openpgp.sign(signOpt).then(function(signed) { openpgp.sign(signOpt).then(function(signed) {
encOpt.signatureInput = openpgp.signature.readArmored(signed.signature); encOpt.signature = openpgp.signature.readArmored(signed.signature);
return openpgp.encrypt(encOpt); return openpgp.encrypt(encOpt);
}).then(function(encrypted) { }).then(function(encrypted) {
decOpt.message = openpgp.message.readArmored(encrypted.data); decOpt.message = openpgp.message.readArmored(encrypted.data);
@ -783,7 +783,7 @@ describe('OpenPGP.js public api tests', function() {
}; };
openpgp.sign(signOpt).then(function(signed) { openpgp.sign(signOpt).then(function(signed) {
encOpt.signatureInput = openpgp.signature.readArmored(signed.signature); encOpt.signature = openpgp.signature.readArmored(signed.signature);
return openpgp.encrypt(encOpt); return openpgp.encrypt(encOpt);
}).then(function(encrypted) { }).then(function(encrypted) {
decOpt.message = openpgp.message.readArmored(encrypted.data); decOpt.message = openpgp.message.readArmored(encrypted.data);
@ -816,7 +816,7 @@ describe('OpenPGP.js public api tests', function() {
}; };
openpgp.sign(signOpt).then(function(signed) { openpgp.sign(signOpt).then(function(signed) {
encOpt.signatureInput = openpgp.signature.readArmored(signed.signature); encOpt.signature = openpgp.signature.readArmored(signed.signature);
return openpgp.encrypt(encOpt); return openpgp.encrypt(encOpt);
}).then(function(encrypted) { }).then(function(encrypted) {
decOpt.message = openpgp.message.readArmored(encrypted.data); decOpt.message = openpgp.message.readArmored(encrypted.data);