moving requests to template + coveralls bug

Author: Falseclock

src/Template.php

@@ -17,6 +17,7 @@
 use FG\ASN1\Exception\ParserException;
 use FG\ASN1\ExplicitlyTaggedObject;
 use FG\ASN1\Universal\BitString;
+use FG\ASN1\Universal\Boolean;
 use FG\ASN1\Universal\Integer;
 use FG\ASN1\Universal\NullObject;
 use FG\ASN1\Universal\ObjectIdentifier;
@@ -25,6 +26,27 @@
 
 class Template
 {
+    /**
+     * @param OctetString $data
+     * @param string $hashAlgorithmOID
+     * @return TimeStampRequest
+     * @throws FormatException
+     */
+    public static function TimeStampRequest(OctetString $data, string $hashAlgorithmOID = Algorithm::OID_SHA256): TimeStampRequest
+    {
+        $tspRequest = Sequence::create([Integer::create(1),Sequence::create([Sequence::create([
+                    ObjectIdentifier::create($hashAlgorithmOID),
+                    NullObject::create(),
+                ]),
+                OctetString::createFromString(Algorithm::hashValue($hashAlgorithmOID, $data->getBinaryContent()))
+            ]),
+            Integer::create(rand() << 32 | rand()),
+            Boolean::create(true),
+        ]);
+
+        return new TimeStampRequest($tspRequest);
+    }
+
     /**
      * @param Certificate $publicCertificate
      * @param Certificate $intermediateCertificate
@@ -36,45 +58,19 @@ class Template
     public static function OCSPRequest(Certificate $publicCertificate, Certificate $intermediateCertificate, string $hashAlgorithmOID = Algorithm::OID_SHA1): OCSPRequest
     {
         /** @see Maps\TBSRequest */
-        $tbsRequest = Sequence::create([
-                // потомки TBSRequest
-                # -- version
-                # -- requestorName
-                # requestList
-                Sequence::create([
-                        /** @see Request */
-                        Sequence::create([
-                                // потомки Request
-                                # reqCert
-                                /** @see CertID */
-                                Sequence::create([
-                                        // потомки  CertID
-                                        # hashAlgorithm
-                                        /** @see AlgorithmIdentifier */
-                                        Sequence::create([
-                                                // потомки AlgorithmIdentifier
-                                                # algorithm
-                                                ObjectIdentifier::create($hashAlgorithmOID),
-                                                # parameters
-                                                NullObject::create()
+        $tbsRequest = Sequence::create([Sequence::create([ Sequence::create([ Sequence::create([Sequence::create([ ObjectIdentifier::create($hashAlgorithmOID),NullObject::create()
                                             ]
                                         ),
-                                        # issuerNameHash
                                         OctetString::createFromString(self::getNameHash($hashAlgorithmOID, $intermediateCertificate)),
-                                        # issuerKeyHash
                                         OctetString::createFromString(self::getKeyHash($hashAlgorithmOID, $intermediateCertificate)),                                        # serialNumber
                                         Integer::create($publicCertificate->getSerial())
                                     ]
                                 )
-                                # singleRequestExtensions
                             ]
                         )
                     ]
                 ),
-                # requestExtensions
-                ExplicitlyTaggedObject::create(2,
-                    Sequence::create([
-                            Sequence::create([
+                ExplicitlyTaggedObject::create(2,Sequence::create([ Sequence::create([
                                     ObjectIdentifier::create(OCSPRequest::OID_OCSPNonce),
                                     OctetString::createFromString(OctetString::createFromString((string)self::generateNonce())->getBinary())
                                 ]
@@ -88,18 +84,6 @@ public static function OCSPRequest(Certificate $publicCertificate, Certificate $
         return new OCSPRequest(Sequence::create([$tbsRequest/*, $optionalSignature*/]));
     }
 
-
-    /**
-     * @param int|null $length
-     * @return string
-     * @throws Exception
-     */
-    private static function generateNonce(int $length = null): string
-    {
-        return random_bytes($length ?? OCSPRequest::OCSP_DEFAULT_NONCE_LENGTH);
-    }
-
-
     /**
      * @param string $algorithmOID
      * @param Certificate $certificate
@@ -115,6 +99,16 @@ private static function getNameHash(string $algorithmOID, Certificate $certifica
         return Algorithm::hashValue($algorithmOID, self::_getTBSCertificate($certificate)->getChildren()[5]->getBinary());
     }
 
+    /**
+     * @param Sequence $certificate
+     * @return Sequence
+     * @throws Exception
+     */
+    private static function _getTBSCertificate(Sequence $certificate): Sequence
+    {
+        return $certificate->findChildrenByType(Sequence::class)[0];
+    }
+
     /**
      * @param string $algorithmOID
      * @param Certificate $certificate
@@ -135,12 +129,12 @@ public static function getKeyHash(string $algorithmOID, Certificate $certificate
     }
 
     /**
-     * @param Sequence $certificate
-     * @return Sequence
+     * @param int|null $length
+     * @return string
      * @throws Exception
      */
-    private static function _getTBSCertificate(Sequence $certificate): Sequence
+    private static function generateNonce(int $length = null): string
     {
-        return $certificate->findChildrenByType(Sequence::class)[0];
+        return random_bytes($length ?? OCSPRequest::OCSP_DEFAULT_NONCE_LENGTH);
     }
 }

src/TimeStampRequest.php

@@ -10,17 +10,14 @@
 
 namespace Falseclock\AdvancedCMS;
 
-use Adapik\CMS\Algorithm;
 use Adapik\CMS\CMSBase;
 use Adapik\CMS\Exception\FormatException;
 use Adapik\CMS\MessageImprint;
 use Exception;
 use FG\ASN1\ASN1ObjectInterface;
 use FG\ASN1\Universal\Boolean;
 use FG\ASN1\Universal\Integer;
-use FG\ASN1\Universal\NullObject;
 use FG\ASN1\Universal\ObjectIdentifier;
-use FG\ASN1\Universal\OctetString;
 use FG\ASN1\Universal\Sequence;
 
 /**
@@ -48,34 +45,6 @@ public static function createFromContent(string $content): CMSBase
         return new self(self::makeFromContent($content, Maps\TimeStampRequest::class, Sequence::class));
     }
 
-    /**
-     * @param OctetString|ASN1ObjectInterface $data data which should be queried with TS request
-     * @param string $hashAlgorithmOID
-     * @return TimeStampRequest
-     * @throws Exception
-     */
-    public static function createSimple(OctetString $data, string $hashAlgorithmOID = Algorithm::OID_SHA256): TimeStampRequest
-    {
-        $tspRequest = Sequence::create([
-            # version
-            Integer::create(1),
-            # messageImprint
-            Sequence::create([
-                Sequence::create([
-                    ObjectIdentifier::create($hashAlgorithmOID),
-                    NullObject::create(),
-                ]),
-                OctetString::createFromString(Algorithm::hashValue($hashAlgorithmOID, $data->getBinaryContent()))
-            ]),
-            # nonce
-            Integer::create(rand() << 32 | rand()),
-            # certReq
-            Boolean::create(true),
-        ]);
-
-        return new self($tspRequest);
-    }
-
     /**
      * @return Boolean
      * @throws Exception

tests/TimeStampRequestTest.php

@@ -4,6 +4,7 @@
 namespace Falseclock\AdvancedCMS\Test;
 
 use Adapik\CMS\MessageImprint;
+use Falseclock\AdvancedCMS\Template;
 use Falseclock\AdvancedCMS\TimeStampRequest;
 use Falseclock\AdvancedCMS\TimeStampResponse;
 use FG\ASN1\Universal\Boolean;
@@ -26,7 +27,7 @@ public function testPolicy()
     function testCreate()
     {
         $binary = "123456";
-        $timeStampRequest = TimeStampRequest::createSimple(OctetString::createFromString($binary));
+        $timeStampRequest = Template::TimeStampRequest(OctetString::createFromString($binary));
 
         $timeStampRequest = TimeStampRequest::createFromContent($timeStampRequest->getBinary());