Skip to content

Commit 8c5134d

Browse files
committed
Merge branch 'v1.0'
2 parents e49105b + 00ef9b9 commit 8c5134d

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/Component/KeyManagement/X5UFactory.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ public function loadFromUrl(string $url, array $header = []): JWKSet
5858

5959
$keys = [];
6060
foreach ($data as $kid => $cert) {
61-
$cert = '-----BEGIN CERTIFICATE-----'.PHP_EOL.$cert.PHP_EOL.'-----END CERTIFICATE-----';
61+
if (false === strpos($cert, '-----BEGIN CERTIFICATE-----')) {
62+
$cert = '-----BEGIN CERTIFICATE-----'.PHP_EOL.$cert.PHP_EOL.'-----END CERTIFICATE-----';
63+
}
6264
$jwk = KeyConverter::loadKeyFromCertificate($cert);
6365
if (is_string($kid)) {
6466
$jwk['kid'] = $kid;

0 commit comments

Comments
 (0)