Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support multiple features for PS3I #10

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Support multiple features for PS3I #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5efc296
support for multiple features for company/partner
zfscgy Feb 4, 2021
be8d426
Revert "support for multiple features for company/partner"
zfscgy Feb 4, 2021
fbfcd00
support for multiple features for company/partner
zfscgy Feb 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 28 additions & 24 deletions protocol/src/cross_psi/company.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ pub struct CompanyCrossPsi {
self_intersection_indices: Arc<RwLock<Vec<usize>>>,

//TODO: WARN: this is single column only (yet)
additive_mask: Arc<RwLock<Vec<BigInt>>>,
additive_mask: Arc<RwLock<HashMap<usize, Vec<BigInt>>>>,
partner_shares: Arc<RwLock<HashMap<usize, TPayload>>>,
self_shares: Arc<RwLock<HashMap<usize, Vec<BigInt>>>>,
}
Expand Down Expand Up @@ -207,7 +207,7 @@ impl CompanyCrossPsiProtocol for CompanyCrossPsi {
}
}

fn generate_additive_shares(&self, feature_id: usize, values: TPayload) {
fn generate_additive_shares(&self, feature_index: usize, values: TPayload) {
let t = timer::Builder::new()
.label("server")
.silent(true)
Expand All @@ -227,7 +227,7 @@ impl CompanyCrossPsiProtocol for CompanyCrossPsi {

// Generate random mask
{
*self.additive_mask.clone().write().unwrap() = rand_bigints(filtered_values.len());
self.additive_mask.clone().write().unwrap().insert(feature_index, rand_bigints(filtered_values.len()));
}

if let (Ok(key), Ok(mask), Ok(mut partner_shares)) = (
Expand All @@ -237,9 +237,9 @@ impl CompanyCrossPsiProtocol for CompanyCrossPsi {
) {
let res = self
.he_cipher
.subtract_plaintext(&key, filtered_values, &mask);
.subtract_plaintext(&key, filtered_values, &mask[&feature_index]);
t.qps("masking values in the intersection", res.len());
partner_shares.insert(feature_id, res);
partner_shares.insert(feature_index, res);
} else {
panic!("Unable to add additive shares with the intersection")
}
Expand Down Expand Up @@ -336,29 +336,33 @@ impl Reveal for CompanyCrossPsi {
self.additive_mask.clone().read(),
self.self_shares.clone().write(),
) {

let mut out: Vec<Vec<u64>> = Vec::with_capacity(self.get_self_num_features() + self.get_partner_num_features());
let max_val = BigInt::one() << 64;
for feature_index in 0.. self.get_partner_num_features() + self.get_self_num_features() {
if feature_index < self.get_partner_num_features() {
let partner_shares: Vec<u64> = additive_mask[&feature_index]
.iter()
.map(|z| (Option::<u64>::from(&z.mod_floor(&max_val))).unwrap())
.collect::<Vec<u64>>();
out.push(partner_shares);
}
else {
let mut filtered_shares: Vec<BigInt> = Vec::with_capacity(indices.len());

let mut filtered_shares: Vec<BigInt> = Vec::with_capacity(indices.len());
for index in indices.iter() {
filtered_shares.push(self_shares[&(feature_index - self.get_partner_num_features())][*index]
.clone());
}

for index in indices.iter() {
filtered_shares.push((self_shares[&0][*index]).clone());
let company_shares = filtered_shares
.iter()
.map(|z| (Option::<u64>::from(&z.mod_floor(&max_val))).unwrap())
.collect::<Vec<u64>>();

out.push(company_shares);
}
}
self_shares.remove(&0);

let company_shares = filtered_shares
.iter()
.map(|z| (Option::<u64>::from(&z.mod_floor(&max_val))).unwrap())
.collect::<Vec<u64>>();

let partner_shares: Vec<u64> = additive_mask
.iter()
.map(|z| (Option::<u64>::from(&z.mod_floor(&max_val))).unwrap())
.collect::<Vec<u64>>();

let mut out: Vec<Vec<u64>> =
Vec::with_capacity(self.get_self_num_features() + self.get_partner_num_features());
out.push(partner_shares);
out.push(company_shares);
info!("revealing columns to output file");
common::files::write_u64cols_to_file(&mut out, path).unwrap();
} else {
Expand Down
57 changes: 29 additions & 28 deletions protocol/src/cross_psi/partner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ pub struct PartnerCrossPsi {
plaintext_features: Arc<RwLock<TFeatures>>,
company_permutation: Arc<RwLock<Vec<usize>>>,
self_permutation: Arc<RwLock<Vec<usize>>>,
additive_mask: Arc<RwLock<Vec<BigInt>>>,
additive_mask: Arc<RwLock<HashMap<usize, Vec<BigInt>>>>,
self_shares: Arc<RwLock<HashMap<usize, Vec<BigInt>>>>,
company_intersection_indices: Arc<RwLock<Vec<usize>>>,
}
Expand Down Expand Up @@ -215,17 +215,17 @@ impl PartnerCrossPsiProtocol for PartnerCrossPsi {
)
}

fn generate_additive_shares(&self, _: usize, values: TPayload) -> TPayload {
fn generate_additive_shares(&self, feature_index: usize, values: TPayload) -> TPayload {
{
*self.additive_mask.clone().write().unwrap() = rand_bigints(values.len());
self.additive_mask.clone().write().unwrap().insert(feature_index, rand_bigints(values.len()));
}

if let (Ok(key), Ok(mask)) = (
self.company_he_public_key.clone().read(),
self.additive_mask.clone().read(),
) {
self.he_cipher
.subtract_plaintext(key.deref(), values, &mask)
.subtract_plaintext(key.deref(), values, &mask[&feature_index])
} else {
panic!("Cannot mask with additive shares")
}
Expand All @@ -243,37 +243,38 @@ impl PartnerCrossPsiProtocol for PartnerCrossPsi {

impl Reveal for PartnerCrossPsi {
fn reveal<T: AsRef<Path>>(&self, path: T) {
if let (Ok(indices), Ok(mut self_shares), Ok(mut additive_mask)) = (
if let (Ok(indices), Ok(self_shares), Ok(additive_mask)) = (
self.company_intersection_indices.clone().read(),
self.self_shares.clone().write(),
self.additive_mask.clone().write(),
) {
let output_mod = BigInt::one() << 64;
let n = BigInt::one() << 1024;

let mut filtered_shares: Vec<BigInt> = Vec::with_capacity(indices.len());

for index in indices.iter() {
filtered_shares.push(additive_mask[*index].clone());
}
additive_mask.clear();

let company_shares = filtered_shares
.iter()
.map(|e| (Option::<u64>::from(&mod_sub(e, &n, &output_mod))).unwrap())
.collect::<Vec<u64>>();

let partner_shares = self_shares
.remove(&0)
.unwrap()
.iter()
.map(|e| (Option::<u64>::from(&mod_sub(e, &n, &output_mod))).unwrap())
.collect::<Vec<u64>>();

let mut out: Vec<Vec<u64>> =
Vec::with_capacity(self.get_self_num_features() + self.get_company_num_features());
out.push(partner_shares);
out.push(company_shares);
Vec::with_capacity(self.get_self_num_features() + self.get_company_num_features());

for feature_index in 0..self.get_self_num_features() + self.get_company_num_features() {

if feature_index < self.get_self_num_features() {
let partner_shares = self_shares[&feature_index]
.iter()
.map(|e| (Option::<u64>::from(&mod_sub(e, &n, &output_mod))).unwrap())
.collect::<Vec<u64>>();
out.push(partner_shares);
}
else {
let mut filtered_shares: Vec<BigInt> = Vec::with_capacity(indices.len());
for index in indices.iter() {
filtered_shares.push(additive_mask[&(feature_index - self.get_self_num_features())][*index]
.clone());
};
let company_shares = filtered_shares
.iter()
.map(|e| (Option::<u64>::from(&mod_sub(e, &n, &output_mod))).unwrap())
.collect::<Vec<u64>>();
out.push(company_shares);
}
}
info!("revealing columns to output file");
common::files::write_u64cols_to_file(&mut out, path).unwrap();
}
Expand Down