aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/hash.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-10-30 16:37:45 -0700
committerSteven Fackler <[email protected]>2016-10-30 16:37:45 -0700
commitf75f82e466993848393c7a26ccb51dc31b4547fe (patch)
tree3b859d04e3216052fa5ff3c4c753ce204a3c9703 /openssl/src/hash.rs
parentRemove out of date comment (diff)
downloadrust-openssl-f75f82e466993848393c7a26ccb51dc31b4547fe.tar.xz
rust-openssl-f75f82e466993848393c7a26ccb51dc31b4547fe.zip
Rustfmt
Diffstat (limited to 'openssl/src/hash.rs')
-rw-r--r--openssl/src/hash.rs72
1 files changed, 24 insertions, 48 deletions
diff --git a/openssl/src/hash.rs b/openssl/src/hash.rs
index 4093ab79..c91976bf 100644
--- a/openssl/src/hash.rs
+++ b/openssl/src/hash.rs
@@ -15,45 +15,31 @@ pub struct MessageDigest(*const ffi::EVP_MD);
impl MessageDigest {
pub fn md5() -> MessageDigest {
- unsafe {
- MessageDigest(ffi::EVP_md5())
- }
+ unsafe { MessageDigest(ffi::EVP_md5()) }
}
pub fn sha1() -> MessageDigest {
- unsafe {
- MessageDigest(ffi::EVP_sha1())
- }
+ unsafe { MessageDigest(ffi::EVP_sha1()) }
}
pub fn sha224() -> MessageDigest {
- unsafe {
- MessageDigest(ffi::EVP_sha224())
- }
+ unsafe { MessageDigest(ffi::EVP_sha224()) }
}
pub fn sha256() -> MessageDigest {
- unsafe {
- MessageDigest(ffi::EVP_sha256())
- }
+ unsafe { MessageDigest(ffi::EVP_sha256()) }
}
pub fn sha384() -> MessageDigest {
- unsafe {
- MessageDigest(ffi::EVP_sha384())
- }
+ unsafe { MessageDigest(ffi::EVP_sha384()) }
}
pub fn sha512() -> MessageDigest {
- unsafe {
- MessageDigest(ffi::EVP_sha512())
- }
+ unsafe { MessageDigest(ffi::EVP_sha512()) }
}
pub fn ripemd160() -> MessageDigest {
- unsafe {
- MessageDigest(ffi::EVP_ripemd160())
- }
+ unsafe { MessageDigest(ffi::EVP_ripemd160()) }
}
pub fn as_ptr(&self) -> *const ffi::EVP_MD {
@@ -136,7 +122,9 @@ impl Hasher {
}
Finalized => (),
}
- unsafe { try!(cvt(ffi::EVP_DigestInit_ex(self.ctx, self.md, 0 as *mut _))); }
+ unsafe {
+ try!(cvt(ffi::EVP_DigestInit_ex(self.ctx, self.md, 0 as *mut _)));
+ }
self.state = Reset;
Ok(())
}
@@ -239,32 +227,20 @@ mod tests {
// Test vectors from http://www.nsrl.nist.gov/testdata/
#[allow(non_upper_case_globals)]
- const md5_tests: [(&'static str, &'static str); 13] = [("",
- "d41d8cd98f00b204e9800998ecf8427e"),
- ("7F",
- "83acb6e67e50e31db6ed341dd2de1595"),
- ("EC9C",
- "0b07f0d4ca797d8ac58874f887cb0b68"),
- ("FEE57A",
- "e0d583171eb06d56198fc0ef22173907"),
- ("42F497E0",
- "7c430f178aefdf1487fee7144e9641e2"),
- ("C53B777F1C",
- "75ef141d64cb37ec423da2d9d440c925"),
- ("89D5B576327B",
- "ebbaf15eb0ed784c6faa9dc32831bf33"),
- ("5D4CCE781EB190",
- "ce175c4b08172019f05e6b5279889f2c"),
- ("81901FE94932D7B9",
- "cd4d2f62b8cdb3a0cf968a735a239281"),
- ("C9FFDEE7788EFB4EC9",
- "e0841a231ab698db30c6c0f3f246c014"),
- ("66AC4B7EBA95E53DC10B",
- "a3b3cea71910d9af56742aa0bb2fe329"),
- ("A510CD18F7A56852EB0319",
- "577e216843dd11573574d3fb209b97d8"),
- ("AAED18DBE8938C19ED734A8D",
- "6f80fb775f27e0a4ce5c2f42fc72c5f1")];
+ const md5_tests: [(&'static str, &'static str); 13] =
+ [("", "d41d8cd98f00b204e9800998ecf8427e"),
+ ("7F", "83acb6e67e50e31db6ed341dd2de1595"),
+ ("EC9C", "0b07f0d4ca797d8ac58874f887cb0b68"),
+ ("FEE57A", "e0d583171eb06d56198fc0ef22173907"),
+ ("42F497E0", "7c430f178aefdf1487fee7144e9641e2"),
+ ("C53B777F1C", "75ef141d64cb37ec423da2d9d440c925"),
+ ("89D5B576327B", "ebbaf15eb0ed784c6faa9dc32831bf33"),
+ ("5D4CCE781EB190", "ce175c4b08172019f05e6b5279889f2c"),
+ ("81901FE94932D7B9", "cd4d2f62b8cdb3a0cf968a735a239281"),
+ ("C9FFDEE7788EFB4EC9", "e0841a231ab698db30c6c0f3f246c014"),
+ ("66AC4B7EBA95E53DC10B", "a3b3cea71910d9af56742aa0bb2fe329"),
+ ("A510CD18F7A56852EB0319", "577e216843dd11573574d3fb209b97d8"),
+ ("AAED18DBE8938C19ED734A8D", "6f80fb775f27e0a4ce5c2f42fc72c5f1")];
#[test]
fn test_md5() {