Merge pull request #29 from jellevos/todos

Fix open TODOs in code

scicrypt-he/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "scicrypt-he"
 description = "A scicrypt crate implementing several well-known partially homomorphic (threshold) cryptosystems"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Jelle Vos <[email protected]>"]
 edition = "2018"
 license = "MIT"
@@ -13,8 +13,8 @@ readme = "README.md"
 bench = false  # Disable default bench (we use criterion)
 
 [dependencies]
-scicrypt-traits = { version = "0.5.0", path = "../scicrypt-traits" }
-scicrypt-numbertheory = { version = "0.5.0", path = "../scicrypt-numbertheory" }
+scicrypt-traits = { version = "0.6.0", path = "../scicrypt-traits" }
+scicrypt-numbertheory = { version = "0.6.0", path = "../scicrypt-numbertheory" }
 curve25519-dalek = "4.0.0-pre.2"
 rug = "1.13"
 rand_core = "0.6"

scicrypt-he/src/cryptosystems/curve_el_gamal.rs

@@ -136,7 +136,6 @@ impl EncryptionKey for PrecomputedCurveElGamalPK {
     }
 }
 
-// TODO: These double definitions can be made into one generic if associated ciphertexts have a trait
 impl DecryptionKey<CurveElGamalPK> for CurveElGamalSK {
     fn decrypt_raw(
         &self,

scicrypt-he/src/cryptosystems/paillier.rs

@@ -30,7 +30,7 @@ pub struct PaillierSK {
 
 /// Ciphertext of the Paillier cryptosystem, which is additively homomorphic.
 pub struct PaillierCiphertext {
-    c: Integer,
+    pub(crate) c: Integer,
 }
 
 impl Associable<PaillierPK> for PaillierCiphertext {}

scicrypt-he/src/threshold_cryptosystems/paillier.rs

@@ -10,6 +10,8 @@ use scicrypt_traits::threshold_cryptosystems::{
 use scicrypt_traits::DecryptionError;
 use std::ops::Rem;
 
+use crate::cryptosystems::paillier::PaillierCiphertext;
+
 /// Threshold Paillier cryptosystem: Extension of Paillier that requires t out of n parties to
 /// successfully decrypt.
 #[derive(Copy, Clone)]
@@ -32,13 +34,6 @@ pub struct ThresholdPaillierSK {
     key: Integer,
 }
 
-/// A randomized ciphertext created using the public key.
-pub struct ThresholdPaillierCiphertext {
-    c: Integer,
-}
-
-impl Associable<ThresholdPaillierPK> for ThresholdPaillierCiphertext {}
-
 /// A partially decrypted ciphertext, of which t must be combined to decrypt successfully.
 pub struct ThresholdPaillierShare {
     id: i32,
@@ -108,16 +103,18 @@ impl TOfNCryptosystem for ThresholdPaillier {
     }
 }
 
+impl Associable<ThresholdPaillierPK> for PaillierCiphertext {}
+
 impl EncryptionKey for ThresholdPaillierPK {
     type Input = Integer;
     type Plaintext = Integer;
-    type Ciphertext = ThresholdPaillierCiphertext;
+    type Ciphertext = PaillierCiphertext;
 
     fn encrypt_raw<R: SecureRng>(
         &self,
         plaintext: &Integer,
         rng: &mut GeneralRng<R>,
-    ) -> ThresholdPaillierCiphertext
+    ) -> PaillierCiphertext
     where
         Self: Sized,
     {
@@ -131,7 +128,7 @@ impl EncryptionKey for ThresholdPaillierPK {
         );
         let second = r.secure_pow_mod(&self.modulus, &n_squared);
 
-        ThresholdPaillierCiphertext {
+        PaillierCiphertext {
             c: (first * second).rem(&n_squared),
         }
     }
@@ -143,7 +140,7 @@ impl PartialDecryptionKey<ThresholdPaillierPK> for ThresholdPaillierSK {
     fn partial_decrypt_raw(
         &self,
         public_key: &ThresholdPaillierPK,
-        ciphertext: &ThresholdPaillierCiphertext,
+        ciphertext: &PaillierCiphertext,
     ) -> ThresholdPaillierShare {
         let n_squared = Integer::from(public_key.modulus.square_ref());
         ThresholdPaillierShare {
@@ -209,8 +206,6 @@ impl DecryptionShare<ThresholdPaillierPK> for ThresholdPaillierShare {
     }
 }
 
-// TODO: Implement homomorphism / simply use standard PaillierCiphertexts
-
 #[cfg(test)]
 mod tests {
     use crate::threshold_cryptosystems::paillier::{ThresholdPaillier, ThresholdPaillierShare};

scicrypt-numbertheory/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "scicrypt-numbertheory"
 description = "A scicrypt crate implementing number theoretic algorithms such as random (safe) prime generation"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Jelle Vos <[email protected]>"]
 edition = "2018"
 license = "MIT"
@@ -13,7 +13,7 @@ readme = "README.md"
 bench = false  # Disable default bench (we use criterion)
 
 [dependencies]
-scicrypt-traits = { version = "0.5.0", path = "../scicrypt-traits" }
+scicrypt-traits = { version = "0.6.0", path = "../scicrypt-traits" }
 rug = "1.13"
 rand_core = "0.6"
 

scicrypt-traits/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "scicrypt-traits"
 description = "A scicrypt crate defining general traits for cryptographic systems and functionalities"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Jelle Vos <[email protected]>"]
 edition = "2018"
 license = "MIT"

scicrypt-traits/src/homomorphic.rs

@@ -59,7 +59,6 @@ pub trait HomomorphicMultiplication: EncryptionKey {
     fn pow(&self, ciphertext: Self::Ciphertext, input: Self::Input) -> Self::Ciphertext;
 }
 
-// TODO: This leads to problems because PK::Plaintext can be AssociatedCiphertext<'pk, C, PK>
 impl<'pk, C: Associable<PK>, PK: EncryptionKey<Ciphertext = C> + HomomorphicMultiplication> Mul
     for AssociatedCiphertext<'pk, C, PK>
 {

scicrypt/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "scicrypt"
 description = "Lightweight cryptographic building blocks for proof of concept implementations in multi-party computation"
-version = "0.5.0"  # In sync with `scicrypt-traits`, `scicrypt-numbertheory`, and `scicrypt-he`
+version = "0.6.0"  # In sync with `scicrypt-traits`, `scicrypt-numbertheory`, and `scicrypt-he`
 authors = ["Jelle Vos <[email protected]>"]
 edition = "2018"
 license = "MIT"
@@ -13,9 +13,9 @@ readme = "README.md"
 bench = false  # Disable default bench (we use criterion)
 
 [dependencies]
-scicrypt-traits = { version = "0.5.0", path = "../scicrypt-traits" }
-scicrypt-numbertheory = { version = "0.5.0", path = "../scicrypt-numbertheory" }
-scicrypt-he = { version = "0.5.0", path = "../scicrypt-he" }
+scicrypt-traits = { version = "0.6.0", path = "../scicrypt-traits" }
+scicrypt-numbertheory = { version = "0.6.0", path = "../scicrypt-numbertheory" }
+scicrypt-he = { version = "0.6.0", path = "../scicrypt-he" }
 
 [package.metadata.docs.rs]
 rustdoc-args = [ "--html-in-header", "katex-header.html" ]