refactor ghash

tls/tls-2pc-aio/src/lib.rs

@@ -1,4 +1,3 @@
-pub mod ghash;
 // pub mod conn;
 // pub mod crypto;
 // pub mod error;

tls/tls-2pc-core/Cargo.toml

@@ -7,9 +7,8 @@ edition = "2021"
 name = "tls_2pc_core"
 
 [features]
-default = ["prf", "ghash", "circuits"]
+default = ["prf", "circuits"]
 prf = []
-ghash = []
 circuits = ["c1", "c2", "c3", "c4", "c5", "c6", "c7"]
 c1 = []
 c2 = []
@@ -38,7 +37,6 @@ once_cell.workspace = true
 
 [dev-dependencies]
 criterion.workspace = true
-ghash_rc.workspace = true
 rand_chacha.workspace = true
 hex.workspace = true
 num = { workspace = true, features = ["rand"] }

tls/tls-2pc-core/src/lib.rs

@@ -1,5 +1,3 @@
-#[cfg(feature = "ghash")]
-pub mod ghash;
 pub mod msgs;
 #[cfg(feature = "prf")]
 pub mod prf;

universal-hash/Cargo.toml

@@ -0,0 +1,45 @@
+[package]
+name = "tlsn-universal-hash"
+version = "0.1.0"
+edition = "2021"
+
+[features]
+default = ["ghash", "mock"]
+ghash = []
+mock = []
+
+[dependencies]
+# tlsn
+tlsn-mpc-core = { path = "../mpc/mpc-core" }
+tlsn-mpc-aio = { path = "../mpc/mpc-aio" }
+tlsn-utils = { path = "../utils/utils" }
+tlsn-utils-aio = { path = "../utils/utils-aio" }
+share-conversion-core = { path = "../mpc/share-conversion-core" }
+share-conversion-aio = { path = "../mpc/share-conversion-aio" }
+
+# rand
+rand_chacha = "0.3"
+rand = "0.8"
+rand_core = "0.6"
+
+# crypto
+ghash_rc = { package = "ghash", version = "0.4" }
+
+# async
+async-trait = "0.1"
+futures = "0.3"
+futures-util = "0.3"
+tokio = "1.23"
+tokio-util = "0.7"
+
+# testing
+rstest = "0.16"
+criterion = "0.3"
+
+# error/log
+thiserror = "1"
+
+# misc
+derive_builder = "0.11"
+once_cell = "1"
+generic-array = "0.14"

universal-hash/src/ghash/ghash/config.rs

@@ -0,0 +1,11 @@
+use derive_builder::Builder;
+
+#[derive(Debug, Clone, Builder)]
+pub struct GhashConfig {
+    /// Initial number of block shares to provision
+    #[builder(default = "1024")]
+    pub initial_block_count: usize,
+    /// Maximum number of blocks supported
+    #[builder(default = "1024")]
+    pub max_block_count: usize,
+}

tls/tls-2pc-aio/src/ghash/mock.rs → universal-hash/src/ghash/ghash/mock.rs

@@ -1,31 +1,29 @@
-use rand::{Rng, SeedableRng};
-use rand_chacha::ChaCha12Rng;
 use share_conversion_aio::gf2_128::{
     mock::{mock_converter_pair, Gf2Receiver, Gf2Sender},
     recorder::Recorder,
 };
 use share_conversion_core::gf2_128::{AddShare, MulShare};
 
-use super::Ghash;
+use super::{Ghash, GhashConfigBuilder};
 
 pub type MockGhashSender<T, U> = Ghash<Gf2Sender<AddShare, T>, Gf2Sender<MulShare, U>>;
 pub type MockGhashReceiver<T, U> = Ghash<Gf2Receiver<AddShare, T>, Gf2Receiver<MulShare, U>>;
 
 /// Create a Ghash sender/receiver pair for testing purpose
 pub fn mock_ghash_pair<T: Recorder<AddShare> + Send, U: Recorder<MulShare> + Send>(
-    hashkey: u128,
-    message_len: usize,
+    block_count: usize,
 ) -> (MockGhashSender<T, U>, MockGhashReceiver<T, U>) {
-    let mut rng = ChaCha12Rng::from_seed([0; 32]);
-    let h1: u128 = rng.gen();
-    let h2 = hashkey ^ h1;
-
     let (sender_a2m, receiver_a2m) = mock_converter_pair::<AddShare, _>();
     let (sender_m2a, receiver_m2a) = mock_converter_pair::<MulShare, _>();
 
+    let config = GhashConfigBuilder::default()
+        .initial_block_count(block_count)
+        .build()
+        .unwrap();
+
     let (sender, receiver) = (
-        Ghash::new(h1, message_len, sender_a2m, sender_m2a).unwrap(),
-        Ghash::new(h2, message_len, receiver_a2m, receiver_m2a).unwrap(),
+        Ghash::new(config.clone(), sender_a2m, sender_m2a),
+        Ghash::new(config, receiver_a2m, receiver_m2a),
     );
 
     (sender, receiver)