From b9980aa67b1ad66f058a401063edda0ea931d18b Mon Sep 17 00:00:00 2001
From: Guillume DIDIER <guillaume.didier@inria.fr>
Date: Thu, 10 Jun 2021 11:22:21 +0200
Subject: [PATCH] Rust nightly update - FF & FR

---
 flush_flush/Cargo.toml  | 2 +-
 flush_flush/src/lib.rs  | 3 +++
 flush_reload/Cargo.toml | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/flush_flush/Cargo.toml b/flush_flush/Cargo.toml
index ad97387..21cb14b 100644
--- a/flush_flush/Cargo.toml
+++ b/flush_flush/Cargo.toml
@@ -9,6 +9,6 @@ edition = "2018"
 [dependencies]
 cache_utils = { path = "../cache_utils" }
 cache_side_channel = { path = "../cache_side_channel" }
-nix = "0.18.0"
+nix = "0.20.0"
 covert_channels_evaluation = {path = "../covert_channels_evaluation"}
 basic_timing_cache_channel = { path = "../basic_timing_cache_channel" }
diff --git a/flush_flush/src/lib.rs b/flush_flush/src/lib.rs
index 61d1d96..98f749f 100644
--- a/flush_flush/src/lib.rs
+++ b/flush_flush/src/lib.rs
@@ -7,6 +7,7 @@ use basic_timing_cache_channel::{
     SingleChannel, TimingChannelPrimitives, TopologyAwareTimingChannel,
 };
 
+use cache_side_channel::MultipleAddrCacheSideChannel;
 use cache_utils::calibration::only_flush;
 
 #[derive(Debug)]
@@ -20,6 +21,8 @@ impl TimingChannelPrimitives for FFPrimitives {
 
 pub type FlushAndFlush = TopologyAwareTimingChannel<FFPrimitives>;
 
+pub type FFHandle = <FlushAndFlush as MultipleAddrCacheSideChannel>::Handle;
+
 pub type SingleFlushAndFlush = SingleChannel<FlushAndFlush>;
 
 #[cfg(test)]
diff --git a/flush_reload/Cargo.toml b/flush_reload/Cargo.toml
index 1014fba..b3e072d 100644
--- a/flush_reload/Cargo.toml
+++ b/flush_reload/Cargo.toml
@@ -10,5 +10,5 @@ edition = "2018"
 cache_utils = { path = "../cache_utils" }
 cache_side_channel = { path = "../cache_side_channel" }
 covert_channels_evaluation = {path = "../covert_channels_evaluation"}
-nix = "0.18.0"
+nix = "0.20.0"
 basic_timing_cache_channel = { path = "../basic_timing_cache_channel" }