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

Cleanup canonical message handling for signatures

Browse Source
This commit is contained in:
Robert Nelson 2013-12-05 12:21:23 -08:00
parent 8c16abbfee
commit e965b6771b
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/encoding/openpgp.encoding.asciiarmor.js
View File

@ -59,7 +59,7 @@ function openpgp_encoding_deArmor(text) {
// splittedtext[indexBase] - the message
// splittedtext[indexBase + 1] - the signature and checksum
var msg = openpgp_encoding_split_headers(splittedtext[indexBase].replace(/^- /mg, ''));
var msg = openpgp_encoding_split_headers(splittedtext[indexBase].replace(/^- /mg, '').replace(/[\t ]+\n/g, "\n"));
var sig = openpgp_encoding_split_headers(splittedtext[indexBase + 1].replace(/^- /mg, ''));
var sig_sum = openpgp_encoding_split_checksum(sig.body);

11
src/openpgp.js
View File

@ -300,7 +300,7 @@ function _openpgp () {
*/
function write_signed_and_encrypted_message(privatekey, publickeys, messagetext) {
var result = "";
var literal = new openpgp_packet_literaldata().write_packet(messagetext.replace(/\r\n/g,"\n").replace(/\n/g,"\r\n"));
var literal = new openpgp_packet_literaldata().write_packet(messagetext.replace(/\r/g,'').replace(/\n/g,"\r\n"));
util.print_debug_hexstr_dump("literal_packet: |"+literal+"|\n",literal);
for (var i = 0; i < publickeys.length; i++) {
var onepasssignature = new openpgp_packet_onepasssignature();
@ -357,7 +357,7 @@ function _openpgp () {
*/
function write_encrypted_message(publickeys, messagetext) {
var result = "";
var literal = new openpgp_packet_literaldata().write_packet(messagetext.replace(/\r\n/g,"\n").replace(/\n/g,"\r\n"));
var literal = new openpgp_packet_literaldata().write_packet(messagetext.replace(/\r/g,'').replace(/\n/g,"\r\n"));
util.print_debug_hexstr_dump("literal_packet: |"+literal+"|\n",literal);
result = literal;
@ -400,9 +400,10 @@ function _openpgp () {
* This can be directly used to OpenPGP armor the message
*/
function write_signed_message(privatekey, messagetext) {
var sig = new openpgp_packet_signature().write_message_signature(1, messagetext.replace(/\r\n/g,"\n").replace(/\n/g,"\r\n"), privatekey);
var result = {text: messagetext.replace(/\r\n/g,"\n").replace(/\n/g,"\r\n"), openpgp: sig.openpgp, hash: sig.hash};
return openpgp_encoding_armor(2,result, null, null)
var canonicalMsgText = messagetext.replace(/\r/g,'').replace(/[\t ]+\n/g, "\n").replace(/\n/g,"\r\n");
var sig = new openpgp_packet_signature().write_message_signature(1, canonicalMsgText, privatekey);
var result = {text: canonicalMsgText, openpgp: sig.openpgp, hash: sig.hash};
return openpgp_encoding_armor(2, result, null, null)
}
/**

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

@ -506,10 +506,7 @@ function openpgp_packet_signature() {
break;
case 1: // 0x01: Signature of a canonical text document.
var tohash = data
.replace(/\r\n/g,"\n")
.replace(/[\t ]+\n/g, "\n")
.replace(/\n/g,"\r\n");
var tohash = data.replace(/\r\n/g,"\n").replace(/\n/g,"\r\n");
if (openpgp.config.debug) {
util.print_debug('tohash: '+util.hexdump(tohash));
util.print_debug('signatureData: '+util.hexdump(this.signatureData));