CTAP library move (#602)
* Moves all CTAP logic into its own library * workflows fix test * more coveralls workflow tests
This commit is contained in:
2
src/env/tock/clock.rs
vendored
2
src/env/tock/clock.rs
vendored
@@ -12,8 +12,8 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
use crate::api::clock::Clock;
|
||||
use libtock_drivers::timer::{get_clock_frequency, get_ticks};
|
||||
use opensk::api::clock::Clock;
|
||||
|
||||
/// 56-bits timestamp (valid for 70k+ years)
|
||||
#[derive(Clone, Copy, Debug, Default, PartialOrd, Ord, PartialEq, Eq)]
|
||||
|
||||
29
src/env/tock/mod.rs
vendored
29
src/env/tock/mod.rs
vendored
@@ -13,15 +13,6 @@
|
||||
// limitations under the License.
|
||||
|
||||
pub use self::storage::{TockStorage, TockUpgradeStorage};
|
||||
use crate::api::attestation_store::AttestationStore;
|
||||
use crate::api::connection::{
|
||||
HidConnection, SendOrRecvError, SendOrRecvResult, SendOrRecvStatus, UsbEndpoint,
|
||||
};
|
||||
use crate::api::customization::{CustomizationImpl, AAGUID_LENGTH, DEFAULT_CUSTOMIZATION};
|
||||
use crate::api::firmware_protection::FirmwareProtection;
|
||||
use crate::api::user_presence::{UserPresence, UserPresenceError, UserPresenceResult};
|
||||
use crate::api::{attestation_store, key_store};
|
||||
use crate::env::Env;
|
||||
use clock::TockClock;
|
||||
use core::cell::Cell;
|
||||
use core::convert::TryFrom;
|
||||
@@ -32,6 +23,15 @@ use libtock_drivers::console::Console;
|
||||
use libtock_drivers::result::{FlexUnwrap, TockError};
|
||||
use libtock_drivers::timer::Duration;
|
||||
use libtock_drivers::{crp, led, rng, timer, usb_ctap_hid};
|
||||
use opensk::api::attestation_store::AttestationStore;
|
||||
use opensk::api::connection::{
|
||||
HidConnection, SendOrRecvError, SendOrRecvResult, SendOrRecvStatus, UsbEndpoint,
|
||||
};
|
||||
use opensk::api::customization::{CustomizationImpl, AAGUID_LENGTH, DEFAULT_CUSTOMIZATION};
|
||||
use opensk::api::firmware_protection::FirmwareProtection;
|
||||
use opensk::api::user_presence::{UserPresence, UserPresenceError, UserPresenceResult};
|
||||
use opensk::api::{attestation_store, key_store};
|
||||
use opensk::env::Env;
|
||||
use persistent_store::{StorageResult, Store};
|
||||
use rng256::Rng256;
|
||||
|
||||
@@ -348,3 +348,14 @@ pub fn switch_off_leds() {
|
||||
led::get(l).flex_unwrap().off().flex_unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
use super::*;
|
||||
use opensk::api::customization::is_valid;
|
||||
|
||||
#[test]
|
||||
fn test_invariants() {
|
||||
assert!(is_valid(&TOCK_CUSTOMIZATION));
|
||||
}
|
||||
}
|
||||
|
||||
8
src/env/tock/storage.rs
vendored
8
src/env/tock/storage.rs
vendored
@@ -12,8 +12,6 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
use crate::api::upgrade_storage::helper::{find_slice, is_aligned, ModRange, Partition};
|
||||
use crate::api::upgrade_storage::UpgradeStorage;
|
||||
use alloc::borrow::Cow;
|
||||
use alloc::vec::Vec;
|
||||
use arrayref::array_ref;
|
||||
@@ -22,6 +20,8 @@ use core::cell::Cell;
|
||||
use crypto::sha256::Sha256;
|
||||
use crypto::{ecdsa, Hash256};
|
||||
use libtock_core::{callback, syscalls};
|
||||
use opensk::api::upgrade_storage::helper::{find_slice, is_aligned, ModRange, Partition};
|
||||
use opensk::api::upgrade_storage::UpgradeStorage;
|
||||
use persistent_store::{Storage, StorageError, StorageIndex, StorageResult};
|
||||
|
||||
const DRIVER_NUMBER: usize = 0x50003;
|
||||
@@ -470,8 +470,8 @@ fn verify_signature(
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
use super::*;
|
||||
use crate::env::test::TestEnv;
|
||||
use crate::env::Env;
|
||||
use opensk::env::test::TestEnv;
|
||||
use opensk::env::Env;
|
||||
|
||||
#[test]
|
||||
fn test_check_metadata() {
|
||||
|
||||
Reference in New Issue
Block a user