kmwebnet/OpenSK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed dependencies

Browse Source
This commit is contained in:
mingxguo27
2020-09-22 17:41:16 +00:00
parent 6cab8aaa20
commit d0a1f707bc
5 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@@ -28,7 +28,6 @@ ram_storage = []
verbose = ["debug_ctap", "libtock_drivers/verbose_usb"] verbose = ["debug_ctap", "libtock_drivers/verbose_usb"]
with_ctap1 = ["crypto/with_ctap1"] with_ctap1 = ["crypto/with_ctap1"]
with_ctap2_1 = [] with_ctap2_1 = []
fuzzing = []
[dev-dependencies] [dev-dependencies]
elf2tab = "0.6.0" elf2tab = "0.6.0"

2
fuzz/Cargo.toml
View File

@@ -17,7 +17,7 @@ cbor = { path = "../libraries/cbor" }
[dependencies.ctap2] [dependencies.ctap2]
path = ".." path = ".."
features = ['std', 'ram_storage', 'fuzzing'] features = ['std', 'ram_storage']
# Prevent this from interfering with workspaces # Prevent this from interfering with workspaces
[workspace] [workspace]

4
reproducible/reference_elf2tab_macos-10.15.txt
View File

@@ -21,7 +21,6 @@ TBF Header:
start_process_ram: 4294967295 0xFFFFFFFF start_process_ram: 4294967295 0xFFFFFFFF
start_process_flash: 262208 0x40040 start_process_flash: 262208 0x40040
======================================== ========================================
Board: nrf52840_dongle Board: nrf52840_dongle
---------------------------------------- ----------------------------------------
@@ -45,7 +44,6 @@ TBF Header:
start_process_ram: 4294967295 0xFFFFFFFF start_process_ram: 4294967295 0xFFFFFFFF
start_process_flash: 262208 0x40040 start_process_flash: 262208 0x40040
======================================== ========================================
Board: nrf52840_dongle_dfu Board: nrf52840_dongle_dfu
---------------------------------------- ----------------------------------------
@@ -69,7 +67,6 @@ TBF Header:
start_process_ram: 4294967295 0xFFFFFFFF start_process_ram: 4294967295 0xFFFFFFFF
start_process_flash: 262208 0x40040 start_process_flash: 262208 0x40040
======================================== ========================================
Board: nrf52840_mdk_dfu Board: nrf52840_mdk_dfu
---------------------------------------- ----------------------------------------
@@ -93,4 +90,3 @@ TBF Header:
start_process_ram: 4294967295 0xFFFFFFFF start_process_ram: 4294967295 0xFFFFFFFF
start_process_flash: 262208 0x40040 start_process_flash: 262208 0x40040

1
reproducible/reference_elf2tab_ubuntu-18.04.txt
View File

@@ -18,7 +18,6 @@ TBF Header:
init_fn_offset: 73 0x49 init_fn_offset: 73 0x49
protected_size: 8 0x8 protected_size: 8 0x8
minimum_ram_size: 107428 0x1A3A4 minimum_ram_size: 107428 0x1A3A4
start_process_ram: 4294967295 0xFFFFFFFF start_process_ram: 4294967295 0xFFFFFFFF
start_process_flash: 262208 0x40040 start_process_flash: 262208 0x40040

3
src/ctap/storage.rs
View File

@@ -17,14 +17,11 @@ use crate::ctap::data_formats::{CredentialProtectionPolicy, PublicKeyCredentialS
use crate::ctap::pin_protocol_v1::PIN_AUTH_LENGTH; use crate::ctap::pin_protocol_v1::PIN_AUTH_LENGTH;
use crate::ctap::status_code::Ctap2StatusCode; use crate::ctap::status_code::Ctap2StatusCode;
use crate::ctap::{key_material, USE_BATCH_ATTESTATION}; use crate::ctap::{key_material, USE_BATCH_ATTESTATION};
#[cfg(feature = "fuzzing")]
use crate::embedded_flash::{self, StoreConfig, StoreEntry, StoreError}; use crate::embedded_flash::{self, StoreConfig, StoreEntry, StoreError};
use alloc::string::String; use alloc::string::String;
use alloc::vec::Vec; use alloc::vec::Vec;
use core::convert::TryInto; use core::convert::TryInto;
use crypto::rng256::Rng256; use crypto::rng256::Rng256;
#[cfg(not(feature = "fuzzing"))]
use ctap2::embedded_flash::{self, StoreConfig, StoreEntry, StoreError};
#[cfg(any(test, feature = "ram_storage"))] #[cfg(any(test, feature = "ram_storage"))]
type Storage = embedded_flash::BufferStorage; type Storage = embedded_flash::BufferStorage;