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

Drop support for \r as EOL (#1073)

Browse Source
This commit is contained in:
larabr 2020-04-16 17:16:19 +02:00 committed by Daniel Huigens
parent 90ff60cbb1
commit e39216424f
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cleartext.js
View File

@ -43,7 +43,7 @@ export function CleartextMessage(text, signature) {
return new CleartextMessage(text, signature);
}
// normalize EOL to canonical form <CR><LF>
this.text = util.removeTrailingSpaces(text).replace(/\r\n/g, '\n').replace(/[\r\n]/g, '\r\n');
this.text = util.removeTrailingSpaces(text).replace(/\r?\n/g, '\r\n');
if (signature && !(signature instanceof Signature)) {
throw new Error('Invalid signature input');
}

16
src/util.js
View File

@ -695,19 +695,29 @@ export default {
canonicalizeEOL: function(data) {
const CR = 13;
const LF = 10;
let carryOverCR = false;
return stream.transform(data, bytes => {
bytes = carryOverCR ? [CR].concat(Array.from(bytes)) : Array.from(bytes);
if (bytes[bytes.length - 1] === CR) {
carryOverCR = true;
bytes.pop();
} else {
carryOverCR = false;
}
return stream.transform(util.nativeEOL(data, true), bytes => {
const normalized = [];
for (let i = 0; i < bytes.length; i++){
const x = bytes[i];
if (x === LF || x === CR) {
if (x === LF && i > 0 && bytes[i - 1] !== CR) {
normalized.push(CR, LF);
} else {
normalized.push(x);
}
}
return new Uint8Array(normalized);
});
}, () => new Uint8Array(carryOverCR ? [CR] : []));
},
/**