rename method for clarity

This commit is contained in:
sinuio
2022-03-10 15:56:02 -08:00
parent 34ac0ea83e
commit 11c03e1cc7
5 changed files with 16 additions and 19 deletions

View File

@@ -51,8 +51,7 @@ impl<OT: ot::OtSend> AsyncOtSender<OT> {
}
_ => return Err(AsyncOtSenderError::MalformedMessage),
};
self.ot
.base_receive_seeds(base_payload.try_into().unwrap())?;
self.ot.base_receive(base_payload.try_into().unwrap())?;
let extension_receiver_setup = match stream.next().await {
Some(message) => {
@@ -104,9 +103,7 @@ impl<OT: ot::OtReceive> AsyncOtReceiver<OT> {
_ => return Err(AsyncOtReceiverError::MalformedMessage),
};
let payload = self
.ot
.base_send_seeds(base_receiver_setup.try_into().unwrap())?;
let payload = self.ot.base_send(base_receiver_setup.try_into().unwrap())?;
stream
.send(Message::Binary(

View File

@@ -50,8 +50,8 @@ fn criterion_benchmark(c: &mut Criterion) {
let mut sender = OtSender::new(s_rng, s_cipher);
let base_receiver_setup = sender.base_setup(base_sender_setup).unwrap();
let send_seeds = receiver.base_send_seeds(base_receiver_setup).unwrap();
sender.base_receive_seeds(send_seeds).unwrap();
let send_seeds = receiver.base_send(base_receiver_setup).unwrap();
sender.base_receive(send_seeds).unwrap();
let receiver_setup = receiver.extension_setup(&choice).unwrap();
sender.extension_setup(receiver_setup).unwrap();

View File

@@ -44,8 +44,8 @@ pub fn main() {
let base_receiver_setup = sender.base_setup(base_sender_setup).unwrap();
// Now the receiver generates some seeds from sender's setup and uses OT to transfer them
let base_payload = receiver.base_send_seeds(base_receiver_setup).unwrap();
sender.base_receive_seeds(base_payload).unwrap();
let base_payload = receiver.base_send(base_receiver_setup).unwrap();
sender.base_receive(base_payload).unwrap();
// Receiver generates OT extension setup and passes it to sender
let receiver_setup = receiver.extension_setup(&choice).unwrap();

View File

@@ -97,7 +97,7 @@ impl<R: Rng + CryptoRng + SeedableRng, C: BlockCipher<BlockSize = U16> + BlockEn
.setup(&mut self.rng, &self.base_choice, base_sender_setup)?)
}
fn base_receive_seeds(&mut self, payload: BaseOtSenderPayload) -> Result<(), OtSenderError> {
fn base_receive(&mut self, payload: BaseOtSenderPayload) -> Result<(), OtSenderError> {
let receive = self.base.receive(&self.base_choice, payload)?;
self.set_seeds(receive);
self.state = OtSenderState::BaseSetup;
@@ -228,7 +228,7 @@ impl<R: Rng + CryptoRng + SeedableRng, C: BlockCipher<BlockSize = U16> + BlockEn
Ok(self.base.setup(&mut self.rng))
}
fn base_send_seeds(
fn base_send(
&mut self,
base_receiver_setup: BaseOtReceiverSetup,
) -> Result<BaseOtSenderPayload, OtReceiverError> {
@@ -328,8 +328,8 @@ mod tests {
let mut sender = OtSender::new(s_rng, s_cipher);
let base_receiver_setup = sender.base_setup(base_sender_setup).unwrap();
let send_seeds = receiver.base_send_seeds(base_receiver_setup).unwrap();
sender.base_receive_seeds(send_seeds).unwrap();
let send_seeds = receiver.base_send(base_receiver_setup).unwrap();
sender.base_receive(send_seeds).unwrap();
let mut choice = vec![0u8; 2];
let mut rng = ChaCha12Rng::from_entropy();
@@ -367,8 +367,8 @@ mod tests {
let mut sender = OtSender::new(s_rng, s_cipher);
let base_receiver_setup = sender.base_setup(base_sender_setup).unwrap();
let send_seeds = receiver.base_send_seeds(base_receiver_setup).unwrap();
sender.base_receive_seeds(send_seeds).unwrap();
let send_seeds = receiver.base_send(base_receiver_setup).unwrap();
sender.base_receive(send_seeds).unwrap();
let inputs = receiver.seeds.unwrap();
let choice = sender.base_choice;
@@ -394,8 +394,8 @@ mod tests {
let mut sender = OtSender::new(s_rng, s_cipher);
let base_receiver_setup = sender.base_setup(base_sender_setup).unwrap();
let send_seeds = receiver.base_send_seeds(base_receiver_setup).unwrap();
sender.base_receive_seeds(send_seeds).unwrap();
let send_seeds = receiver.base_send(base_receiver_setup).unwrap();
sender.base_receive(send_seeds).unwrap();
let receiver_rngs = receiver.rngs.unwrap();
let mut receiver_chosen_rngs: Vec<ChaCha12Rng> = receiver_rngs

View File

@@ -40,7 +40,7 @@ pub trait OtSend {
base_sender_setup: BaseOtSenderSetup,
) -> Result<BaseOtReceiverSetup, OtSenderError>;
fn base_receive_seeds(&mut self, payload: BaseOtSenderPayload) -> Result<(), OtSenderError>;
fn base_receive(&mut self, payload: BaseOtSenderPayload) -> Result<(), OtSenderError>;
fn extension_setup(&mut self, receiver_setup: OtReceiverSetup) -> Result<(), OtSenderError>;
@@ -52,7 +52,7 @@ pub trait OtReceive {
fn base_setup(&mut self) -> Result<BaseOtSenderSetup, OtReceiverError>;
fn base_send_seeds(
fn base_send(
&mut self,
base_receiver_setup: BaseOtReceiverSetup,
) -> Result<BaseOtSenderPayload, OtReceiverError>;