Mirroristas/openpgpjs
2
0
Fork 0
mirror of https://github.com/openpgpjs/openpgpjs.git synced 2026-03-05 16:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

do not fail when missing armor checksum | #563

Browse Source
This commit is contained in:
Tom James Holub
2017-07-21 10:13:33 -07:00
parent b3077235f9
commit c27725782c
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/encoding/armor.js
View File

@@ -247,6 +247,9 @@ function splitChecksum(text) {
if (lastEquals >= 0) {
body = text.slice(0, lastEquals);
checksum = text.slice(lastEquals + 1);
if (checksum.substr(0, 6) === '\n-----') {
checksum = ''; // missing armor checksum
}
}
return { body: body, checksum: checksum };
@@ -311,10 +314,9 @@ function dearmor(text) {
checksum = checksum.substr(0, 4);
if (!verifyCheckSum(result.data, checksum)) {
throw new Error("Ascii armor integrity check on message failed: '" +
checksum +
"' should be '" +
if (!verifyCheckSum(result.data, checksum) && (checksum || config.checksum_required)) {
// will NOT throw error if checksum is empty AND checksum is not required (GPG compatibility)
throw new Error("Ascii armor integrity check on message failed: '" + checksum + "' should be '" +
getCheckSum(result.data) + "'");
}