Compare commits
No commits in common. "master" and "v1.1.6" have entirely different histories.
@ -17,12 +17,9 @@ var PEM = exports.PEM;
|
|||||||
// Parser
|
// Parser
|
||||||
//
|
//
|
||||||
|
|
||||||
// Although I've only seen 9 max in https certificates themselves,
|
ASN1.ELOOPN = 20; // I've seen 9 max in https certificates
|
||||||
// but each domain list could have up to 100
|
|
||||||
ASN1.ELOOPN = 102;
|
|
||||||
ASN1.ELOOP = "uASN1.js Error: iterated over " + ASN1.ELOOPN + "+ elements (probably a malformed file)";
|
ASN1.ELOOP = "uASN1.js Error: iterated over " + ASN1.ELOOPN + "+ elements (probably a malformed file)";
|
||||||
// I've seen https certificates go 29 deep
|
ASN1.EDEEPN = 60; // I've seen 29 deep in https certificates
|
||||||
ASN1.EDEEPN = 60;
|
|
||||||
ASN1.EDEEP = "uASN1.js Error: element nested " + ASN1.EDEEPN + "+ layers deep (probably a malformed file)";
|
ASN1.EDEEP = "uASN1.js Error: element nested " + ASN1.EDEEPN + "+ layers deep (probably a malformed file)";
|
||||||
// Container Types are Sequence 0x30, Container Array? (0xA0, 0xA1)
|
// Container Types are Sequence 0x30, Container Array? (0xA0, 0xA1)
|
||||||
// Value Types are Boolean 0x01, Integer 0x02, Null 0x05, Object ID 0x06, String 0x0C, 0x16, 0x13, 0x1e Value Array? (0x82)
|
// Value Types are Boolean 0x01, Integer 0x02, Null 0x05, Object ID 0x06, String 0x0C, 0x16, 0x13, 0x1e Value Array? (0x82)
|
||||||
@ -32,7 +29,7 @@ ASN1.CTYPES = [ 0x30, 0x31, 0xa0, 0xa1 ];
|
|||||||
ASN1.VTYPES = [ 0x01, 0x02, 0x05, 0x06, 0x0c, 0x82 ];
|
ASN1.VTYPES = [ 0x01, 0x02, 0x05, 0x06, 0x0c, 0x82 ];
|
||||||
ASN1.parse = function parseAsn1Helper(buf) {
|
ASN1.parse = function parseAsn1Helper(buf) {
|
||||||
//var ws = ' ';
|
//var ws = ' ';
|
||||||
function parseAsn1(buf, depth, eager) {
|
function parseAsn1(buf, depth) {
|
||||||
if (depth.length >= ASN1.EDEEPN) { throw new Error(ASN1.EDEEP); }
|
if (depth.length >= ASN1.EDEEPN) { throw new Error(ASN1.EDEEP); }
|
||||||
|
|
||||||
var index = 2; // we know, at minimum, data starts after type (0) and lengthSize (1)
|
var index = 2; // we know, at minimum, data starts after type (0) and lengthSize (1)
|
||||||
@ -69,7 +66,7 @@ ASN1.parse = function parseAsn1Helper(buf) {
|
|||||||
while (iters < ASN1.ELOOPN && index < (2 + asn1.length + asn1.lengthSize)) {
|
while (iters < ASN1.ELOOPN && index < (2 + asn1.length + asn1.lengthSize)) {
|
||||||
iters += 1;
|
iters += 1;
|
||||||
depth.length += 1;
|
depth.length += 1;
|
||||||
child = parseAsn1(buf.slice(index, index + adjustedLen), depth, eager);
|
child = parseAsn1(buf.slice(index, index + adjustedLen), depth);
|
||||||
depth.length -= 1;
|
depth.length -= 1;
|
||||||
// The numbers don't match up exactly and I don't remember why...
|
// The numbers don't match up exactly and I don't remember why...
|
||||||
// probably something with adjustedLen or some such, but the tests pass
|
// probably something with adjustedLen or some such, but the tests pass
|
||||||
@ -95,7 +92,7 @@ ASN1.parse = function parseAsn1Helper(buf) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Recurse into types that are _always_ containers
|
// Recurse into types that are _always_ containers
|
||||||
if (-1 !== ASN1.CTYPES.indexOf(asn1.type)) { return parseChildren(eager); }
|
if (-1 !== ASN1.CTYPES.indexOf(asn1.type)) { return parseChildren(); }
|
||||||
|
|
||||||
// Return types that are _always_ values
|
// Return types that are _always_ values
|
||||||
asn1.value = buf.slice(index, index + adjustedLen);
|
asn1.value = buf.slice(index, index + adjustedLen);
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "asn1-parser",
|
"name": "asn1-parser",
|
||||||
"version": "1.1.8",
|
"version": "1.1.6",
|
||||||
"description": "An ASN.1 parser in less than 100 lines of Vanilla JavaScript, part of the Bluecrypt suite.",
|
"description": "An ASN.1 parser in less than 100 lines of Vanilla JavaScript, part of the Bluecrypt suite.",
|
||||||
"homepage": "https://git.coolaj86.com/coolaj86/asn1-parser.js",
|
"homepage": "https://git.coolaj86.com/coolaj86/asn1-parser.js",
|
||||||
"main": "asn1-parser.js",
|
"main": "asn1-parser.js",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user