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

Merge pull request #566 from FlowCrypt/master

Browse Source 
util.readNumber: stop overflowing until full range of uint32 for 4 byte numbers | #497
This commit is contained in:
Bart Butler 2017-07-22 09:58:00 -07:00 committed by GitHub
commit dc2d38d355
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/util.js
View File

@ -85,12 +85,9 @@ export default {
readNumber: function (bytes) { readNumber: function (bytes) {
var n = 0; var n = 0;
for (var i = 0; i < bytes.length; i++) { for (var i = 0; i < bytes.length; i++) {
n <<= 8; n += Math.pow(256, i) * bytes[bytes.length - 1 - i];
n += bytes[i];
} }
return n; return n;
}, },

6
test/general/util.js
View File

@ -185,6 +185,12 @@ describe('Util unit tests', function() {
var test = openpgp.util.decode_utf8.bind(null, {chameleon: true}); var test = openpgp.util.decode_utf8.bind(null, {chameleon: true});
expect(test).to.throw(Error, /Parameter "utf8" is not of type string/); expect(test).to.throw(Error, /Parameter "utf8" is not of type string/);
}); });
it('util.readNumber should not overflow until full range of uint32', function () {
var ints = [Math.pow(2, 20), Math.pow(2, 25), Math.pow(2, 30), Math.pow(2, 32) - 1];
for(var i = 0; i < ints.length; i++) {
expect(openpgp.util.readNumber(openpgp.util.writeNumber(ints[i], 4))).to.equal(ints[i]);
}
});
}); });
}); });