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

WIP text signatures

Browse Source
This commit is contained in:
Sanjana Rajan 2018-03-22 13:45:07 -07:00
parent c9d837cf8a
commit a22c9e4770
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/message.js
View File

@ -564,9 +564,14 @@ export async function createVerificationObjects(signatureList, literalDataList,
} }
})); }));
const literalDataPacket = literalDataList[0];
if (signature.signatureType === enums.signature.text) {
literalDataPacket.setText(literalDataPacket.getText());
}
const verifiedSig = { const verifiedSig = {
keyid: signature.issuerKeyId, keyid: signature.issuerKeyId,
valid: keyPacket ? await signature.verify(keyPacket, literalDataList[0]) : null valid: keyPacket ? await signature.verify(keyPacket, literalDataPacket) : null
}; };
const packetlist = new packet.List(); const packetlist = new packet.List();

4
src/openpgp.js
View File

@ -335,9 +335,7 @@ export function decrypt({ message, privateKeys, passwords, sessionKeys, publicKe
* @async * @async
* @static * @static
*/ */
export function sign({ export function sign({ data, privateKeys, armor=true, detached=false, date=new Date() }) {
data, privateKeys, armor=true, detached=false, date=new Date()
}) {
checkData(data); checkData(data);
privateKeys = toArray(privateKeys); privateKeys = toArray(privateKeys);

3
src/packet/literal.js
View File

@ -49,8 +49,9 @@ function Literal(date=new Date()) {
Literal.prototype.setText = function(text) { Literal.prototype.setText = function(text) {
// normalize EOL to \r\n // normalize EOL to \r\n
text = text.replace(/\r\n/g, '\n').replace(/\r/g, '\n').replace(/\n/g, '\r\n'); text = text.replace(/\r\n/g, '\n').replace(/\r/g, '\n').replace(/\n/g, '\r\n');
this.format = 'utf8';
// encode UTF8 // encode UTF8
this.data = this.format === 'utf8' ? util.str_to_Uint8Array(util.encode_utf8(text)) : util.str_to_Uint8Array(text); this.data = util.str_to_Uint8Array(util.encode_utf8(text));
}; };
/** /**