Remove the dashes in Debug output for ring::digest types.

This will make the output for the upcoming SHA-512/256 more sensible.
This commit is contained in:
Brian Smith 2017-06-07 12:26:16 -10:00
parent 394ec98e9f
commit c66da3e5bf
2 changed files with 9 additions and 9 deletions

View File

@ -306,7 +306,7 @@ impl core::fmt::Debug for Algorithm {
} else {
self.output_len * 8
};
write!(fmt, "SHA-{:?}", n)
write!(fmt, "SHA{:?}", n)
}
}

View File

@ -281,27 +281,27 @@ test_large_digest!(digest_test_large_digest_sha512, digest::SHA512, 512 / 8, [
#[test]
fn test_fmt_algorithm() {
assert_eq!("SHA-1", &format!("{:?}", digest::SHA1));
assert_eq!("SHA-256", &format!("{:?}", digest::SHA256));
assert_eq!("SHA-384", &format!("{:?}", digest::SHA384));
assert_eq!("SHA-512", &format!("{:?}", digest::SHA512));
assert_eq!("SHA1", &format!("{:?}", digest::SHA1));
assert_eq!("SHA256", &format!("{:?}", digest::SHA256));
assert_eq!("SHA384", &format!("{:?}", digest::SHA384));
assert_eq!("SHA512", &format!("{:?}", digest::SHA512));
}
#[test]
fn digest_test_fmt() {
assert_eq!("SHA-1:b7e23ec29af22b0b4e41da31e868d57226121c84",
assert_eq!("SHA1:b7e23ec29af22b0b4e41da31e868d57226121c84",
&format!("{:?}",
digest::digest(&digest::SHA1, b"hello, world")));
assert_eq!("SHA-256:09ca7e4eaa6e8ae9c7d261167129184883644d\
assert_eq!("SHA256:09ca7e4eaa6e8ae9c7d261167129184883644d\
07dfba7cbfbc4c8a2e08360d5b",
&format!("{:?}",
digest::digest(&digest::SHA256, b"hello, world")));
assert_eq!("SHA-384:1fcdb6059ce05172a26bbe2a3ccc88ed5a8cd5\
assert_eq!("SHA384:1fcdb6059ce05172a26bbe2a3ccc88ed5a8cd5\
fc53edfd9053304d429296a6da23b1cd9e5c9ed3bb34f0\
0418a70cdb7e",
&format!("{:?}",
digest::digest(&digest::SHA384, b"hello, world")));
assert_eq!("SHA-512:8710339dcb6814d0d9d2290ef422285c9322b7\
assert_eq!("SHA512:8710339dcb6814d0d9d2290ef422285c9322b7\
163951f9a0ca8f883d3305286f44139aa374848e4174f5\
aada663027e4548637b6d19894aec4fb6c46a139fbf9",
&format!("{:?}",