Skip to content

Commit cac434d

Browse files
committed
fix: changes after refactor
Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>
1 parent b7fca90 commit cac434d

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

lib/Handler/SignEngine/Pkcs12Handler.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,10 @@ public function getCertificateChain($resource): array {
102102
$tsa = new TSA();
103103
$decoded = ASN1::decodeBER($signature);
104104
try {
105-
$certificates[$signerCounter]['timestamp'] = $tsa->extract($decoded);
105+
$timestampData = $tsa->extract($decoded);
106+
if (!empty($timestampData['genTime']) || !empty($timestampData['policy']) || !empty($timestampData['serialNumber'])) {
107+
$certificates[$signerCounter]['timestamp'] = $timestampData;
108+
}
106109
} catch (\Throwable $e) {
107110
}
108111

lib/Service/FileService.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,9 @@ private function loadSignersFromCertData(): void {
490490
}
491491
if (!empty($signer['timestamp'])) {
492492
$this->fileData->signers[$index]['timestamp'] = $signer['timestamp'];
493-
$this->fileData->signers[$index]['timestamp']['genTime'] = $signer['timestamp']['genTime']->format(DateTimeInterface::ATOM);
493+
if ($signer['timestamp']['genTime'] instanceof \DateTimeInterface) {
494+
$this->fileData->signers[$index]['timestamp']['genTime'] = $signer['timestamp']['genTime']->format(DateTimeInterface::ATOM);
495+
}
494496
}
495497
for ($i = 1; $i < count($signer['chain']); $i++) {
496498
$this->fileData->signers[$index]['chain'][] = [

0 commit comments

Comments
 (0)