From d0a1f707bc49e516ea7fb5d1beeb81b04ee6a5ba Mon Sep 17 00:00:00 2001 From: mingxguo27 Date: Tue, 22 Sep 2020 17:41:16 +0000 Subject: [PATCH] Fixed dependencies --- Cargo.toml | 1 - fuzz/Cargo.toml | 2 +- reproducible/reference_elf2tab_macos-10.15.txt | 4 ---- reproducible/reference_elf2tab_ubuntu-18.04.txt | 1 - src/ctap/storage.rs | 3 --- 5 files changed, 1 insertion(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5978c2a..a11d0f7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,6 @@ ram_storage = [] verbose = ["debug_ctap", "libtock_drivers/verbose_usb"] with_ctap1 = ["crypto/with_ctap1"] with_ctap2_1 = [] -fuzzing = [] [dev-dependencies] elf2tab = "0.6.0" diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index f0b5abc..ce96d47 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -17,7 +17,7 @@ cbor = { path = "../libraries/cbor" } [dependencies.ctap2] path = ".." -features = ['std', 'ram_storage', 'fuzzing'] +features = ['std', 'ram_storage'] # Prevent this from interfering with workspaces [workspace] diff --git a/reproducible/reference_elf2tab_macos-10.15.txt b/reproducible/reference_elf2tab_macos-10.15.txt index 2e19872..044cd28 100644 --- a/reproducible/reference_elf2tab_macos-10.15.txt +++ b/reproducible/reference_elf2tab_macos-10.15.txt @@ -21,7 +21,6 @@ TBF Header: start_process_ram: 4294967295 0xFFFFFFFF start_process_flash: 262208 0x40040 - ======================================== Board: nrf52840_dongle ---------------------------------------- @@ -45,7 +44,6 @@ TBF Header: start_process_ram: 4294967295 0xFFFFFFFF start_process_flash: 262208 0x40040 - ======================================== Board: nrf52840_dongle_dfu ---------------------------------------- @@ -69,7 +67,6 @@ TBF Header: start_process_ram: 4294967295 0xFFFFFFFF start_process_flash: 262208 0x40040 - ======================================== Board: nrf52840_mdk_dfu ---------------------------------------- @@ -93,4 +90,3 @@ TBF Header: start_process_ram: 4294967295 0xFFFFFFFF start_process_flash: 262208 0x40040 - diff --git a/reproducible/reference_elf2tab_ubuntu-18.04.txt b/reproducible/reference_elf2tab_ubuntu-18.04.txt index 48959df..18259cf 100644 --- a/reproducible/reference_elf2tab_ubuntu-18.04.txt +++ b/reproducible/reference_elf2tab_ubuntu-18.04.txt @@ -18,7 +18,6 @@ TBF Header: init_fn_offset: 73 0x49 protected_size: 8 0x8 minimum_ram_size: 107428 0x1A3A4 - start_process_ram: 4294967295 0xFFFFFFFF start_process_flash: 262208 0x40040 diff --git a/src/ctap/storage.rs b/src/ctap/storage.rs index f316a0f..a4dcaf2 100644 --- a/src/ctap/storage.rs +++ b/src/ctap/storage.rs @@ -17,14 +17,11 @@ use crate::ctap::data_formats::{CredentialProtectionPolicy, PublicKeyCredentialS use crate::ctap::pin_protocol_v1::PIN_AUTH_LENGTH; use crate::ctap::status_code::Ctap2StatusCode; use crate::ctap::{key_material, USE_BATCH_ATTESTATION}; -#[cfg(feature = "fuzzing")] use crate::embedded_flash::{self, StoreConfig, StoreEntry, StoreError}; use alloc::string::String; use alloc::vec::Vec; use core::convert::TryInto; use crypto::rng256::Rng256; -#[cfg(not(feature = "fuzzing"))] -use ctap2::embedded_flash::{self, StoreConfig, StoreEntry, StoreError}; #[cfg(any(test, feature = "ram_storage"))] type Storage = embedded_flash::BufferStorage;