Add (normal) macros showing how to generate SizedBytes to/from TryFrom + to_bytes

This is useful for getting serialization of the KEXState, KEXMessage formats without too much boilerplate

Add client_login, login_first_message roundtrip serialization tests

src/tests/opaque_ke_test.rs

@@ -391,7 +391,7 @@ fn test_r3() -> Result<(), PakeError> {
     .unwrap()
     .finish(
         RegisterSecondMessage::try_from(&parameters.r2[..]).unwrap(),
-        &Key::try_from(parameters.server_s_pk).unwrap(),
+        &Key::try_from(&parameters.server_s_pk[..]).unwrap(),
         &mut finish_registration_rng,
     )
     .unwrap();
@@ -456,7 +456,7 @@ fn test_l2() -> Result<(), PakeError> {
     let mut server_e_sk_rng = CycleRng::new(parameters.server_e_sk);
     let (l2, server_login) = ServerLogin::start::<AesgcmX255193dhNoSlowHash, _>(
         ServerRegistration::try_from(&parameters.password_file[..]).unwrap(),
-        &Key::try_from(parameters.server_s_sk).unwrap(),
+        &Key::try_from(&parameters.server_s_sk[..]).unwrap(),
         LoginFirstMessage::<EdwardsPoint>::try_from(&parameters.l1[..]).unwrap(),
         &mut server_e_sk_rng,
     )
@@ -481,7 +481,7 @@ fn test_l3() -> Result<(), PakeError> {
             .finish(
                 LoginSecondMessage::<Aes256Gcm, EdwardsPoint>::try_from(&parameters.l2[..])
                     .unwrap(),
-                &Key::try_from(parameters.server_s_pk)?,
+                &Key::try_from(&parameters.server_s_pk[..])?,
                 &mut client_e_sk_rng,
             )
             .unwrap();

src/tests/serialization.rs

@@ -6,6 +6,7 @@
 use crate::{
     ciphersuite::CipherSuite,
     group::Group,
+    key_exchange::{KE1Message, NONCE_LEN},
     keypair::{KeyPair, SizedBytes, X25519KeyPair},
     opaque::*,
     rkr_encryption::{RKRCipher as _, RKRCiphertext},
@@ -16,7 +17,7 @@ use curve25519_dalek::ristretto::RistrettoPoint;
 use chacha20poly1305::ChaCha20Poly1305;
 use rand_core::{OsRng, RngCore};
 
-use sha2::Digest;
+use sha2::{Digest, Sha256};
 use std::convert::TryFrom;
 
 struct Default;
@@ -130,3 +131,46 @@ fn register_third_message_roundtrip() {
     let r3_bytes = r3.to_bytes();
     assert_eq!(message, r3_bytes);
 }
+
+#[test]
+fn client_login_roundtrip() {
+    let pw = b"hunter2";
+    let mut rng = OsRng;
+    let sc = <RistrettoPoint as Group>::random_scalar(&mut rng);
+
+    let client_e_kp = Default::generate_random_keypair(&mut rng).unwrap();
+    let mut client_nonce = [0u8; NONCE_LEN];
+    rng.fill_bytes(&mut client_nonce);
+
+    let l1_data = [&sc.to_bytes()[..], &client_nonce, client_e_kp.public()].concat();
+    let mut hasher = Sha256::new();
+    hasher.update(l1_data);
+    let hashed_l1 = hasher.finalize();
+
+    // serialization order: scalar, password, ke1_state
+    let bytes: Vec<u8> = [
+        &sc.as_bytes()[..],
+        &pw[..],
+        client_e_kp.public(),
+        &client_nonce,
+        hashed_l1.as_slice(),
+    ]
+    .concat();
+    let reg = ClientLogin::<Default>::try_from(&bytes[..]).unwrap();
+    let reg_bytes = reg.to_bytes();
+    assert_eq!(reg_bytes, bytes);
+}
+
+#[test]
+fn login_first_message_roundtrip() {
+    let mut rng = OsRng;
+
+    let client_e_kp = Default::generate_random_keypair(&mut rng).unwrap();
+    let mut client_nonce = [0u8; NONCE_LEN];
+    rng.fill_bytes(&mut client_nonce);
+
+    let ke1m: Vec<u8> = [&client_nonce[..], &client_e_kp.public()].concat();
+    let reg = KE1Message::try_from(&ke1m[..]).unwrap();
+    let reg_bytes = reg.to_bytes();
+    assert_eq!(reg_bytes, ke1m);
+}