Fix malformed OCSP request:

- Remove empty arrays from request
- Array will be created when value is added to it
- Always having an empty array leads to additional nodes in request that are considered malformed

Signed-off-by: Kai Hölscher [email protected]
Co-authored-by: Mihkel Kivisild <[email protected]>

Author: Mihkel Kivisild

src/ocsp/OcspRequest.php

@@ -32,7 +32,7 @@
 
 class OcspRequest
 {
-    private array $ocspRequest = [];
+    private array $ocspRequest;
 
     public function __construct()
     {
@@ -41,8 +41,6 @@ public function __construct()
         $this->ocspRequest = [
             "tbsRequest" => [
                 "version" => "v1",
-                "requestList" => [],
-                "requestExtensions" => [],
             ],
         ];
     }
@@ -62,18 +60,16 @@ public function addNonceExtension(string $nonce): void
             "critical" => false,
             "extnValue" => ASN1::encodeDER($nonce, ['type' => ASN1::TYPE_OCTET_STRING]),
         ];
-        $this->ocspRequest["tbsRequest"][
-            "requestExtensions"
-        ][] = $nonceExtension;
+        $this->ocspRequest["tbsRequest"]["requestExtensions"][] = $nonceExtension;
     }
 
     /**
      * @copyright 2022 Petr Muzikant [email protected]
      */
-    public function getNonceExtension(): string
+    public function getNonceExtension(): ?string
     {
         // TODO: the ?? '' is here only for v1.0 API compatibility. Remove this in version 1.2 and change the return type to ?string.
-        return AsnUtil::decodeNonceExtension($this->ocspRequest["tbsRequest"]["requestExtensions"]) ?? '';
+        return AsnUtil::decodeNonceExtension($this->ocspRequest["tbsRequest"]["requestExtensions"] ?? []);
     }
 
     public function getEncodeDer(): string

tests/ocsp/OcspRequestTest.php

@@ -39,8 +39,6 @@ private function getRequest(): array
         return [
             'tbsRequest' => [
                 'version' => 'v1',
-                'requestList' => [],
-                'requestExtensions' => [],
             ],
         ];
     }