Bugfix: only append prefix for files, not PEM-encoded keys

simplesamlphp · Sep 3, 2024 · 1007102 · 1007102
1 parent ef11095
commit 1007102
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Key/PrivateKey.php b/src/Key/PrivateKey.php
@@ -54,8 +54,11 @@ public static function fromFile(
         #[\SensitiveParameter]
         string $passphrase = '',
     ): static {
-        if (preg_match('/^(file:\/\/)/i', $file) !== 1) {
-            $file = preg_filter('/^/', 'file://', $file);
+        if (preg_match(PEM::PEM_REGEX, $file) !== 1) {
+            // Not a PEM-encoded key. Must be a file
+            if (preg_match('/^(file:\/\/)/i', $file) !== 1) {
+                $file = preg_filter('/^/', 'file://', $file);
+            }
         }
 
         if (($key = openssl_pkey_get_private($file, $passphrase)) === false) {