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

More consistency changes

Browse Source
This commit is contained in:
Robert Nelson 2013-12-05 12:29:52 -08:00
parent e965b6771b
commit f07702e867
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/packet/openpgp.packet.signature.js
View File

@ -506,18 +506,18 @@ function openpgp_packet_signature() {
break; break;
case 1: // 0x01: Signature of a canonical text document. case 1: // 0x01: Signature of a canonical text document.
var tohash = data.replace(/\r\n/g,"\n").replace(/\n/g,"\r\n"); var canonicalMsgText = data.replace(/\r/g,'').replace(/\n/g,"\r\n");
if (openpgp.config.debug) { if (openpgp.config.debug) {
util.print_debug('tohash: '+util.hexdump(tohash)); util.print_debug('canonicalMsgText: '+util.hexdump(canonicalMsgText));
util.print_debug('signatureData: '+util.hexdump(this.signatureData)); util.print_debug('signatureData: '+util.hexdump(this.signatureData));
util.print_debug('trailer: '+util.hexdump(trailer)); util.print_debug('trailer: '+util.hexdump(trailer));
} }
if (this.version == 4) { if (this.version == 4) {
this.verified = openpgp_crypto_verifySignature(this.publicKeyAlgorithm, this.hashAlgorithm, this.verified = openpgp_crypto_verifySignature(this.publicKeyAlgorithm, this.hashAlgorithm,
this.MPIs, key.obj.publicKeyPacket.MPIs, tohash+this.signatureData+trailer); this.MPIs, key.obj.publicKeyPacket.MPIs, canonicalMsgText+this.signatureData+trailer);
} else if (this.version == 3) { } else if (this.version == 3) {
this.verified = openpgp_crypto_verifySignature(this.publicKeyAlgorithm, this.hashAlgorithm, this.verified = openpgp_crypto_verifySignature(this.publicKeyAlgorithm, this.hashAlgorithm,
this.MPIs, key.obj.publicKeyPacket.MPIs, tohash+this.signatureData); this.MPIs, key.obj.publicKeyPacket.MPIs, canonicalMsgText+this.signatureData);
} else { } else {
this.verified = false; this.verified = false;
} }