Changes the persistent store code location (#765)

The code is now maintained in Wasefire. A compatble version is on
crates.io, so we rename all occurances.

This also means we don't have to fuzz it here anymore, and fix the
latest issues from OSS-Fuzz indirectly.
And we resolve the TODO around fixing clippy. It is fixed in Wasefire.

Author: kaczmarczyck

Cargo.lock

@@ -24,11 +24,11 @@ libtock_console = { path = "third_party/libtock-rs/apis/console" }
 libtock_leds = { path = "third_party/libtock-rs/apis/leds" }
 lang_items = { path = "third_party/lang-items" }
 sk-cbor = { path = "libraries/cbor" }
-persistent_store = { path = "libraries/persistent_store" }
 libtock_unittest = { path = "third_party/libtock-rs/unittest", optional = true }
 byteorder = { version = "1", default-features = false }
 arrayref = "0.3.6"
 rand_core = "0.6.4"
+wasefire-store = "=0.2.4"
 
 [dependencies.p256]
 version = "0.13.0"
@@ -38,14 +38,14 @@ features = ["ecdsa"]
 [dependencies.opensk]
 path = "libraries/opensk"
 default-features = false
-features = ["persistent_store", "software_crypto"]
+features = ["software_crypto", "wasefire-store"]
 
 [features]
 config_command = ["opensk/config_command"]
 debug_allocations = ["lang_items/debug_allocations"]
 debug_ctap = ["libtock_drivers/debug_ctap", "opensk/debug_ctap"]
 panic_console = ["lang_items/panic_console"]
-std = ["lang_items/std", "persistent_store/std", "opensk/std", "libtock_unittest"]
+std = ["lang_items/std", "wasefire-store/std", "opensk/std", "libtock_unittest"]
 verbose = ["debug_ctap", "libtock_drivers/verbose_usb"]
 with_ctap1 = ["opensk/with_ctap1"]
 with_nfc = ["libtock_drivers/with_nfc"]

Cargo.toml

@@ -24,8 +24,8 @@ use libtock_drivers::result::FlexUnwrap;
 use libtock_leds::Leds;
 use libtock_platform as platform;
 use libtock_runtime::{set_main, stack_size, TockSyscalls};
-use persistent_store::{Storage, StorageIndex};
 use platform::DefaultConfig;
+use wasefire_store::{Storage, StorageIndex};
 
 stack_size! {0x800}
 set_main! {main}

examples/erase_storage.rs

@@ -28,7 +28,7 @@ use libtock_drivers::result::FlexUnwrap;
 use libtock_drivers::timer::{self, Duration, Timer, Timestamp};
 use libtock_platform::DefaultConfig;
 use libtock_runtime::{set_main, stack_size, TockSyscalls};
-use persistent_store::{Storage as _, Store};
+use wasefire_store::{Storage as _, Store};
 
 stack_size! {0x800}
 set_main! {main}

examples/store_latency.rs

@@ -13,7 +13,6 @@ rust-version = "1.80"
 
 [dependencies]
 sk-cbor = { path = "../cbor" }
-persistent_store = { path = "../persistent_store", optional = true }
 byteorder = { version = "1", default-features = false }
 arrayref = "0.3.6"
 subtle = { version = "2.2", default-features = false, features = ["nightly"] }
@@ -27,6 +26,7 @@ hkdf = { version = "0.12.3", default-features = false, optional = true }
 aes = { version = "0.8.2", default-features = false, optional = true }
 cbc = { version = "0.1.2", default-features = false, optional = true }
 zeroize = { version = "1.5.7", features = ["derive"] }
+wasefire-store = { version = "=0.2.4", optional = true }
 
 [dependencies.p256]
 version = "0.13.0"
@@ -38,7 +38,7 @@ optional = true
 default = ["config_command", "with_ctap1"]
 config_command = []
 debug_ctap = []
-std = ["persistent_store/std", "rand?/std_rng", "config_command", "software_crypto"]
+std = ["wasefire-store/std", "rand?/std_rng", "config_command", "software_crypto"]
 with_ctap1 = []
 vendor_hid = []
 fuzz = ["arbitrary", "std"]

libraries/opensk/Cargo.lock

@@ -109,10 +109,10 @@ impl From<Ctap2StatusCode> for key_store::Error {
     }
 }
 
-#[cfg(feature = "persistent_store")]
-impl From<persistent_store::StoreError> for Ctap2StatusCode {
-    fn from(error: persistent_store::StoreError) -> Ctap2StatusCode {
-        use persistent_store::StoreError;
+#[cfg(feature = "wasefire-store")]
+impl From<wasefire_store::StoreError> for Ctap2StatusCode {
+    fn from(error: wasefire_store::StoreError) -> Ctap2StatusCode {
+        use wasefire_store::StoreError;
         match error {
             // This error is expected. The store is full.
             StoreError::NoCapacity => Ctap2StatusCode::CTAP2_ERR_KEY_STORE_FULL,

libraries/opensk/Cargo.toml

@@ -29,10 +29,10 @@ use crate::ctap::status_code::Ctap2StatusCode;
 use crate::ctap::status_code::CtapResult;
 use crate::env::Env;
 use customization::TestCustomization;
-use persistent_store::{BufferOptions, BufferStorage, Store};
 use rand::rngs::StdRng;
 use rand::SeedableRng;
 use std::sync::{Arc, Mutex};
+use wasefire_store::{BufferOptions, BufferStorage, Store};
 
 pub mod customization;