Merge pull request #8 from bashkarev/fix-eoc

getDecoratedObject does not enforce proper use of end-of-content (EOC) markers
adapik · Mar 22, 2024 · aa15fb8 · aa15fb8
2 parents b0ea781 + 3629747
commit aa15fb8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/ASN1/AbstractTaggedObject.php b/src/ASN1/AbstractTaggedObject.php
@@ -12,6 +12,9 @@ public function getDecoratedObject($tagNumber, $tagClass = Identifier::CLASS_UNI
         $identifierOctets = IdentifierManager::create($tagClass, $isConstructed, $tagNumber);
 
         $binary = $identifierOctets.$this->getContentLength()->getBinary().$this->getContent()->getBinary();
+        if ($this->eoc) {
+            $binary .= $this->eoc->getBinary();
+        }
 
         return ASN1Object::fromBinary($binary);
     }

diff --git a/tests/ASN1/ExplicitlyTaggedObjectTest.php b/tests/ASN1/ExplicitlyTaggedObjectTest.php
@@ -107,4 +107,24 @@ public function testFromBinaryWithMultipleObjects()
         $this->assertEquals(2+$length, $object->getObjectLength());
         $this->assertEquals($data, $object->getBinary());
     }
+
+    public function testDecorated()
+    {
+        $object1 = Boolean::create(true);
+        $object2 = Integer::create(42);
+        $identifier = 0xA0;
+
+        // SHORT_FORM
+        $length = $object1->getObjectLength() + $object2->getObjectLength();
+        $data = chr($identifier) . chr($length) . $object1->getBinary() . $object2->getBinary();
+        $object = ExplicitlyTaggedObject::fromBinary($data);
+        $decoratedData = $object->getDecoratedObject(0, Identifier::CLASS_CONTEXT_SPECIFIC, true)->getBinary();
+        $this->assertEquals($data, $decoratedData);
+
+        // INDEFINITE_FORM
+        $dataEoc = chr($identifier) . chr(128) . $object1->getBinary() . $object2->getBinary() . chr(0) . chr(0);
+        $object = ExplicitlyTaggedObject::fromBinary($dataEoc);
+        $decoratedData = $object->getDecoratedObject(0, Identifier::CLASS_CONTEXT_SPECIFIC, true)->getBinary();
+        $this->assertEquals($dataEoc, $decoratedData);
+    }
 }