From 761c3f471a94740c4306055eb11921f6602dc045 Mon Sep 17 00:00:00 2001
From: Elias Bonnici <elias.bonnici@yubico.com>
Date: Wed, 26 Jun 2024 13:58:43 +0200
Subject: [PATCH] Add `fipsCapable` to Android and bump yubikit

---
 .../src/main/kotlin/com/yubico/authenticator/device/Info.kt  | 5 ++++-
 .../kotlin/com/yubico/authenticator/device/UnknownDevice.kt  | 3 ++-
 .../kotlin/com/yubico/authenticator/yubikit/SkyHelper.kt     | 3 ++-
 android/build.gradle                                         | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/android/app/src/main/kotlin/com/yubico/authenticator/device/Info.kt b/android/app/src/main/kotlin/com/yubico/authenticator/device/Info.kt
index c8f93683..ed76cc9d 100644
--- a/android/app/src/main/kotlin/com/yubico/authenticator/device/Info.kt
+++ b/android/app/src/main/kotlin/com/yubico/authenticator/device/Info.kt
@@ -53,6 +53,8 @@ data class Info(
     val pinComplexity: Boolean,
     @SerialName("supported_capabilities")
     val supportedCapabilities: Capabilities,
+    @SerialName("fips_capable")
+    val fipsCapable: Int,
 ) {
     constructor(name: String, isNfc: Boolean, usbPid: Int?, deviceInfo: DeviceInfo) : this(
         config = Config(deviceInfo.config),
@@ -69,6 +71,7 @@ data class Info(
         supportedCapabilities = Capabilities(
             nfc = deviceInfo.capabilitiesFor(Transport.NFC),
             usb = deviceInfo.capabilitiesFor(Transport.USB),
-        )
+        ),
+        fipsCapable = deviceInfo.fipsCapable
     )
 }
diff --git a/android/app/src/main/kotlin/com/yubico/authenticator/device/UnknownDevice.kt b/android/app/src/main/kotlin/com/yubico/authenticator/device/UnknownDevice.kt
index 52b61e2b..730e4c7c 100644
--- a/android/app/src/main/kotlin/com/yubico/authenticator/device/UnknownDevice.kt
+++ b/android/app/src/main/kotlin/com/yubico/authenticator/device/UnknownDevice.kt
@@ -21,7 +21,8 @@ val UnknownDevice = Info(
     isNfc = false,
     usbPid = null,
     pinComplexity = false,
-    supportedCapabilities = Capabilities()
+    supportedCapabilities = Capabilities(),
+    fipsCapable = 0
 )
 
 fun unknownDeviceWithCapability(transport: Transport, bit: Int = 0) : Info {
diff --git a/android/app/src/main/kotlin/com/yubico/authenticator/yubikit/SkyHelper.kt b/android/app/src/main/kotlin/com/yubico/authenticator/yubikit/SkyHelper.kt
index 05458eb5..5fe61c82 100644
--- a/android/app/src/main/kotlin/com/yubico/authenticator/yubikit/SkyHelper.kt
+++ b/android/app/src/main/kotlin/com/yubico/authenticator/yubikit/SkyHelper.kt
@@ -75,7 +75,8 @@ class SkyHelper(private val compatUtil: CompatUtil) {
             isNfc = false,
             usbPid = pid.value,
             pinComplexity = false,
-            supportedCapabilities = Capabilities(usb = 0)
+            supportedCapabilities = Capabilities(usb = 0),
+            fipsCapable = 0
         )
     }
 
diff --git a/android/build.gradle b/android/build.gradle
index 6c80715e..1c4f0536 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -9,7 +9,7 @@ allprojects {
         targetSdkVersion = 34
         compileSdkVersion = 34
 
-        yubiKitVersion = "2.5.0"
+        yubiKitVersion = "2.6.0"
         junitVersion = "4.13.2"
         mockitoVersion = "5.11.0"
     }