diff --git a/src/lib/commands.rs b/src/lib/commands.rs index 2c2795f..e1c0c35 100644 --- a/src/lib/commands.rs +++ b/src/lib/commands.rs @@ -1,5 +1,4 @@ use cbor_smol::cbor_deserialize; -pub use ctap_types::ctap1::Error as U2fError; use heapless::Vec; use heapless_bytes::{Bytes, Bytes32}; @@ -1146,7 +1145,7 @@ where .trussed .read_dir_first(w.options.location, rp_rk_dir(rp_id_hash), None,)) .entry - .map(|entry| PathBuf::try_from(entry.path()).unwrap()); + .map(|entry| PathBuf::from(entry.path())); // following reads while let Some(path) = maybe_path { @@ -1155,7 +1154,7 @@ where maybe_path = syscall!(w.trussed.read_dir_next()) .entry - .map(|entry| PathBuf::try_from(entry.path()).unwrap()); + .map(|entry| PathBuf::from(entry.path())); } // TODO finish diff --git a/src/lib/ctap_app.rs b/src/lib/ctap_app.rs index 2d51c48..9ea4ad8 100644 --- a/src/lib/ctap_app.rs +++ b/src/lib/ctap_app.rs @@ -212,8 +212,8 @@ where PublicKeyCredentialUserEntity { id: Bytes::from_slice(&[3u8; 16]).unwrap(), icon: None, - name: Some("name".try_into().unwrap()), - display_name: Some("display".try_into().unwrap()), + name: Some("name".into()), + display_name: Some("display".into()), } }; diff --git a/src/lib/transport.rs b/src/lib/transport.rs index 5e9c47e..c1b7f22 100644 --- a/src/lib/transport.rs +++ b/src/lib/transport.rs @@ -377,7 +377,7 @@ where #[inline(never)] fn get_webcrypt_cmd(&self, keyh: &[u8]) -> Result { - let webcrypt: WebcryptRequest = keyh.try_into().map_err(|_| Error::BadFormat)?; + let webcrypt: WebcryptRequest = keyh.into(); webcrypt.try_into() } diff --git a/src/lib/types.rs b/src/lib/types.rs index f4e7e05..fca3097 100644 --- a/src/lib/types.rs +++ b/src/lib/types.rs @@ -74,6 +74,7 @@ pub enum Error { AlreadyInDatabase = 0xF7, NotFound = 0xF8, AssertFailed = 0xF9, + #[allow(clippy::enum_variant_names)] InternalError = 0xFA, MemoryFull = 0xFB, NotImplemented = 0xFC,