Skip to content

Fido: Fix COSE decoding with x-only keys #3461

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

Open
p1gp1g wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −3
Open

Fido: Fix COSE decoding with x-only keys #3461

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
8 changes: 5 additions & 3 deletions play-services-fido/core/src/main/kotlin/org/microg/gms/fido/core/protocol/CoseKey.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import java.security.spec.ECPublicKeySpec
class CoseKey(
val algorithm: Algorithm,
val x: ByteArray,
val y: ByteArray,
val y: ByteArray?,
val curveId: Int
) {
constructor(algorithm: Algorithm, x: BigInteger, y: BigInteger, curveId: Int, curvePointSize: Int) :
Expand All @@ -35,7 +35,9 @@ class CoseKey(
set(ALG, algorithm.algoValue.encodeAsCbor())
set(CRV, curveId.encodeAsCbor())
set(X, x.encodeAsCbor())
set(Y, y.encodeAsCbor())
y?.let {
set(Y, y.encodeAsCbor())
}
}

fun asCryptoKey(): PublicKey? {
Expand Down Expand Up @@ -74,7 +76,7 @@ class CoseKey(
fun decodeFromCbor(obj: CBORObject): CoseKey = CoseKey(
getAlgorithm(obj.get(CoseKey.ALG).AsInt32Value()),
obj.get(CoseKey.X).GetByteString(),
obj.get(CoseKey.Y).GetByteString(),
runCatching { obj.get(CoseKey.Y).GetByteString() }.getOrNull(),
obj.get(CoseKey.CRV).AsInt32Value()
)

Expand Down