readl

src/mods/triplets/bit_string/bit_string.ts

@@ -62,10 +62,10 @@ export class BitString {
 
     const length = Length.read(binary)
 
-    return this.read2(binary, length.value)
+    return this.readl(binary, length.value)
   }
 
-  static read2(binary: Binary, length: number) {
+  static readl(binary: Binary, length: number) {
     const start = binary.offset
 
     const padding = binary.readUint8()

src/mods/triplets/boolean/boolean.ts

@@ -59,10 +59,10 @@ export class Boolean {
 
     const length = Length.read(binary)
 
-    return this.read2(binary, length.value)
+    return this.readl(binary, length.value)
   }
 
-  static read2(binary: Binary, length: number) {
+  static readl(binary: Binary, length: number) {
     const start = binary.offset
 
     const value = binary.readUint8()

src/mods/triplets/constructed/constructed.ts

@@ -56,14 +56,18 @@ export class Constructed {
 
     const length = Length.read(binary)
 
+    return this.readl(type, binary, length.value, read)
+  }
+
+  static readl(type: Type, binary: Binary, length: number, read: (binary: Binary) => Triplet) {
     const start = binary.offset
 
     const triplets = new Array<Triplet>()
 
-    while (binary.offset - start < length.value)
+    while (binary.offset - start < length)
       triplets.push(read(binary))
 
-    if (binary.offset - start !== length.value)
+    if (binary.offset - start !== length)
       throw new Error(`Invalid length`)
 
     return new this(type, triplets)

src/mods/triplets/ia5_string/ia5_string.ts

@@ -62,10 +62,10 @@ export class IA5String {
 
     const length = Length.read(binary)
 
-    return this.read2(binary, length.value)
+    return this.readl(binary, length.value)
   }
 
-  static read2(binary: Binary, length: number) {
+  static readl(binary: Binary, length: number) {
     const start = binary.offset
 
     const bytes = binary.read(length)

src/mods/triplets/integer/integer.ts

@@ -93,10 +93,10 @@ export class Integer {
 
     const length = Length.read(binary)
 
-    return this.read2(binary, length.value)
+    return this.readl(binary, length.value)
   }
 
-  static read2(binary: Binary, length: number) {
+  static readl(binary: Binary, length: number) {
     const start = binary.offset
 
     let value = BigInt(0)

src/mods/triplets/null/null.ts

@@ -50,6 +50,15 @@ export class Null {
 
     const length = Length.read(binary)
 
+    return this.readl(binary, length.value)
+  }
+
+  static readl(binary: Binary, length: number) {
+    const start = binary.offset
+
+    if (binary.offset - start !== length)
+      throw new Error(`Invalid length`)
+
     return new this()
   }
 

src/mods/triplets/object_identifier/object_identifier.ts

@@ -81,10 +81,10 @@ export class ObjectIdentifier {
 
     const length = Length.read(binary)
 
-    return this.read2(binary, length.value)
+    return this.readl(binary, length.value)
   }
 
-  static read2(binary: Binary, length: number) {
+  static readl(binary: Binary, length: number) {
     const start = binary.offset
 
     const header = binary.readUint8()

src/mods/triplets/octet_string/octet_string.ts

@@ -60,10 +60,10 @@ export class OctetString {
 
     const length = Length.read(binary)
 
-    return this.read2(binary, length.value)
+    return this.readl(binary, length.value)
   }
 
-  static read2(binary: Binary, length: number) {
+  static readl(binary: Binary, length: number) {
     const start = binary.offset
 
     const buffer = binary.read(length)

src/mods/triplets/printable_string/printable_string.ts

@@ -65,10 +65,10 @@ export class PrintableString {
 
     const length = Length.read(binary)
 
-    return this.read2(binary, length.value)
+    return this.readl(binary, length.value)
   }
 
-  static read2(binary: Binary, length: number) {
+  static readl(binary: Binary, length: number) {
     const start = binary.offset
 
     const value = binary.readString(length)

src/mods/triplets/sequence/sequence.ts

@@ -65,10 +65,10 @@ export class Sequence {
 
     const length = Length.read(binary)
 
-    return this.read2(binary, length.value, read)
+    return this.readl(binary, length.value, read)
   }
 
-  static read2(binary: Binary, length: number, read: (binary: Binary) => Triplet) {
+  static readl(binary: Binary, length: number, read: (binary: Binary) => Triplet) {
     const start = binary.offset
 
     const triplets = new Array<Triplet>()

src/mods/triplets/set/set.ts

@@ -65,10 +65,10 @@ export class Set {
 
     const length = Length.read(binary)
 
-    return this.read2(binary, length.value, read)
+    return this.readl(binary, length.value, read)
   }
 
-  static read2(binary: Binary, length: number, read: (binary: Binary) => Triplet) {
+  static readl(binary: Binary, length: number, read: (binary: Binary) => Triplet) {
     const start = binary.offset
 
     const inner = new Array<Triplet>()

src/mods/triplets/unknown/unknown.ts

@@ -44,14 +44,17 @@ export class Unknown {
 
   static read(binary: Binary) {
     const type = Type.read(binary)
-
     const length = Length.read(binary)
 
+    return this.readl(type, binary, length.value)
+  }
+
+  static readl(type: Type, binary: Binary, length: number) {
     const start = binary.offset
 
-    const buffer = binary.read(length.value)
+    const buffer = binary.read(length)
 
-    if (binary.offset - start !== length.value)
+    if (binary.offset - start !== length)
       throw new Error(`Invalid length`)
 
     return new this(type, buffer)

src/mods/triplets/utc_time/utc_time.ts

@@ -86,10 +86,10 @@ export class UTCTime {
 
     const length = Length.read(binary)
 
-    return this.read2(binary, length.value)
+    return this.readl(binary, length.value)
   }
 
-  static read2(binary: Binary, length: number) {
+  static readl(binary: Binary, length: number) {
     const start = binary.offset
 
     const text = binary.readString(length)

src/mods/triplets/utf8_string/utf8_string.ts

@@ -62,10 +62,10 @@ export class UTF8String {
 
     const length = Length.read(binary)
 
-    return this.read2(binary, length.value)
+    return this.readl(binary, length.value)
   }
 
-  static read2(binary: Binary, length: number) {
+  static readl(binary: Binary, length: number) {
     const start = binary.offset
 
     const value = binary.readString(length)