fix: prevent issues

Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>

Author: vitormattos

lib/Handler/CertificateEngine/OrderCertificatesTrait.php

@@ -46,8 +46,10 @@ private function buildChain(array $certificates): array {
 
 	private function ensureValidStructure(array $certificates): void {
 		foreach ($certificates as $cert) {
-			if (!is_array($cert) || !isset($cert['subject'], $cert['issuer'], $cert['name'])
-				|| !is_array($cert['subject']) || !is_array($cert['issuer'])) {
+			if (!is_array($cert) || !isset($cert['subject'], $cert['issuer'], $cert['name'])) {
+				throw new InvalidArgumentException('Invalid certificate structure. Certificate must have "subject", "issuer", and "name".');
+			}
+			if (!is_array($cert['subject']) || !is_array($cert['issuer'])) {
 				throw new InvalidArgumentException('Invalid certificate structure. Certificate must have "subject", "issuer", and "name".');
 			}
 		}

lib/Handler/SignEngine/Pkcs12Handler.php

@@ -164,7 +164,8 @@ private function enrichLeafWithPopplerData(array &$result, array $fromFallback):
 			}
 		}
 
-		if (isset($popplerData['signature_validation'])) {
+		if (isset($popplerData['signature_validation']) &&
+			(!isset($leafCert['signature_validation']) || $leafCert['signature_validation']['id'] !== 1)) {
 			$leafCert['signature_validation'] = $popplerData['signature_validation'];
 		}
 	}