Skip to content

Fix EdDSA algorithm #168

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
Mar 11, 2019
Merged

Fix EdDSA algorithm #168

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
1 change: 0 additions & 1 deletion src/Component/Encryption/JWEDecrypter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ private function checkCekSize(string $cek, KeyEncryptionAlgorithm $keyEncryption
return;
}
if (mb_strlen($cek, '8bit') !== $algorithm->getCEKSize() / 8) {
var_dump(mb_strlen($cek, '8bit'), $algorithm->getCEKSize() / 8);
throw new \InvalidArgumentException('Invalid CEK size');
}
}
Expand Down
8 changes: 5 additions & 3 deletions src/Component/KeyManagement/JWKFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,27 +172,29 @@ public static function createOKPKey(string $curve, array $values = []): JWK
switch ($curve) {
case 'X25519':
$keyPair = \sodium_crypto_box_keypair();
$d = \sodium_crypto_box_secretkey($keyPair);
$secret = \sodium_crypto_box_secretkey($keyPair);
$x = \sodium_crypto_box_publickey($keyPair);

break;
case 'Ed25519':
$keyPair = \sodium_crypto_sign_keypair();
$d = \sodium_crypto_sign_secretkey($keyPair);
$secret = \sodium_crypto_sign_secretkey($keyPair);
$x = \sodium_crypto_sign_publickey($keyPair);

break;
default:
throw new \InvalidArgumentException(\sprintf('Unsupported "%s" curve', $curve));
}
$secretLength = mb_strlen($secret, '8bit');
$d = mb_substr($secret, 0, -$secretLength / 2, '8bit');

$values = \array_merge(
$values,
[
'kty' => 'OKP',
'crv' => $curve,
'x' => Base64Url::encode($x),
'd' => Base64Url::encode($d),
'x' => Base64Url::encode($x),
]
);

Expand Down
9 changes: 4 additions & 5 deletions src/SignatureAlgorithm/EdDSA/EdDSA.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ public function sign(JWK $key, string $input): string
if (!$key->has('d')) {
throw new \InvalidArgumentException('The key is not private.');
}
$secret = Base64Url::decode($key->get('d'));
$keyPair = \sodium_crypto_sign_seed_keypair($secret);
$secretKey = \sodium_crypto_sign_secretkey($keyPair);
$x = Base64Url::decode($key->get('x'));
$d = Base64Url::decode($key->get('d'));
$secret = $d.$x;

switch ($key->get('crv')) {
case 'Ed25519':
return \sodium_crypto_sign_detached($input, $secretKey);
return \sodium_crypto_sign_detached($input, $secret);
default:
throw new \InvalidArgumentException('Unsupported curve');
}
Expand All @@ -46,7 +46,6 @@ public function verify(JWK $key, string $input, string $signature): bool
$this->checkKey($key);

$public = Base64Url::decode($key->get('x'));

switch ($key->get('crv')) {
case 'Ed25519':
return \sodium_crypto_sign_verify_detached($signature, $input, $public);
Expand Down
25 changes: 5 additions & 20 deletions src/SignatureAlgorithm/EdDSA/Tests/EdDSASignatureTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@
use Jose\Component\Core\Converter\StandardConverter;
use Jose\Component\Core\JWK;
use Jose\Component\Signature\Algorithm\EdDSA;
use Jose\Component\Signature\JWS;
use Jose\Component\Signature\JWSBuilder;
use Jose\Component\Signature\JWSVerifier;
use Jose\Component\Signature\Serializer\CompactSerializer;
use PHPUnit\Framework\TestCase;

/**
Expand All @@ -31,7 +29,7 @@
class EdDSASignatureTest extends TestCase
{
/**
* @see https://tools.ietf.org/html/draft-ietf-jose-cfrg-curves-00#appendix-A.5
* @see https://tools.ietf.org/html/rfc8037#appendix-A.5
*
* @test
*/
Expand All @@ -48,13 +46,11 @@ public function edDSAVerifyAlgorithm()
$input = 'eyJhbGciOiJFZERTQSJ9.RXhhbXBsZSBvZiBFZDI1NTE5IHNpZ25pbmc';
$signature = Base64Url::decode('hgyY0il_MGCjP0JzlnLWG1PPOt7-09PGcvMg3AIbQR6dWbhijcNR4ki4iylGjg5BhVsPt9g7sVvpAr_MuM0KAg');

$result = $eddsa->verify($key, $input, $signature);

static::assertTrue($result);
static::assertTrue($eddsa->verify($key, $input, $signature));
}

/**
* @see https://tools.ietf.org/html/draft-ietf-jose-cfrg-curves-00#appendix-A.5
* @see https://tools.ietf.org/html/rfc8037#appendix-A.5
*
* @test
*/
Expand All @@ -68,7 +64,7 @@ public function edDSASignAndVerifyAlgorithm()
]);

$header = ['alg' => 'EdDSA'];
$input = Base64Url::decode('RXhhbXBsZSBvZiBFZDI1NTE5IHNpZ25pbmc');
$input = 'Example of Ed25519 signing'; // Corresponds to "RXhhbXBsZSBvZiBFZDI1NTE5IHNpZ25pbmc"

$jwsBuilder = new JWSBuilder(
new StandardConverter(),
Expand All @@ -77,22 +73,11 @@ public function edDSASignAndVerifyAlgorithm()
$jwsVerifier = new JWSVerifier(
AlgorithmManager::create([new EdDSA()])
);
$serializer = new CompactSerializer(
new StandardConverter()
);
$jws = $jwsBuilder
->create()->withPayload($input)
->addSignature($key, $header)
->build();

$jws = $serializer->serialize($jws, 0);

static::assertEquals('eyJhbGciOiJFZERTQSJ9.RXhhbXBsZSBvZiBFZDI1NTE5IHNpZ25pbmc.hgyY0il_MGCjP0JzlnLWG1PPOt7-09PGcvMg3AIbQR6dWbhijcNR4ki4iylGjg5BhVsPt9g7sVvpAr_MuM0KAg', $jws);

$loaded = $serializer->unserialize($jws);

static::assertInstanceOf(JWS::class, $loaded);
static::assertEquals(1, $loaded->countSignatures());
static::assertTrue($jwsVerifier->verifyWithKey($loaded, $key, 0));
static::assertTrue($jwsVerifier->verifyWithKey($jws, $key, 0));
}
}