Rebase for upload to main openpgpjs repo

This commit is contained in:
Bart Butler 2015-06-24 22:31:37 -07:00 committed by Tankred Hase
parent f56b6887d9
commit 469a6be31a
2 changed files with 3 additions and 4 deletions

View File

@ -84,9 +84,8 @@ function r2s(t) {
// TODO check atob alternative // TODO check atob alternative
var c, n; var c, n;
var r = [], var r = [],
s = 0,
var s = 0, a = 0;
var a = 0;
var tl = t.length; var tl = t.length;
for (n = 0; n < tl; n++) { for (n = 0; n < tl; n++) {

View File

@ -72,7 +72,7 @@ SymmetricallyEncrypted.prototype.decrypt = function (sessionKeyAlgorithm, key) {
sessionKeyAlgorithm === 'aes256')) { sessionKeyAlgorithm === 'aes256')) {
throw new Error('Decryption failed due to missing MDC in combination with modern cipher.') throw new Error('Decryption failed due to missing MDC in combination with modern cipher.')
} }
this.packets.read(decrypted.join('')); this.packets.read(decrypted);
}; };
SymmetricallyEncrypted.prototype.encrypt = function (algo, key) { SymmetricallyEncrypted.prototype.encrypt = function (algo, key) {