Add support for listing configs

Depends on Nitrokey/admin-app#29

Cargo.toml

@@ -17,8 +17,8 @@ version = "1.7.2"
 memory-regions = { path = "components/memory-regions" }
 
 # forked
-admin-app = { git = "https://github.com/Nitrokey/admin-app.git", tag = "v0.1.0-nitrokey.13" }
-cbor-smol = { git = "https://github.com/Nitrokey/cbor-smol.git", tag = "v0.4.0-nitrokey.4"}
+admin-app = { git = "https://github.com/Nitrokey/admin-app.git", rev = "2bcefb3dda021a7e815016bf4f0719a84af13d3f" }
+cbor-smol = { git = "https://github.com/trussed-dev/cbor-smol.git", rev = "38aca7c2f7695bd1714696fe1c04e6994a3d099d" }
 fido-authenticator = { git = "https://github.com/Nitrokey/fido-authenticator.git", tag = "v0.1.1-nitrokey.19" }
 lpc55-hal = { git = "https://github.com/Nitrokey/lpc55-hal", tag = "v0.3.0-nitrokey.2" }
 trussed = { git = "https://github.com/nitrokey/trussed.git", tag = "v0.1.0-nitrokey.21" }

components/apps/Cargo.toml

@@ -10,6 +10,7 @@ bitflags = "2"
 ctaphid-dispatch = "0.1"
 embedded-hal = "0.2.7"
 heapless = "0.7"
+heapless-bytes = "0.3"
 se05x = { version = "0.1.1", optional = true}
 serde = { version = "1.0.180", default-features = false }
 trussed = { version = "0.1", features = ["serde-extensions"] }

components/apps/src/lib.rs

@@ -19,6 +19,7 @@ use littlefs2::path;
 
 #[cfg(feature = "factory-reset")]
 use admin_app::ResetConfigResult;
+use admin_app::{ConfigField, FieldType};
 
 #[macro_use]
 extern crate delog;
@@ -82,6 +83,26 @@ impl admin_app::Config for Config {
         }
     }
 
+    fn list_available_fields(&self) -> &'static [ConfigField] {
+        &[
+            ConfigField {
+                name: "fido.disable_skip_up_timeout",
+                requires_touch_confirmation: false,
+                requires_reboot: false,
+                destructive: false,
+                ty: FieldType::Bool,
+            },
+            #[cfg(feature = "se050")]
+            ConfigField {
+                name: "opcard.use_se050_backend",
+                requires_touch_confirmation: true,
+                requires_reboot: true,
+                destructive: true,
+                ty: FieldType::Bool,
+            },
+        ]
+    }
+
     fn reset_client_id(
         &self,
         key: &str,
@@ -1104,7 +1125,7 @@ impl<R: Runner> App<R> for ProvisionerApp<R> {
 #[cfg(test)]
 mod tests {
     use super::{Config, FidoConfig, OpcardConfig};
-    use cbor_smol::{cbor_serialize_bytes, Bytes};
+    use cbor_smol::cbor_serialize_bytes;
 
     #[test]
     fn test_config_size() {
@@ -1118,7 +1139,7 @@ mod tests {
             },
             fs_version: 1,
         };
-        let data: Bytes<1024> = cbor_serialize_bytes(&config).unwrap();
+        let data: heapless_bytes::Bytes<1024> = cbor_serialize_bytes(&config).unwrap();
         // littlefs2 is most efficient with files < 1/4 of the block size.  The block sizes are 512
         // bytes for LPC55 and 256 bytes for NRF52.  As the block count is only problematic on the
         // LPC55, this could be increased to 128 if necessary.