Add fipsCapable to Android and bump yubikit

This commit is contained in:
Elias Bonnici 2024-06-26 13:58:43 +02:00
parent 2ce8723714
commit 761c3f471a
No known key found for this signature in database
GPG Key ID: 5EAC28EA3F980CCF
4 changed files with 9 additions and 4 deletions

View File

@ -53,6 +53,8 @@ data class Info(
val pinComplexity: Boolean, val pinComplexity: Boolean,
@SerialName("supported_capabilities") @SerialName("supported_capabilities")
val supportedCapabilities: Capabilities, val supportedCapabilities: Capabilities,
@SerialName("fips_capable")
val fipsCapable: Int,
) { ) {
constructor(name: String, isNfc: Boolean, usbPid: Int?, deviceInfo: DeviceInfo) : this( constructor(name: String, isNfc: Boolean, usbPid: Int?, deviceInfo: DeviceInfo) : this(
config = Config(deviceInfo.config), config = Config(deviceInfo.config),
@ -69,6 +71,7 @@ data class Info(
supportedCapabilities = Capabilities( supportedCapabilities = Capabilities(
nfc = deviceInfo.capabilitiesFor(Transport.NFC), nfc = deviceInfo.capabilitiesFor(Transport.NFC),
usb = deviceInfo.capabilitiesFor(Transport.USB), usb = deviceInfo.capabilitiesFor(Transport.USB),
) ),
fipsCapable = deviceInfo.fipsCapable
) )
} }

View File

@ -21,7 +21,8 @@ val UnknownDevice = Info(
isNfc = false, isNfc = false,
usbPid = null, usbPid = null,
pinComplexity = false, pinComplexity = false,
supportedCapabilities = Capabilities() supportedCapabilities = Capabilities(),
fipsCapable = 0
) )
fun unknownDeviceWithCapability(transport: Transport, bit: Int = 0) : Info { fun unknownDeviceWithCapability(transport: Transport, bit: Int = 0) : Info {

View File

@ -75,7 +75,8 @@ class SkyHelper(private val compatUtil: CompatUtil) {
isNfc = false, isNfc = false,
usbPid = pid.value, usbPid = pid.value,
pinComplexity = false, pinComplexity = false,
supportedCapabilities = Capabilities(usb = 0) supportedCapabilities = Capabilities(usb = 0),
fipsCapable = 0
) )
} }

View File

@ -9,7 +9,7 @@ allprojects {
targetSdkVersion = 34 targetSdkVersion = 34
compileSdkVersion = 34 compileSdkVersion = 34
yubiKitVersion = "2.5.0" yubiKitVersion = "2.6.0"
junitVersion = "4.13.2" junitVersion = "4.13.2"
mockitoVersion = "5.11.0" mockitoVersion = "5.11.0"
} }