From 272abfd15714aba122e65cb5651253bab74438b7 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sat, 4 Jun 2022 00:56:47 +0800 Subject: [PATCH] cleanup pass on spew and warnings --- apps/vault/src/ctap/ctap1.rs | 13 +++++++++++-- apps/vault/src/ctap/storage.rs | 2 +- apps/vault/src/main.rs | 4 ++-- services/usb-device-xous/src/main.rs | 8 ++------ 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/apps/vault/src/ctap/ctap1.rs b/apps/vault/src/ctap/ctap1.rs index b840ba709..96bf736ea 100644 --- a/apps/vault/src/ctap/ctap1.rs +++ b/apps/vault/src/ctap/ctap1.rs @@ -196,7 +196,9 @@ impl Ctap1Command { challenge, application, } => { + log::debug!("REGISTER"); if !ctap_state.u2f_up_state.consume_up(clock_value) { + log::debug!("consume_up did not work"); return Err(Ctap1StatusCode::SW_COND_USE_NOT_SATISFIED); } Ctap1Command::process_register(challenge, application, ctap_state) @@ -208,6 +210,7 @@ impl Ctap1Command { key_handle, flags, } => { + log::debug!("AUTHENTICATE"); // The order is important due to side effects of checking user presence. if flags == Ctap1Flags::EnforceUpAndSign && !ctap_state.u2f_up_state.consume_up(clock_value) @@ -224,10 +227,16 @@ impl Ctap1Command { } // U2F raw message format specification (version 20170411) section 6.3 - U2fCommand::Version => Ok(Vec::::from(super::U2F_VERSION_STRING)), + U2fCommand::Version => { + log::debug!("VERSION"); + Ok(Vec::::from(super::U2F_VERSION_STRING)) + }, // TODO: should we return an error instead such as SW_INS_NOT_SUPPORTED? - U2fCommand::VendorSpecific { .. } => Err(Ctap1StatusCode::SW_SUCCESS), + U2fCommand::VendorSpecific { .. } => { + log::debug!("VENDOR"); + Err(Ctap1StatusCode::SW_SUCCESS) + }, } } diff --git a/apps/vault/src/ctap/storage.rs b/apps/vault/src/ctap/storage.rs index f4c31c6ac..6ad57fa31 100644 --- a/apps/vault/src/ctap/storage.rs +++ b/apps/vault/src/ctap/storage.rs @@ -31,7 +31,7 @@ use arrayref::array_ref; use cbor::cbor_array_vec; use core::convert::TryInto; use ctap_crypto::rng256::Rng256; -use pddb::{Pddb, PddbRequestCode}; +use pddb::Pddb; use rand_core::{OsRng, RngCore}; use std::cell::RefCell; diff --git a/apps/vault/src/main.rs b/apps/vault/src/main.rs index faa6e89a8..a6bfd0ad0 100644 --- a/apps/vault/src/main.rs +++ b/apps/vault/src/main.rs @@ -95,13 +95,13 @@ fn main() -> ! { let now = ClockValue::new(tt.elapsed_ms() as i64, 1000); let reply = ctap_hid.process_hid_packet(&msg.packet, now, &mut ctap_state); // This block handles sending packets. - for mut pkt_reply in reply { + for pkt_reply in reply { let mut reply = FidoMsg::default(); reply.packet.copy_from_slice(&pkt_reply); let status = usb.u2f_send(reply); match status { Ok(()) => { - log::debug!("Sent U2F packet"); + log::trace!("Sent U2F packet"); } Err(e) => { log::error!("Error sending U2F packet: {:?}", e); diff --git a/services/usb-device-xous/src/main.rs b/services/usb-device-xous/src/main.rs index b6274dd20..9f4a2496c 100644 --- a/services/usb-device-xous/src/main.rs +++ b/services/usb-device-xous/src/main.rs @@ -211,11 +211,7 @@ fn main() -> ! { buf.code = U2fCode::RxAck; response.replace(buf).unwrap(); } else { - { - let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; - let u2f_ipc = buffer.to_original::().unwrap(); - log::trace!("registering deferred listener"); - } + log::trace!("registering deferred listener"); fido_listener = Some(msg); } } else { @@ -274,7 +270,7 @@ fn main() -> ! { buf.code = U2fCode::RxAck; response.replace(buf).unwrap(); } else { - log::warn!("Got U2F packet, but no server to respond...queuing."); + log::debug!("Got U2F packet, but no server to respond...queuing."); fido_rx_queue.push_back(u2f_report.packet); } },