diff --git a/.gitignore b/.gitignore index a4f6bc5a..59dc5c0c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,6 @@ Cargo.lock # MSVC Windows builds of rustc generate these, which store debugging information *.pdb -*vscode/ \ No newline at end of file +*vscode/ + +**/.DS_Store \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index 94779f92..58e1f538 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,12 +1,6 @@ [workspace] -members = [ - "algebra", - "algebra_derive", - "fhe_core", - "lattice", - "bool", -] +members = ["algebra", "algebra_derive", "bool", "fhe_core", "lattice"] resolver = "2" diff --git a/LICENSE.TXT b/LICENSE.TXT new file mode 100644 index 00000000..f0156c53 --- /dev/null +++ b/LICENSE.TXT @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. \ No newline at end of file diff --git a/bool/src/bfhe/evaluate.rs b/bool/src/bfhe/evaluate.rs index e8ce29be..db27eaaf 100644 --- a/bool/src/bfhe/evaluate.rs +++ b/bool/src/bfhe/evaluate.rs @@ -52,7 +52,6 @@ impl EvaluationKey { pub fn bootstrap(&self, mut c: LWECiphertext, lut: Polynomial) -> LWECiphertext { let parameters = self.parameters(); let pre = parameters.process_before_blind_rotation(); - let round_method = parameters.modulus_switch_round_method(); match pre.process() { ProcessType::ModulusSwitch => { @@ -60,7 +59,6 @@ impl EvaluationKey { &mut c, parameters.lwe_cipher_modulus_value(), pre.twice_ring_dimension_value(), - round_method, ); } ProcessType::Scale { ratio } => { @@ -80,8 +78,7 @@ impl EvaluationKey { match parameters.steps() { Steps::BrMsKs => { let acc = acc.extract_lwe_locally(); - let cipher = - lwe_modulus_switch(acc, parameters.lwe_cipher_modulus_value(), round_method); + let cipher = lwe_modulus_switch(acc, parameters.lwe_cipher_modulus_value()); let ksk = match self.key_switching_key { KeySwitchingKeyEnum::LWE(ref ksk) => ksk, @@ -101,19 +98,13 @@ impl EvaluationKey { lwe_modulus_switch_inplace( key_switched, parameters.lwe_cipher_modulus_value(), - round_method, &mut c, ); } Steps::BrMs => { let lwe = acc.extract_lwe_locally(); - lwe_modulus_switch_inplace( - lwe, - parameters.lwe_cipher_modulus_value(), - round_method, - &mut c, - ); + lwe_modulus_switch_inplace(lwe, parameters.lwe_cipher_modulus_value(), &mut c); } } diff --git a/bool/src/bfhe/parameters.rs b/bool/src/bfhe/parameters.rs index 29dd9c1a..8db4fac4 100644 --- a/bool/src/bfhe/parameters.rs +++ b/bool/src/bfhe/parameters.rs @@ -1,7 +1,7 @@ use algebra::Field; use fhe_core::{ - BlindRotationType, ConstParameters, DefaultFieldU32, LWESecretKeyType, - ModulusSwitchRoundMethod, Parameters, RingSecretKeyType, Steps, + BlindRotationType, ConstParameters, DefaultFieldU32, LWESecretKeyType, Parameters, + RingSecretKeyType, Steps, }; use once_cell::sync::Lazy; @@ -22,7 +22,6 @@ pub static DEFAULT_TERNARY_128_BITS_PARAMETERS: Lazy`, returns a `LWE` with desired modulus `modulus_after`. pub fn lwe_modulus_switch( c: LWE, modulus_after: C, - round_method: ModulusSwitchRoundMethod, + // round_method: ModulusSwitchRoundMethod, ) -> LWECiphertext { let modulus_before_f64: f64 = F::MODULUS_VALUE.as_into(); let modulus_after_f64: f64 = modulus_after.as_into(); @@ -33,25 +22,11 @@ pub fn lwe_modulus_switch( } }; - let switch: Box C> = match round_method { - ModulusSwitchRoundMethod::Round => Box::new(|v: F| { - reduce(C::as_from( - (AsInto::::as_into(v.value()) * modulus_after_f64 / modulus_before_f64) - .round(), - )) - }), - ModulusSwitchRoundMethod::Floor => Box::new(|v: F| { - reduce(C::as_from( - (AsInto::::as_into(v.value()) * modulus_after_f64 / modulus_before_f64) - .floor(), - )) - }), - ModulusSwitchRoundMethod::Ceil => Box::new(|v: F| { - reduce(C::as_from( - (AsInto::::as_into(v.value()) * modulus_after_f64 / modulus_before_f64).ceil(), - )) - }), - }; + let switch = Box::new(|v: F| { + reduce(C::as_from( + (AsInto::::as_into(v.value()) * modulus_after_f64 / modulus_before_f64).round(), + )) + }); let a: Vec = c.a().iter().copied().map(&switch).collect(); let b = switch(c.b()); @@ -66,7 +41,6 @@ pub fn lwe_modulus_switch( pub fn lwe_modulus_switch_inplace( c: LWE, modulus_after: C, - round_method: ModulusSwitchRoundMethod, destination: &mut LWECiphertext, ) { let modulus_before_f64: f64 = F::MODULUS_VALUE.as_into(); @@ -80,25 +54,11 @@ pub fn lwe_modulus_switch_inplace( } }; - let switch: Box C> = match round_method { - ModulusSwitchRoundMethod::Round => Box::new(|v: F| { - reduce(C::as_from( - (AsInto::::as_into(v.value()) * modulus_after_f64 / modulus_before_f64) - .round(), - )) - }), - ModulusSwitchRoundMethod::Floor => Box::new(|v: F| { - reduce(C::as_from( - (AsInto::::as_into(v.value()) * modulus_after_f64 / modulus_before_f64) - .floor(), - )) - }), - ModulusSwitchRoundMethod::Ceil => Box::new(|v: F| { - reduce(C::as_from( - (AsInto::::as_into(v.value()) * modulus_after_f64 / modulus_before_f64).ceil(), - )) - }), - }; + let switch = Box::new(|v: F| { + reduce(C::as_from( + (AsInto::::as_into(v.value()) * modulus_after_f64 / modulus_before_f64).round(), + )) + }); destination .a_mut() @@ -117,7 +77,6 @@ pub fn lwe_modulus_switch_assign_between_modulus( c: &mut LWE, modulus_before: C, modulus_after: C, - round_method: ModulusSwitchRoundMethod, ) { let modulus_before_f64: f64 = modulus_before.as_into(); let modulus_after_f64: f64 = modulus_after.as_into(); @@ -130,23 +89,11 @@ pub fn lwe_modulus_switch_assign_between_modulus( } }; - let switch: Box C> = match round_method { - ModulusSwitchRoundMethod::Round => Box::new(|v: C| { - reduce(C::as_from( - (AsInto::::as_into(v) * modulus_after_f64 / modulus_before_f64).round(), - )) - }), - ModulusSwitchRoundMethod::Floor => Box::new(|v: C| { - reduce(C::as_from( - (AsInto::::as_into(v) * modulus_after_f64 / modulus_before_f64).floor(), - )) - }), - ModulusSwitchRoundMethod::Ceil => Box::new(|v: C| { - reduce(C::as_from( - (AsInto::::as_into(v) * modulus_after_f64 / modulus_before_f64).ceil(), - )) - }), - }; + let switch = Box::new(|v: C| { + reduce(C::as_from( + (AsInto::::as_into(v) * modulus_after_f64 / modulus_before_f64).round(), + )) + }); c.a_mut().iter_mut().for_each(|v| *v = switch(*v)); *c.b_mut() = switch(c.b()); diff --git a/fhe_core/src/parameter.rs b/fhe_core/src/parameter.rs index efbbeba4..f4d52e24 100644 --- a/fhe_core/src/parameter.rs +++ b/fhe_core/src/parameter.rs @@ -3,9 +3,7 @@ use algebra::{ }; use lattice::DiscreteGaussian; -use crate::{ - FHECoreError, LWEModulusType, LWESecretKeyType, ModulusSwitchRoundMethod, RingSecretKeyType, -}; +use crate::{FHECoreError, LWEModulusType, LWESecretKeyType, RingSecretKeyType}; /// The steps of whole bootstrapping. /// @@ -124,13 +122,6 @@ pub struct KeySwitchingParameters { pub noise_standard_deviation: f64, } -/// Parameters for modulus switching. -#[derive(Debug, Clone, Copy)] -pub struct ModulusSwitchParameters { - /// Modulus Switch round method. - pub round_method: ModulusSwitchRoundMethod, -} - /// Parameters for the fully homomorphic encryption scheme. #[derive(Debug, Clone, Copy)] #[allow(non_snake_case)] @@ -138,7 +129,6 @@ pub struct Parameters { lwe_params: LWEParameters, blind_rotation_params: BlindRotationParameters, key_switching_params: KeySwitchingParameters, - modulus_switch_params: ModulusSwitchParameters, process_before_blind_rotation: ProcessBeforeBlindRotation, steps: Steps, } @@ -181,9 +171,6 @@ pub struct ConstParameters { pub key_switching_basis_bits: u32, /// The noise error's standard deviation for key switching **rlwe** or **lwe**. pub key_switching_standard_deviation: f64, - - /// Modulus Switch round method. - pub modulus_switching_round_method: ModulusSwitchRoundMethod, } impl Parameters { @@ -323,15 +310,10 @@ impl Parameters { noise_standard_deviation: params.key_switching_standard_deviation, }; - let modulus_switch_params = ModulusSwitchParameters { - round_method: params.modulus_switching_round_method, - }; - Ok(Self { lwe_params, blind_rotation_params, key_switching_params, - modulus_switch_params, process_before_blind_rotation, steps, }) @@ -464,12 +446,6 @@ impl Parameters { self.steps } - /// Returns the modulus switch round method of this [`Parameters`]. - #[inline] - pub fn modulus_switch_round_method(&self) -> ModulusSwitchRoundMethod { - self.modulus_switch_params.round_method - } - /// Returns the LWE parameters of this [`Parameters`]. #[inline] pub fn lwe_params(&self) -> LWEParameters {