fix timestamp mappings

Author: Falseclock

src/Maps/TimeStampRequest.php

@@ -48,6 +48,7 @@ abstract class TimeStampRequest
             'certReq' => [
                 'type' => Identifier::BOOLEAN,
                 'default' => true,
+                'optional' => true,
             ],
             'extensions' => [
                     'constant' => 0,

src/Signature.php

@@ -23,7 +23,7 @@
  * Class Signature
  *
  * @see     Maps\Signature
- * @package Adapik\CMS
+ * @package Falseclock\AdvancedCMS
  */
 class Signature extends CMSBase
 {

src/SignedData.php

@@ -65,12 +65,12 @@ public function mergeCMS(SignedData $signedData): SignedData
             $initialContent->appendCertificate($certificate);
         }
 
-        $revocationInfoChoices = $newContent->getRevocationInfoChoices();
+/*        $revocationInfoChoices = $newContent->getRevocationInfoChoices();
         if ($revocationInfoChoices) {
             foreach ($revocationInfoChoices as $revocationInfoChoice) {
                 $initialContent->appendRevocationInfoChoices($revocationInfoChoice);
             }
-        }
+        }*/
 
         foreach ($newContent->getSignerInfoSet() as $signerInfo) {
             $initialContent->appendSignerInfo($signerInfo);

src/SignedDataContent.php

@@ -59,10 +59,10 @@ public function appendCertificate(Certificate $certificate): self
      * @return SignedDataContent
      * @todo implement
      */
-    public function appendRevocationInfoChoices(RevocationInfoChoices $revocationInfoChoice): self
+/*    public function appendRevocationInfoChoices(RevocationInfoChoices $revocationInfoChoice): self
     {
         return $this;
-    }
+    }*/
 
     /**
      * @param SignerInfo $signerInfo

src/TimeStampRequest.php

@@ -81,12 +81,16 @@ public static function createSimple(OctetString $data, string $hashAlgorithmOID
      * @throws Exception
      * @noinspection PhpUnnecessaryFullyQualifiedNameInspection
      */
-    public function getCertReq(): \FG\ASN1\Universal\Boolean
+    public function getCertReq(): ?\FG\ASN1\Universal\Boolean
     {
-        /** @var Boolean $boolean */
-        $boolean = $this->object->findChildrenByType(Boolean::class)[0]->getBinary();
+        $return = null;
+        $boolean = $this->object->findChildrenByType(Boolean::class);
+        if (count($boolean) > 0) {
+            $binary = $boolean[0]->getBinary();
+            $return = Boolean::fromBinary($binary);
+        }
 
-        return Boolean::fromBinary($boolean);
+        return $return;
     }
 
     /**
@@ -104,13 +108,14 @@ public function getMessageImprint(): MessageImprint
      */
     public function getNonce()
     {
+        $return = null;
         $integers = $this->object->findChildrenByType(Integer::class);
         if (count($integers) == 2) {
             $binary = $integers[1]->getBinary();
-            return Integer::fromBinary($binary);
+            $return = Integer::fromBinary($binary);
         }
 
-        return null;
+        return $return;
     }
 
     /**
@@ -119,12 +124,13 @@ public function getNonce()
      */
     public function getReqPolicy()
     {
+        $return = null;
         $objects = $this->object->findChildrenByType(ObjectIdentifier::class);
         if (count($objects)) {
             $binary = $objects[0]->getBinary();
-            return ObjectIdentifier::fromBinary($binary);
+            $return = ObjectIdentifier::fromBinary($binary);
         }
 
-        return null;
+        return $return;
     }
 }

src/TimeStampResponse.php

@@ -52,12 +52,13 @@ public function getStatusInfo(): PKIStatusInfo
      */
     public function getSignedData(): ?SignedData
     {
+        $return = null;
         $children = $this->object->getChildren();
 
         if (count($children) == 2) {
-            return new SignedData($children[1]);
+            $return = new SignedData($children[1]);
         }
 
-        return null;
+        return $return;
     }
 }

tests/MainTest.php

@@ -18,6 +18,11 @@ public function getOCSPResponse()
         return file_get_contents(__DIR__ . '/fixtures/OCSPResponse.pem');
     }
 
+    public function getTimeStampRequestWithPolicy()
+    {
+        return file_get_contents(__DIR__ . '/fixtures/TimeStampRequestWithPolicy.pem');
+    }
+
     public function getFullCMS()
     {
         return file_get_contents(__DIR__ . '/fixtures/full.cms');
@@ -48,6 +53,11 @@ public function getTimeStampResponse()
         return file_get_contents(__DIR__ . '/fixtures/TimeStampResponse.pem');
     }
 
+    public function getTimeStampResponseTSA()
+    {
+        return file_get_contents(__DIR__ . '/fixtures/response.tsr');
+    }
+
     public function getBadTimeStampResponse()
     {
         return file_get_contents(__DIR__ . '/fixtures/BadTimeStampResponse.pem');
@@ -63,15 +73,15 @@ public function getOCSPRequestWithSignature()
         return file_get_contents(__DIR__ . '/fixtures/OCSPRequestWithSignature.pem');
     }
 
-	public function getRevokedCertificate()
-	{
-		return file_get_contents(__DIR__ . '/fixtures/revokedCertificate.pem');
-	}
+    public function getRevokedCertificate()
+    {
+        return file_get_contents(__DIR__ . '/fixtures/revokedCertificate.pem');
+    }
 
-	public function getDoubleOCSPRequest()
-	{
-		return file_get_contents(__DIR__ . '/fixtures/DoubleOCSPRequest.pem');
-	}
+    public function getDoubleOCSPRequest()
+    {
+        return file_get_contents(__DIR__ . '/fixtures/DoubleOCSPRequest.pem');
+    }
 
     protected function curlRequest(string $url, string $binaryContent, string $requestContentType, string $responseContentType)
     {

tests/SignatureTest.php

@@ -0,0 +1,20 @@
+<?php
+declare(strict_types = 1);
+
+namespace Falseclock\AdvancedCMS\Test;
+
+use Falseclock\AdvancedCMS\OCSPRequest;
+use Falseclock\AdvancedCMS\Signature;
+
+class SignatureTest extends MainTest
+{
+	public function testCreation() {
+		$OCSPRequest = OCSPRequest::createFromContent($this->getOCSPRequestWithSignature());
+
+		$optionalSignature = $OCSPRequest->getOptionalSignature();
+
+		$binary = $optionalSignature->getBinary();
+		$newSignature = Signature::createFromContent($binary);
+		self::assertEquals($binary, $newSignature->getBinary());
+	}
+}

tests/TimeStampRequestTest.php

@@ -8,10 +8,21 @@
 use Falseclock\AdvancedCMS\TimeStampResponse;
 use FG\ASN1\Universal\Boolean;
 use FG\ASN1\Universal\Integer;
+use FG\ASN1\Universal\ObjectIdentifier;
 use FG\ASN1\Universal\OctetString;
 
 class TimeStampRequestTest extends MainTest
 {
+    public function testPolicy()
+    {
+        $timeStampRequest = TimeStampRequest::createFromContent($this->getTimeStampRequestWithPolicy());
+
+        $policy = $timeStampRequest->getReqPolicy();
+        self::assertInstanceOf(ObjectIdentifier::class, $policy);
+        self::assertEquals("1.2.3.4.5.6.7.8.9", (string)$policy);
+        self::assertNull($timeStampRequest->getCertReq());
+    }
+
     function testCreate()
     {
         $binary = "123456";

tests/TimeStampResponseTest.php

@@ -11,7 +11,7 @@ class TimeStampResponseTest extends MainTest
 {
     public function testBase()
     {
-        $timeStampResponse = TimeStampResponse::createFromContent($this->getTimeStampResponse());
+        $timeStampResponse = TimeStampResponse::createFromContent($this->getTimeStampResponseTSA());
         self::assertInstanceOf(TimeStampResponse::class, $timeStampResponse);
 
         self::assertInstanceOf(SignedData::class, $timeStampResponse->getSignedData());