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

Fixed handling of windows line endings within the ascii

Browse Source 
dearmoring function.
This commit is contained in:
Michal Kolodziej 2013-04-15 16:37:54 +02:00
parent 8da7578588
commit 6d7df71c58
1 changed files with 52 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,29 +19,66 @@
* DeArmor an OpenPGP armored message; verify the checksum and return * DeArmor an OpenPGP armored message; verify the checksum and return
* the encoded bytes * the encoded bytes
* @param {String} text OpenPGP armored message * @param {String} text OpenPGP armored message
* @returns {(String|Object)} Either the bytes of the decoded message * @returns {(Boolean|Object)} Either false in case of an error
* or an object with attribute "text" containing the message text * or an object with attribute "text" containing the message text
* and an attribute "openpgp" containing the bytes. * and an attribute "openpgp" containing the bytes.
*/ */
function openpgp_encoding_deArmor(text) { function openpgp_encoding_deArmor(text) {
var type = getPGPMessageType(text); text = text.replace(/\r/g, '')
var type = openpgp_encoding_get_type(text);
if (type != 2) { if (type != 2) {
var splittedtext = text.split('-----'); var splittedtext = text.split('-----');
data = { openpgp: openpgp_encoding_base64_decode(splittedtext[2].split('\n\n')[1].split("\n=")[0].replace(/\n- /g,"\n")),
type: type}; var data = {
if (verifyCheckSum(data.openpgp, splittedtext[2].split('\n\n')[1].split("\n=")[1].split('\n')[0])) openpgp: openpgp_encoding_base64_decode(
splittedtext[2]
.split('\n\n')[1]
.split("\n=")[0]
.replace(/\n- /g,"\n")),
type: type
};
if (verifyCheckSum(data.openpgp,
splittedtext[2]
.split('\n\n')[1]
.split("\n=")[1]
.split('\n')[0]))
return data; return data;
else else {
util.print_error("Ascii armor integrity check on message failed: '"+splittedtext[2].split('\n\n')[1].split("\n=")[1].split('\n')[0]+"' should be '"+getCheckSum(data))+"'"; util.print_error("Ascii armor integrity check on message failed: '"
+ splittedtext[2]
.split('\n\n')[1]
.split("\n=")[1]
.split('\n')[0]
+ "' should be '"
+ getCheckSum(data)) + "'";
return false;
}
} else { } else {
var splittedtext = text.split('-----'); var splittedtext = text.split('-----');
var result = { text: splittedtext[2].replace(/\n- /g,"\n").split("\n\n")[1],
openpgp: openpgp_encoding_base64_decode(splittedtext[4].split("\n\n")[1].split("\n=")[0]), var result = {
type: type}; text: splittedtext[2]
if (verifyCheckSum(result.openpgp, splittedtext[4].split("\n\n")[1].split("\n=")[1])) .replace(/\n- /g,"\n")
.split("\n\n")[1],
openpgp: openpgp_encoding_base64_decode(splittedtext[4]
.split("\n\n")[1]
.split("\n=")[0]),
type: type
};
if (verifyCheckSum(result.openpgp, splittedtext[4]
.split("\n\n")[1]
.split("\n=")[1]))
return result; return result;
else else {
util.print_error("Ascii armor integrity check on message failed"); util.print_error("Ascii armor integrity check on message failed");
return false;
}
} }
} }
@ -56,7 +93,7 @@ function openpgp_encoding_deArmor(text) {
* 5 = PRIVATE KEY BLOCK * 5 = PRIVATE KEY BLOCK
* null = unknown * null = unknown
*/ */
function getPGPMessageType(text) { function openpgp_encoding_get_type(text) {
var splittedtext = text.split('-----'); var splittedtext = text.split('-----');
// BEGIN PGP MESSAGE, PART X/Y // BEGIN PGP MESSAGE, PART X/Y
// Used for multi-part messages, where the armor is split amongst Y // Used for multi-part messages, where the armor is split amongst Y