From 2d7b4292ffdf79837372da2c0b3af6452152e238 Mon Sep 17 00:00:00 2001
From: Kevin Lewi <klewi@cs.stanford.edu>
Date: Mon, 16 Nov 2020 11:40:52 -0800
Subject: [PATCH] Fixing simple_login example (#86)

---
 examples/simple_login.rs | 12 ++++++------
 src/opaque.rs            |  9 +++++++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/examples/simple_login.rs b/examples/simple_login.rs
index 50f0f0c..90a3aee 100644
--- a/examples/simple_login.rs
+++ b/examples/simple_login.rs
@@ -63,7 +63,7 @@ fn account_registration(
 
     let mut server_rng = OsRng;
     let (r2, server_state) = ServerRegistration::<Default>::start(
-        RegisterFirstMessage::try_from(&r1_bytes[..]).unwrap(),
+        RegisterFirstMessage::deserialize(&r1_bytes[..]).unwrap(),
         &mut server_rng,
     )
     .unwrap();
@@ -73,7 +73,7 @@ fn account_registration(
 
     let (r3, _) = client_state
         .finish(
-            RegisterSecondMessage::try_from(&r2_bytes[..]).unwrap(),
+            RegisterSecondMessage::deserialize(&r2_bytes[..]).unwrap(),
             server_kp.public(),
             &mut client_rng,
         )
@@ -83,7 +83,7 @@ fn account_registration(
     // Client sends r3_bytes to server
 
     let password_file = server_state
-        .finish(RegisterThirdMessage::try_from(&r3_bytes[..]).unwrap())
+        .finish(RegisterThirdMessage::deserialize(&r3_bytes[..]).unwrap())
         .unwrap();
     password_file.to_bytes()
 }
@@ -106,7 +106,7 @@ fn account_login(
     let (l2, server_state) = ServerLogin::start(
         password_file,
         &server_kp.private(),
-        LoginFirstMessage::try_from(&l1_bytes[..]).unwrap(),
+        LoginFirstMessage::deserialize(&l1_bytes[..]).unwrap(),
         &mut server_rng,
     )
     .unwrap();
@@ -115,7 +115,7 @@ fn account_login(
     // Server sends l2_bytes to client
 
     let result = client_state.finish(
-        LoginSecondMessage::try_from(&l2_bytes[..]).unwrap(),
+        LoginSecondMessage::deserialize(&l2_bytes[..]).unwrap(),
         &server_kp.public(),
         &mut client_rng,
     );
@@ -130,7 +130,7 @@ fn account_login(
     // Client sends l3_bytes to server
 
     let server_shared_secret = server_state
-        .finish(LoginThirdMessage::try_from(&l3_bytes[..]).unwrap())
+        .finish(LoginThirdMessage::deserialize(&l3_bytes[..]).unwrap())
         .unwrap();
 
     client_shared_secret == server_shared_secret
diff --git a/src/opaque.rs b/src/opaque.rs
index e45211b..6081e5d 100644
--- a/src/opaque.rs
+++ b/src/opaque.rs
@@ -463,6 +463,15 @@ impl<CS: CipherSuite> LoginThirdMessage<CS> {
         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
     pub fn to_bytes(&self) -> Vec<u8> {
         self.ke3_message.to_bytes()