adapt mpc-tls

Author: th4s

crates/mpc-tls/src/record_layer/aead/aes_gcm.rs

@@ -445,12 +445,11 @@ mod tests {
     };
     use mpz_common::context::test_st_context;
     use mpz_core::Block;
-    use mpz_garble::protocol::semihonest::{Evaluator, Generator};
+    use mpz_garble::protocol::semihonest::{Evaluator, Garbler};
     use mpz_memory_core::{binary::U8, correlated::Delta};
     use mpz_ot::ideal::cot::ideal_cot;
     use mpz_share_conversion::ideal::ideal_share_convert;
     use rand::{rngs::StdRng, SeedableRng};
-    use rand06_compat::Rand0_6CompatExt;
     use rstest::*;
 
     static SHORT_MSG: &[u8] = b"hello world";
@@ -564,12 +563,12 @@ mod tests {
     }
 
     fn create_vm(key: [u8; 16], iv: [u8; 4]) -> ((impl Vm<Binary>, Vars), (impl Vm<Binary>, Vars)) {
-        let mut rng = StdRng::seed_from_u64(0).compat();
+        let mut rng = StdRng::seed_from_u64(0);
         let block = Block::random(&mut rng);
         let (sender, receiver) = ideal_cot(block);
 
         let delta = Delta::new(block);
-        let mut vm_0 = Generator::new(sender, [0u8; 16], delta);
+        let mut vm_0 = Garbler::new(sender, [0u8; 16], delta);
         let mut vm_1 = Evaluator::new(receiver);
 
         let key_ref_0 = vm_0.alloc::<Array<U8, 16>>().unwrap();
@@ -612,7 +611,7 @@ mod tests {
 
     fn create_pair(vars_0: Vars, vars_1: Vars) -> (MpcAesGcm, MpcAesGcm) {
         let mut rng = StdRng::seed_from_u64(0);
-        let (c_0, c_1) = ideal_share_convert(Block::random(&mut rng.compat_by_ref()));
+        let (c_0, c_1) = ideal_share_convert(Block::random(&mut rng));
         let mut leader = MpcAesGcm::new(c_0, Role::Leader);
         let mut follower = MpcAesGcm::new(c_1, Role::Follower);
 

crates/mpc-tls/src/record_layer/aead/ghash.rs

@@ -343,7 +343,7 @@ mod tests {
         ideal_share_convert, IdealShareConvertReceiver, IdealShareConvertSender,
     };
     use rand::{rngs::StdRng, Rng, SeedableRng};
-    use rand06_compat::Rand0_6CompatExt;
+
     fn create_pair() -> (
         MpcGhash<IdealShareConvertSender<Gf2_128>>,
         MpcGhash<IdealShareConvertReceiver<Gf2_128>>,
@@ -359,7 +359,7 @@ mod tests {
 
     #[test]
     fn test_compute_shares() {
-        let mut rng = StdRng::seed_from_u64(0).compat();
+        let mut rng = StdRng::seed_from_u64(0);
 
         let key = Gf2_128::rand(&mut rng);
         let expected_powers: Vec<_> = (0..MAX_POWER)

crates/mpc-tls/tests/test.rs

@@ -4,15 +4,14 @@ use futures::{AsyncReadExt, AsyncWriteExt};
 use mpc_tls::{Config, MpcTlsFollower, MpcTlsLeader};
 use mpz_common::context::test_mt_context;
 use mpz_core::Block;
-use mpz_garble::protocol::semihonest::{Evaluator, Generator};
+use mpz_garble::protocol::semihonest::{Evaluator, Garbler};
 use mpz_memory_core::correlated::Delta;
 use mpz_ot::{
     cot::{DerandCOTReceiver, DerandCOTSender},
     ideal::rcot::ideal_rcot,
     rcot::shared::{SharedRCOTReceiver, SharedRCOTSender},
 };
 use rand::{rngs::StdRng, Rng, SeedableRng};
-use rand06_compat::Rand0_6CompatExt;
 use tls_client::Certificate;
 use tls_client_async::bind_client;
 use tls_server_fixture::{bind_test_server_hyper, CA_CERT_DER, SERVER_DOMAIN};
@@ -116,7 +115,7 @@ async fn follower_task(mut follower: MpcTlsFollower) {
 }
 
 fn build_pair(config: Config) -> (MpcTlsLeader, MpcTlsFollower) {
-    let mut rng = StdRng::seed_from_u64(0).compat();
+    let mut rng = StdRng::seed_from_u64(0);
 
     let (mut mt_a, mut mt_b) = test_mt_context(8);
 
@@ -134,7 +133,7 @@ fn build_pair(config: Config) -> (MpcTlsLeader, MpcTlsFollower) {
     let mut rcot_recv_a = SharedRCOTReceiver::new(1, rcot_recv_a);
     let mut rcot_recv_b = SharedRCOTReceiver::new(4, rcot_recv_b);
 
-    let mpc_a = Arc::new(Mutex::new(Generator::new(
+    let mpc_a = Arc::new(Mutex::new(Garbler::new(
         DerandCOTSender::new(rcot_send_a.next().unwrap()),
         rand::rng().random(),
         delta_a,