Skip to content

Bugs/okp key creation #399

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
Aug 24, 2022
Merged

Bugs/okp key creation #399

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: 3 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 @@ -106,23 +106,23 @@ public static function createOKPKey(string $curve, array $values = []): JWK
switch ($curve) {
case 'X25519':
$keyPair = sodium_crypto_box_keypair();
$secret = $keyPair;
$d = sodium_crypto_box_secretkey($keyPair);
$x = sodium_crypto_box_publickey($keyPair);

break;

case 'Ed25519':
$keyPair = sodium_crypto_sign_keypair();
$secret = sodium_crypto_sign_secretkey($keyPair);
$secretLength = mb_strlen($secret, '8bit');
$d = mb_substr($secret, 0, -$secretLength / 2, '8bit');
$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,
Expand Down
4 changes: 3 additions & 1 deletion src/EncryptionAlgorithm/KeyEncryption/ECDHES/AbstractECDH.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,9 @@ private function createOKPKey(string $curve): JWK

case 'Ed25519':
$keyPair = sodium_crypto_sign_keypair();
$d = sodium_crypto_sign_secretkey($keyPair);
$secret = sodium_crypto_sign_secretkey($keyPair);
$secretLength = mb_strlen($secret, '8bit');
$d = mb_substr($secret, 0, -$secretLength / 2, '8bit');
$x = sodium_crypto_sign_publickey($keyPair);

break;
Expand Down
72 changes: 71 additions & 1 deletion tests/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHESKeyAgreementTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ final class ECDHESKeyAgreementTest extends TestCase
*
* @test
*/
public function getAgreementKey(): void
public function getAgreementKeyWithEllipticCurveKey(): void
{
$receiver = new JWK([
'kty' => 'EC',
Expand All @@ -51,6 +51,76 @@ public function getAgreementKey(): void
static::assertArrayHasKey('y', $additional_header_values['epk']);
}

/**
* @see https://tools.ietf.org/html/rfc7518#appendix-C
*
* @test
*/
public function getAgreementKeyWithA128KeyWrapAndWithOctetKeyPairKey(): void
{
$header = [
'enc' => 'A128GCM',
];

$private = new JWK([
'kty' => 'OKP',
'crv' => 'X25519',
'd' => 'uns2Byv3po_cjjG8XRCtU-lEOrOgLbsDr5cXHmgjVvA',
'x' => 'k8IkMMO9I0foCYqEcbfM49DjEoWpHdho_GKNMXk1rFw',
]);
$public = $private->toPublic();

$cek = [
4,
211,
31,
197,
84,
157,
252,
254,
11,
100,
157,
250,
63,
170,
106,
206,
107,
124,
212,
45,
111,
107,
9,
219,
200,
177,
0,
240,
143,
156,
44,
207,
];
foreach ($cek as $key => $value) {
$cek[$key] = str_pad(dechex($value), 2, '0', STR_PAD_LEFT);
}
$cek = hex2bin(implode('', $cek));

$ecdh_es = new ECDHESA128KW();
$encrypted_cek = $ecdh_es->wrapAgreementKey($public, null, $cek, 128, $header, $header);
static::assertArrayHasKey('epk', $header);
static::assertArrayHasKey('crv', $header['epk']);
static::assertArrayHasKey('kty', $header['epk']);
static::assertArrayHasKey('x', $header['epk']);
static::assertArrayNotHasKey('y', $header['epk']);
static::assertSame('X25519', $header['epk']['crv']);
static::assertSame('OKP', $header['epk']['kty']);
static::assertSame($cek, $ecdh_es->unwrapAgreementKey($private, null, $encrypted_cek, 128, $header));
}

/**
* @test
*/
Expand Down
76 changes: 76 additions & 0 deletions tests/EncryptionAlgorithm/KeyEncryption/ECDHSS/ECDHSSKeyAgreementTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,82 @@ public function getAgreementKey(): void
static::assertArrayNotHasKey('epk', $additional_header_values);
}

/**
* @test
*/
public function getAgreementKeyWithA128KeyWrapAndOctetKeyPairKey(): void
{
$additional_header_values = [
'enc' => 'A128GCM',
];
$sender = new JWK([
'kty' => 'OKP',
'crv' => 'X25519',
'd' => 'uns2Byv3po_cjjG8XRCtU-lEOrOgLbsDr5cXHmgjVvA',
'x' => 'k8IkMMO9I0foCYqEcbfM49DjEoWpHdho_GKNMXk1rFw',
]);
$receiver = new JWK([
'kty' => 'EC',
'crv' => 'X25519',
'd' => 'tzF6dJQtUYj2G60lzzw70A8BGeE_KDDofUdwwm9qIEU',
'x' => 'q9mRLLKfK-_SosZoBFs5LaDxSB9KaqbRaenvzy1_lAA',
]);

$cek = [
4,
211,
31,
197,
84,
157,
252,
254,
11,
100,
157,
250,
63,
170,
106,
206,
107,
124,
212,
45,
111,
107,
9,
219,
200,
177,
0,
240,
143,
156,
44,
207,
];
foreach ($cek as $key => $value) {
$cek[$key] = str_pad(dechex($value), 2, '0', STR_PAD_LEFT);
}
$cek = hex2bin(implode('', $cek));

$ecdh_ss = new ECDHSSA128KW();
$encrypted_cek = $ecdh_ss->wrapAgreementKey(
$receiver->toPublic(),
$sender,
$cek,
128,
$additional_header_values,
$additional_header_values
);
static::assertArrayNotHasKey('epk', $additional_header_values);
static::assertSame(
$cek,
$ecdh_ss->unwrapAgreementKey($sender->toPublic(), $receiver, $encrypted_cek, 128, $additional_header_values)
);
}

/**
* @test
*/
Expand Down