vexahub/opaque-vx
5
0
Fork 0
Code Issues 1 Pull Requests 3 Actions Releases 3 Activity

Fixing simple_login example (#86)

Browse Source
This commit is contained in:
Kevin Lewi
2020-11-16 11:40:52 -08:00
committed by GitHub
parent f165310c96
commit 2d7b4292ff
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/simple_login.rs
+6 -6
View File
@@ -63,7 +63,7 @@ fn account_registration(
let mut server_rng = OsRng; let mut server_rng = OsRng;
let (r2, server_state) = ServerRegistration::<Default>::start( let (r2, server_state) = ServerRegistration::<Default>::start(
RegisterFirstMessage::try_from(&r1_bytes[..]).unwrap(), RegisterFirstMessage::deserialize(&r1_bytes[..]).unwrap(),
&mut server_rng, &mut server_rng,
) )
.unwrap(); .unwrap();
@@ -73,7 +73,7 @@ fn account_registration(
let (r3, _) = client_state let (r3, _) = client_state
.finish( .finish(
RegisterSecondMessage::try_from(&r2_bytes[..]).unwrap(), RegisterSecondMessage::deserialize(&r2_bytes[..]).unwrap(),
server_kp.public(), server_kp.public(),
&mut client_rng, &mut client_rng,
) )
@@ -83,7 +83,7 @@ fn account_registration(
// Client sends r3_bytes to server // Client sends r3_bytes to server
let password_file = server_state let password_file = server_state
.finish(RegisterThirdMessage::try_from(&r3_bytes[..]).unwrap()) .finish(RegisterThirdMessage::deserialize(&r3_bytes[..]).unwrap())
.unwrap(); .unwrap();
password_file.to_bytes() password_file.to_bytes()
} }
@@ -106,7 +106,7 @@ fn account_login(
let (l2, server_state) = ServerLogin::start( let (l2, server_state) = ServerLogin::start(
password_file, password_file,
&server_kp.private(), &server_kp.private(),
LoginFirstMessage::try_from(&l1_bytes[..]).unwrap(), LoginFirstMessage::deserialize(&l1_bytes[..]).unwrap(),
&mut server_rng, &mut server_rng,
) )
.unwrap(); .unwrap();
@@ -115,7 +115,7 @@ fn account_login(
// Server sends l2_bytes to client // Server sends l2_bytes to client
let result = client_state.finish( let result = client_state.finish(
LoginSecondMessage::try_from(&l2_bytes[..]).unwrap(), LoginSecondMessage::deserialize(&l2_bytes[..]).unwrap(),
&server_kp.public(), &server_kp.public(),
&mut client_rng, &mut client_rng,
); );
@@ -130,7 +130,7 @@ fn account_login(
// Client sends l3_bytes to server // Client sends l3_bytes to server
let server_shared_secret = server_state let server_shared_secret = server_state
.finish(LoginThirdMessage::try_from(&l3_bytes[..]).unwrap()) .finish(LoginThirdMessage::deserialize(&l3_bytes[..]).unwrap())
.unwrap(); .unwrap();
client_shared_secret == server_shared_secret client_shared_secret == server_shared_secret
src/opaque.rs
+9
View File
@@ -463,6 +463,15 @@ impl<CS: CipherSuite> LoginThirdMessage<CS> {
output output
} }
/// Deserialization from bytes
pub fn deserialize(input: &[u8]) -> Result<Self, ProtocolError> {
if input.is_empty() || input[0] != ProtocolMessageType::KeyExchange as u8 + 1 {
return Err(PakeError::SerializationError.into());
}
Self::try_from(&input[1..])
}
/// byte representation for the login finalization /// byte representation for the login finalization
pub fn to_bytes(&self) -> Vec<u8> { pub fn to_bytes(&self) -> Vec<u8> {
self.ke3_message.to_bytes() self.ke3_message.to_bytes()