Merge pull request #71 from Nitrokey/activate-default

Set the default lifecycle to operational

Author: robin-nitrokey

examples/virtual.rs

@@ -25,18 +25,11 @@
 
 // TODO: add CLI
 
-use hex_literal::hex;
-
 fn main() {
     env_logger::init();
 
     trussed::virt::with_ram_client("opcard", |client| {
-        let mut card = opcard::Card::new(client, opcard::Options::default());
-        card.handle(
-            &iso7816::Command::<10>::try_from(&hex!("00 44 00 00")).unwrap(),
-            &mut heapless::Vec::<u8, 2>::new(),
-        )
-        .unwrap();
+        let card = opcard::Card::new(client, opcard::Options::default());
         let mut virtual_card = opcard::VirtualCard::new(card);
         let vpicc = vpicc::connect().expect("failed to connect to vpicc");
         vpicc

src/command/data.rs

@@ -1232,7 +1232,7 @@ mod tests {
             };
 
             let mut historical_bytes = options.historical_bytes.clone();
-            historical_bytes[7] = 3;
+            historical_bytes[7] = 5;
 
             get_data(
                 context,

src/state.rs

@@ -197,23 +197,12 @@ impl State {
     }
     pub fn lifecycle(client: &mut impl trussed::Client) -> LifeCycle {
         match try_syscall!(client.entry_metadata(Location::Internal, Self::lifecycle_path())) {
-            Ok(Metadata {
-                metadata: Some(metadata),
-            }) if metadata.is_file() => LifeCycle::Operational,
-            _ => LifeCycle::Initialization,
+            Ok(Metadata { metadata: Some(_) }) => LifeCycle::Initialization,
+            _ => LifeCycle::Operational,
         }
     }
 
     pub fn terminate_df(client: &mut impl trussed::Client) -> Result<(), Status> {
-        try_syscall!(client.remove_file(Location::Internal, Self::lifecycle_path(),))
-            .map(|_| {})
-            .map_err(|_err| {
-                error!("Failed to write lifecycle: {_err:?}");
-                Status::UnspecifiedPersistentExecutionError
-            })
-    }
-
-    pub fn activate_file(client: &mut impl trussed::Client) -> Result<(), Status> {
         try_syscall!(client.write_file(
             Location::Internal,
             Self::lifecycle_path(),
@@ -226,6 +215,13 @@ impl State {
             Status::UnspecifiedPersistentExecutionError
         })
     }
+
+    pub fn activate_file(client: &mut impl trussed::Client) -> Result<(), Status> {
+        try_syscall!(client.remove_file(Location::Internal, Self::lifecycle_path(),)).ok();
+        // Errors can happen because of the removal of all files before the call to activate_file
+        // so they are silenced
+        Ok(())
+    }
 }
 
 #[derive(Debug, Eq, PartialEq)]

tests/card/mod.rs

@@ -4,7 +4,6 @@
 
 use std::sync::{Arc, Mutex};
 
-use hex_literal::hex;
 use iso7816::{command::FromSliceError, Command, Status};
 use opcard::Options;
 use openpgp_card::{
@@ -115,7 +114,7 @@ impl<T: trussed::Client + Send + Sync + 'static> CardTransaction for Transaction
 
 pub fn with_card_options<F: FnOnce(Card<Client<Ram>>) -> R, R>(options: Options, f: F) -> R {
     trussed::virt::with_ram_client("opcard", |client| {
-        with_activated_card(opcard::Card::new(client, options), f)
+        f(Card::from_opcard(opcard::Card::new(client, options)))
     })
 }
 
@@ -140,13 +139,3 @@ pub fn error_to_retries(err: Result<(), openpgp_card::Error>) -> Option<u8> {
         Err(e) => panic!("Unexpected error {e}"),
     }
 }
-
-fn with_activated_card<F: FnOnce(Card<Client<Ram>>) -> R, R>(
-    mut card: opcard::Card<Client<Ram>>,
-    f: F,
-) -> R {
-    let command: iso7816::Command<4> = iso7816::Command::try_from(&hex!("00 44 0000")).unwrap();
-    let mut rep: heapless::Vec<u8, 0> = heapless::Vec::new();
-    card.handle(&command, &mut rep).unwrap();
-    f(Card::from_opcard(card))
-}

tests/virt/mod.rs

@@ -12,7 +12,6 @@ use std::{
     time::Duration,
 };
 
-use hex_literal::hex;
 use regex::{Regex, RegexSet};
 use stoppable_thread::spawn;
 
@@ -38,11 +37,7 @@ pub fn with_vsc<F: FnOnce() -> R, R>(f: F) -> R {
     let (tx, rx) = mpsc::channel();
     let handle = spawn(move |stopped| {
         trussed::virt::with_ram_client("opcard", |client| {
-            let mut card = opcard::Card::new(client, opcard::Options::default());
-            let command: iso7816::Command<4> =
-                iso7816::Command::try_from(&hex!("00 44 0000")).unwrap();
-            let mut rep: heapless::Vec<u8, 0> = heapless::Vec::new();
-            card.handle(&command, &mut rep).unwrap();
+            let card = opcard::Card::new(client, opcard::Options::default());
             let mut virtual_card = opcard::VirtualCard::new(card);
             let mut result = Ok(());
             while !stopped.get() && result.is_ok() {