Skip to content

fix: Update EdDSA mapping to OKP in DiscoveryService #1254

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
julien-nc merged 1 commit into from
Nov 17, 2025
Merged

fix: Update EdDSA mapping to OKP in DiscoveryService #1254

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
11 changes: 6 additions & 5 deletions lib/Service/DiscoveryService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ class DiscoveryService {
'ES256' => 'EC',
'ES384' => 'EC',
'ES512' => 'EC',
'EdDSA' => 'EdDSA'
// Map EdDSA to OKP per RFC 8037 (Ed25519)
'EdDSA' => 'OKP'
];

private ICache $cache;
Expand Down Expand Up @@ -124,7 +125,7 @@ public function buildAuthorizationUrl(string $authorizationEndpoint, array $extr
* This method checks:
* - RSA keys have a modulus of at least 2048 bits.
* - EC keys use one of the allowed curves: P-256, P-384, P-521.
* - EdDSA keys use the Ed25519 curve.
* - OKP (EdDSA) keys use the Ed25519 curve.
*
* @param array $key The key data as an associative array (JWK format).
* @param string $alg The algorithm intended to be used with this key (e.g., 'RS256', 'ES256').
Expand Down Expand Up @@ -155,10 +156,10 @@ private function validateKeyStrength(array $key, string $alg): void {
}
break;

case 'EdDSA':
$curve = $key['crv'] ?? throw new \RuntimeException('EdDSA key missing crv');
case 'OKP':
$curve = $key['crv'] ?? throw new \RuntimeException('OKP key missing crv');
if ($curve !== 'Ed25519') {
throw new \RuntimeException('Unsupported EdDSA curve: ' . $curve);
throw new \RuntimeException('Unsupported OKP curve: ' . $curve);
}
break;

Expand Down
Loading