Mirroristas/openpgpjs
2
0
Fork 0
mirror of https://github.com/openpgpjs/openpgpjs.git synced 2026-03-07 09:31:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix signatures of messages with leading/trailing whitespace

Browse Source
This commit is contained in:
Daniel Huigens
2018-06-27 15:53:32 +02:00
parent 160b03451f
commit 95413cc6ed
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/encoding/armor.js
View File

@@ -220,13 +220,13 @@ function dearmor(input) {
while (true) {
if (resolved) await writer.ready;
try {
let line = await reader.readLine();
if (line === undefined) {
const lineUntrimmed = await reader.readLine();
if (lineUntrimmed === undefined) {
throw new Error('Misformed armored text');
}
// remove trailing whitespace at end of lines
// remove leading whitespace for compat with older versions of OpenPGP.js
line = line.trim();
const line = lineUntrimmed.trim();
if (!type) {
if (reSplit.test(line)) {
type = getType(line);
@@ -248,7 +248,7 @@ function dearmor(input) {
} else if (!textDone && type === 2) {
if (!reSplit.test(line)) {
// Reverse dash-escaping for msg
text.push(line.replace(/^- /, ''));
text.push(util.removeTrailingSpaces(lineUntrimmed.replace(/^- /, '').replace(/[\r\n]+$/, '')));
} else {
text = text.join('\r\n');
textDone = true;