v1.1.8: bugfix increase incorrect loop limit for eager parsing

README.md

@@ -1,6 +1,6 @@
 # Bluecrypt ASN.1 Parser
 
-An ASN.1 parser in less than 100 lines of Vanilla JavaScript,
+An ASN.1 decoder in less than 100 lines of Vanilla JavaScript,
 part of the Bluecrypt suite.
 <br>
 <small>(< 150 with newlines and comments)</small>
@@ -17,6 +17,10 @@ part of the Bluecrypt suite.
   * [x] Online [Demo](https://coolaj86.com/demos/asn1-parser/)
   * [ ] Node.js (built, publishing soon)
 
+### Need an ASN.1 Builder too?
+
+Check out https://git.coolaj86.com/coolaj86/asn1-packer.js/
+
 # Demo
 
 <https://coolaj86.com/demos/asn1-parser/>

asn1-parser.js

@@ -1,3 +1,7 @@
+// Copyright 2018 AJ ONeal. All rights reserved
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 ;(function (exports) {
 'use strict';
 
@@ -13,8 +17,13 @@ var PEM = exports.PEM;
 // Parser
 //
 
-ASN1.ELOOP = "uASN1.js Error: iterated over 15+ elements (probably a malformed file)";
+// Although I've only seen 9 max in https certificates themselves,
-ASN1.EDEEP = "uASN1.js Error: element nested 20+ layers deep (probably a malformed file)";
+// 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)";
+// I've seen https certificates go 29 deep
+ASN1.EDEEPN = 60;
+ASN1.EDEEP = "uASN1.js Error: element nested " + ASN1.EDEEPN + "+ layers deep (probably a malformed file)";
 // 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)
 // Bit String (0x03) and Octet String (0x04) may be values or containers
@@ -23,8 +32,8 @@ ASN1.CTYPES = [ 0x30, 0x31, 0xa0, 0xa1 ];
 ASN1.VTYPES = [ 0x01, 0x02, 0x05, 0x06, 0x0c, 0x82 ];
 ASN1.parse = function parseAsn1Helper(buf) {
   //var ws = '  ';
-  function parseAsn1(buf, depth) {
+  function parseAsn1(buf, depth, eager) {
-    if (depth.length >= 20) { 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 asn1 = { type: buf[0], lengthSize: 0, length: buf[1] };
@@ -57,10 +66,11 @@ ASN1.parse = function parseAsn1Helper(buf) {
     function parseChildren(eager) {
       asn1.children = [];
       //console.warn('1 len:', (2 + asn1.lengthSize + asn1.length), 'idx:', index, 'clen:', 0);
-      while (iters < 15 && index < (2 + asn1.length + asn1.lengthSize)) {
+      while (iters < ASN1.ELOOPN && index < (2 + asn1.length + asn1.lengthSize)) {
         iters += 1;
         depth.length += 1;
-        child = parseAsn1(buf.slice(index, index + adjustedLen), depth);
+        child = parseAsn1(buf.slice(index, index + adjustedLen), depth, eager);
+        depth.length -= 1;
         // The numbers don't match up exactly and I don't remember why...
         // probably something with adjustedLen or some such, but the tests pass
         index += (2 + child.lengthSize + child.length);
@@ -78,14 +88,14 @@ ASN1.parse = function parseAsn1Helper(buf) {
         //console.warn('index:', index, 'length:', (2 + asn1.lengthSize + asn1.length));
         throw new Error("premature end-of-file");
       }
-      if (iters >= 15) { throw new Error(ASN1.ELOOP); }
+      if (iters >= ASN1.ELOOPN) { throw new Error(ASN1.ELOOP); }
 
       delete asn1.value;
       return asn1;
     }
 
     // Recurse into types that are _always_ containers
-    if (-1 !== ASN1.CTYPES.indexOf(asn1.type)) { return parseChildren(); }
+    if (-1 !== ASN1.CTYPES.indexOf(asn1.type)) { return parseChildren(eager); }
 
     // Return types that are _always_ values
     asn1.value = buf.slice(index, index + adjustedLen);

index.html

@@ -28,7 +28,7 @@ rMjgyCokrnjDft6Y/YnA4A50yZe7CnFsqeDcpnPbubP6cpYiVcnevNIYyg==
   <pre><code class="js-json"> </code></pre>
 
   <br>
-  <p>Made with <a href="https://git.coolaj86.com/coolaj86/asn1-parser/">asn1-parser.js</a></p>
+  <p>Made with <a href="https://git.coolaj86.com/coolaj86/asn1-parser.js/">asn1-parser.js</a></p>
 
   <script src="./asn1-parser.js"></script>
   <script>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "asn1-parser",
-  "version": "1.1.4",
+  "version": "1.1.8",
   "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",
   "main": "asn1-parser.js",