Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 0830d301 authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Fido: Handle missing excludeList in credential creation

parent 655b61e0

play-services-fido-core/src/main/kotlin/org/microg/gms/fido/core/transport/TransportHandler.kt

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ abstract class TransportHandler(val transport: Transport, val callback: Transpor 
            options.registerOptions.rp,

            options.registerOptions.user,

            options.registerOptions.parameters,

            options.registerOptions.excludeList,

            options.registerOptions.excludeList.orEmpty(),

            extensions,

            reqOptions

        )
@@ -87,7 +87,7 @@ abstract class TransportHandler(val transport: Transport, val callback: Transpor 
            throw IllegalArgumentException("Can't use CTAP1 protocol for non ES256 requests")

        if (options.registerOptions.authenticatorSelection.requireResidentKey == true)

            throw IllegalArgumentException("Can't use CTAP1 protocol when resident key required")

        val hasCredential = options.registerOptions.excludeList.any { cred ->

        val hasCredential = options.registerOptions.excludeList.orEmpty().any { cred ->

            ctap1DeviceHasCredential(connection, clientDataHash, rpIdHash, cred) ||

                    if (appIdHash != null) {

                        ctap1DeviceHasCredential(connection, clientDataHash, appIdHash, cred)