diff options
Diffstat (limited to 'spake2/src')
| -rw-r--r-- | spake2/src/lib.rs | 6 | ||||
| -rw-r--r-- | spake2/src/tests.rs | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/spake2/src/lib.rs b/spake2/src/lib.rs index 08e0057..0bcfd6d 100644 --- a/spake2/src/lib.rs +++ b/spake2/src/lib.rs @@ -358,6 +358,7 @@ pub trait Group { // const element_length: usize; // in unstable, or u8 //type ElementBytes : Index<usize, Output=u8>+IndexMut<usize>; // later type TranscriptHash; + fn name() -> &'static str; fn const_m() -> Self::Element; fn const_n() -> Self::Element; fn const_s() -> Self::Element; @@ -385,6 +386,10 @@ impl Group for Ed25519Group { //type ScalarBytes type TranscriptHash = Sha256; + fn name() -> &'static str { + "Ed25519" + } + fn const_m() -> c2_Element { // python -c "import binascii, spake2; b=binascii.hexlify(spake2.ParamsEd25519.M.to_bytes()); print(', '.join(['0x'+b[i:i+2] for i in range(0,len(b),2)]))" // 15cfd18e385952982b6a8f8c7854963b58e34388c8e6dae891db756481a02312 @@ -822,6 +827,7 @@ fn maybe_utf8(s: &[u8]) -> String { impl<G: Group> fmt::Debug for SPAKE2<G> { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { fmt.debug_struct("SPAKE2") + .field("group", &G::name()) .field("side", &self.side) .field("idA", &maybe_utf8(&self.id_a)) .field("idB", &maybe_utf8(&self.id_b)) diff --git a/spake2/src/tests.rs b/spake2/src/tests.rs index b94bcdd..0328266 100644 --- a/spake2/src/tests.rs +++ b/spake2/src/tests.rs @@ -185,9 +185,16 @@ fn test_debug() { &Identity::new(b"idB"), ); println!("s1: {:?}", s1); + assert_eq!( + format!("{:?}", s1), + "SPAKE2 { group: \"Ed25519\", side: A, idA: \"(s=idA)\", idB: \"(s=idB)\", idS: \"(s=)\" }" + ); + let (s2, _msg1) = SPAKE2::<Ed25519Group>::start_symmetric( &Password::new(b"password"), &Identity::new(b"idS"), ); println!("s2: {:?}", s2); + assert_eq!(format!("{:?}", s2), + "SPAKE2 { group: \"Ed25519\", side: Symmetric, idA: \"(s=)\", idB: \"(s=)\", idS: \"(s=idS)\" }"); } |