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

do not echo data back to caller for detached signing

Browse Source
This commit is contained in:
Bart Butler 2017-12-05 11:44:01 -08:00
parent 2ffa221b21
commit 81a59b76b1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openpgp.js
View File

@ -314,13 +314,13 @@ export function sign({ data, privateKeys, armor=true, detached=false}) {
} }
} else { } else {
message = message.sign(privateKeys); message = message.sign(privateKeys);
}
if (armor) { if (armor) {
result.data = message.armor(); result.data = message.armor();
} else { } else {
result.message = message; result.message = message;
} }
}
return result; return result;
}, 'Error signing cleartext message'); }, 'Error signing cleartext message');

6
test/general/openpgp.js
View File

@ -969,7 +969,7 @@ describe('OpenPGP.js public api tests', function() {
publicKeys: publicKey.keys publicKeys: publicKey.keys
}; };
return openpgp.sign(signOpt).then(function(signed) { return openpgp.sign(signOpt).then(function(signed) {
verifyOpt.message = openpgp.cleartext.readArmored(signed.data); verifyOpt.message = new openpgp.cleartext.CleartextMessage(plaintext);
verifyOpt.signature = openpgp.signature.readArmored(signed.signature); verifyOpt.signature = openpgp.signature.readArmored(signed.signature);
return openpgp.verify(verifyOpt); return openpgp.verify(verifyOpt);
}).then(function(verified) { }).then(function(verified) {
@ -1009,7 +1009,7 @@ describe('OpenPGP.js public api tests', function() {
publicKeys: openpgp.key.readArmored(wrong_pubkey).keys publicKeys: openpgp.key.readArmored(wrong_pubkey).keys
}; };
return openpgp.sign(signOpt).then(function(signed) { return openpgp.sign(signOpt).then(function(signed) {
verifyOpt.message = openpgp.cleartext.readArmored(signed.data); verifyOpt.message = new openpgp.cleartext.CleartextMessage(plaintext);
verifyOpt.signature = openpgp.signature.readArmored(signed.signature); verifyOpt.signature = openpgp.signature.readArmored(signed.signature);
return openpgp.verify(verifyOpt); return openpgp.verify(verifyOpt);
}).then(function(verified) { }).then(function(verified) {
@ -1051,7 +1051,7 @@ describe('OpenPGP.js public api tests', function() {
publicKeys: publicKey.keys publicKeys: publicKey.keys
}; };
return openpgp.sign(signOpt).then(function(signed) { return openpgp.sign(signOpt).then(function(signed) {
verifyOpt.message = signed.message; verifyOpt.message = new openpgp.cleartext.CleartextMessage(plaintext);
verifyOpt.signature = signed.signature; verifyOpt.signature = signed.signature;
return openpgp.verify(verifyOpt); return openpgp.verify(verifyOpt);
}).then(function(verified) { }).then(function(verified) {