Skip to content

Prefix filenames with file:// if necessary, or openssl will fail #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 1, 2024
Merged

Prefix filenames with file:// if necessary, or openssl will fail #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/Key/PrivateKey.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

use function openssl_pkey_export;
use function openssl_pkey_get_private;
use function preg_filter;
use function preg_match;

/**
* A class modeling private keys for their use in asymmetric algorithms.
Expand Down Expand Up @@ -52,6 +54,10 @@ public static function fromFile(
#[\SensitiveParameter]
string $passphrase = '',
): static {
if (preg_match('/^(file:\/\/)/i', $file) !== 1) {
$file = preg_filter('/^/', 'file://', $file);
}

if (($key = openssl_pkey_get_private($file, $passphrase)) === false) {
throw new OpenSSLException('Failed to read key');
}
Expand Down
11 changes: 11 additions & 0 deletions tests/Key/PrivateKeyTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,15 @@ public function testFromFile(): void
$keyDetails = openssl_pkey_get_details(openssl_pkey_get_private($k->getMaterial()));
$this->assertEquals(self::$privKey['key'], $keyDetails['key']);
}


/**
* Test creation from a file without file:// prefix succeeds.
*/
public function testFromFileNoPrefix(): void
{
$k = PrivateKey::fromFile('./resources/keys/privkey.pem');
$keyDetails = openssl_pkey_get_details(openssl_pkey_get_private($k->getMaterial()));
$this->assertEquals(self::$privKey['key'], $keyDetails['key']);
}
}