1 files changed, 39 insertions, 9 deletions

diff --git a/src/lib.rs b/src/lib.rs
index dfc4b23..030498e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -10,12 +10,20 @@ pub use spake2::*;
 
 #[cfg(test)]
 mod tests {
-    use spake2::{Ed25519Group, ErrorType, SPAKE2, SPAKEErr};
+    use spake2::{Ed25519Group, ErrorType, Identity, Password, SPAKE2, SPAKEErr};
 
     #[test]
     fn test_basic() {
-        let (s1, msg1) = SPAKE2::<Ed25519Group>::start_a(b"password", b"idA", b"idB");
-        let (s2, msg2) = SPAKE2::<Ed25519Group>::start_b(b"password", b"idA", b"idB");
+        let (s1, msg1) = SPAKE2::<Ed25519Group>::start_a(
+            &Password::new(b"password"),
+            &Identity::new(b"idA"),
+            &Identity::new(b"idB"),
+        );
+        let (s2, msg2) = SPAKE2::<Ed25519Group>::start_b(
+            &Password::new(b"password"),
+            &Identity::new(b"idA"),
+            &Identity::new(b"idB"),
+        );
         let key1 = s1.finish(msg2.as_slice()).unwrap();
         let key2 = s2.finish(msg1.as_slice()).unwrap();
         assert_eq!(key1, key2);
@@ -23,8 +31,16 @@ mod tests {
 
     #[test]
     fn test_mismatch() {
-        let (s1, msg1) = SPAKE2::<Ed25519Group>::start_a(b"password", b"idA", b"idB");
-        let (s2, msg2) = SPAKE2::<Ed25519Group>::start_b(b"password2", b"idA", b"idB");
+        let (s1, msg1) = SPAKE2::<Ed25519Group>::start_a(
+            &Password::new(b"password"),
+            &Identity::new(b"idA"),
+            &Identity::new(b"idB"),
+        );
+        let (s2, msg2) = SPAKE2::<Ed25519Group>::start_b(
+            &Password::new(b"password2"),
+            &Identity::new(b"idA"),
+            &Identity::new(b"idB"),
+        );
         let key1 = s1.finish(msg2.as_slice()).unwrap();
         let key2 = s2.finish(msg1.as_slice()).unwrap();
         assert_ne!(key1, key2);
@@ -32,7 +48,11 @@ mod tests {
 
     #[test]
     fn test_reflected_message() {
-        let (s1, msg1) = SPAKE2::<Ed25519Group>::start_a(b"password", b"idA", b"idB");
+        let (s1, msg1) = SPAKE2::<Ed25519Group>::start_a(
+            &Password::new(b"password"),
+            &Identity::new(b"idA"),
+            &Identity::new(b"idB"),
+        );
         let r = s1.finish(msg1.as_slice());
         assert_eq!(
             r.unwrap_err(),
@@ -44,7 +64,11 @@ mod tests {
 
     #[test]
     fn test_bad_length() {
-        let (s1, msg1) = SPAKE2::<Ed25519Group>::start_a(b"password", b"idA", b"idB");
+        let (s1, msg1) = SPAKE2::<Ed25519Group>::start_a(
+            &Password::new(b"password"),
+            &Identity::new(b"idA"),
+            &Identity::new(b"idB"),
+        );
         let mut msg2 = Vec::<u8>::with_capacity(msg1.len() + 1);
         msg2.resize(msg1.len() + 1, 0u8);
         let r = s1.finish(&msg2);
@@ -58,8 +82,14 @@ mod tests {
 
     #[test]
     fn test_basic_symmetric() {
-        let (s1, msg1) = SPAKE2::<Ed25519Group>::start_symmetric(b"password", b"idS");
-        let (s2, msg2) = SPAKE2::<Ed25519Group>::start_symmetric(b"password", b"idS");
+        let (s1, msg1) = SPAKE2::<Ed25519Group>::start_symmetric(
+            &Password::new(b"password"),
+            &Identity::new(b"idS"),
+        );
+        let (s2, msg2) = SPAKE2::<Ed25519Group>::start_symmetric(
+            &Password::new(b"password"),
+            &Identity::new(b"idS"),
+        );
         let key1 = s1.finish(msg2.as_slice()).unwrap();
         let key2 = s2.finish(msg1.as_slice()).unwrap();
         assert_eq!(key1, key2);