Skip to content
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

Fix EdDSA keys / improve YubiKey support #23

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix EdDSA keys / improve YubiKey support #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56f7513
Support string constants for elliptic curves
MarkusBauer Oct 14, 2023
303039c
Fix broken EdDSA keys from YubiKey
MarkusBauer Oct 14, 2023
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
16 changes: 16 additions & 0 deletions src/Crypto/CoseKey.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,23 @@ public function toString(): string

public static function parseCbor(ByteBuffer $buffer, int $offset = 0, int &$endOffset = null): CoseKey
{
// Fix incorrect EdDSA keys
$isIncorrectKey = $buffer->getBytes($offset, 17) == "\xa3\x01\x63\x4f\x4b\x50\x03\x27\x20\x67\x45\x64\x32\x35\x35\x31\x39";
if ($isIncorrectKey) {
$buffer = new ByteBuffer($buffer->getBytes(0, $offset) . "\xa4" . $buffer->getBytes($offset + 1, $buffer->getLength() - $offset - 1));
}
$data = CborDecoder::decodeInPlace($buffer, $offset, $endOffset);

if (!$data instanceof CborMap) {
throw new DataValidationException('Failed to decode CBOR encoded COSE key'); // TODO: change exceptions
}

// Replace textual kty's with their numeric counterparts
if ($data->get(self::COSE_KEY_PARAM_KTY) === 'OKP')
$data->set(self::COSE_KEY_PARAM_KTY, 1);
elseif ($data->get(self::COSE_KEY_PARAM_KTY) === 'EC2')
$data->set(self::COSE_KEY_PARAM_KTY, 2);

DataValidator::checkMap(
$data,
[
Expand All @@ -88,6 +99,11 @@ public static function parseCbor(ByteBuffer $buffer, int $offset = 0, int &$endO
false
);

// Fix incorrect EdDSA keys, part 2: x coordinate should be bstr, not array
if ($isIncorrectKey && $data->has(-2) && is_array($data->get(-2))) {
$data->set(-2, new ByteBuffer(implode(array_map('chr', $data->get(-2)))));
}

$keyType = $data->get(self::COSE_KEY_PARAM_KTY);
return self::createKey($keyType, $data);
}
Expand Down
10 changes: 10 additions & 0 deletions src/Crypto/OkpKey.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,16 @@ public function asDer(): string

public static function fromCborData(CborMap $data): OkpKey
{
// Translate literal curves to their numeric constant
if ($data->get(self::KTP_CRV) === 'X25519')
$data->set(self::KTP_CRV, 4);
elseif ($data->get(self::KTP_CRV) === 'X448')
$data->set(self::KTP_CRV, 5);
elseif ($data->get(self::KTP_CRV) === 'Ed25519')
$data->set(self::KTP_CRV, 6);
elseif ($data->get(self::KTP_CRV) === 'Ed448')
$data->set(self::KTP_CRV, 7);

// Note: leading zeroes in X and Y coordinates are preserved in CBOR
// See RFC8152 13.1.1. Double Coordinate Curves
DataValidator::checkMap(
Expand Down