Rust nightly update - FF & FR

This commit is contained in:
Guillume DIDIER 2021-06-10 11:22:21 +02:00
parent 451bc99fdc
commit b9980aa67b
3 changed files with 5 additions and 2 deletions

View File

@ -9,6 +9,6 @@ edition = "2018"
[dependencies] [dependencies]
cache_utils = { path = "../cache_utils" } cache_utils = { path = "../cache_utils" }
cache_side_channel = { path = "../cache_side_channel" } cache_side_channel = { path = "../cache_side_channel" }
nix = "0.18.0" nix = "0.20.0"
covert_channels_evaluation = {path = "../covert_channels_evaluation"} covert_channels_evaluation = {path = "../covert_channels_evaluation"}
basic_timing_cache_channel = { path = "../basic_timing_cache_channel" } basic_timing_cache_channel = { path = "../basic_timing_cache_channel" }

View File

@ -7,6 +7,7 @@ use basic_timing_cache_channel::{
SingleChannel, TimingChannelPrimitives, TopologyAwareTimingChannel, SingleChannel, TimingChannelPrimitives, TopologyAwareTimingChannel,
}; };
use cache_side_channel::MultipleAddrCacheSideChannel;
use cache_utils::calibration::only_flush; use cache_utils::calibration::only_flush;
#[derive(Debug)] #[derive(Debug)]
@ -20,6 +21,8 @@ impl TimingChannelPrimitives for FFPrimitives {
pub type FlushAndFlush = TopologyAwareTimingChannel<FFPrimitives>; pub type FlushAndFlush = TopologyAwareTimingChannel<FFPrimitives>;
pub type FFHandle = <FlushAndFlush as MultipleAddrCacheSideChannel>::Handle;
pub type SingleFlushAndFlush = SingleChannel<FlushAndFlush>; pub type SingleFlushAndFlush = SingleChannel<FlushAndFlush>;
#[cfg(test)] #[cfg(test)]

View File

@ -10,5 +10,5 @@ edition = "2018"
cache_utils = { path = "../cache_utils" } cache_utils = { path = "../cache_utils" }
cache_side_channel = { path = "../cache_side_channel" } cache_side_channel = { path = "../cache_side_channel" }
covert_channels_evaluation = {path = "../covert_channels_evaluation"} covert_channels_evaluation = {path = "../covert_channels_evaluation"}
nix = "0.18.0" nix = "0.20.0"
basic_timing_cache_channel = { path = "../basic_timing_cache_channel" } basic_timing_cache_channel = { path = "../basic_timing_cache_channel" }