pstn-free/android_packages_apps_GmsCore
1
0
Fork 0
mirror of https://github.com/microg/android_packages_apps_GmsCore synced 2026-08-06 14:26:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix COSE decoding with x-only keys

Browse source
This commit is contained in:
sim 2026-05-09 17:51:23 +02:00 • committed by Marvin W
parent eb173c1431
commit 0b12b1c970
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
play-services-fido/core/src/main/kotlin/org/microg/gms/fido/core/protocol/CoseKey.kt
View file

@ -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) :
@ -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? {
@ -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()
)