diff options
| author | Steven Fackler <[email protected]> | 2018-05-24 21:06:11 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2018-05-24 21:06:11 -0700 |
| commit | 772e1c003f57cdbc6258580cb2059999aa51b4f2 (patch) | |
| tree | 60711339aa90739b40a17ad734616918f9e355ab /openssl/src/hash.rs | |
| parent | Merge pull request #933 from sfackler/bogus-sni (diff) | |
| download | rust-openssl-772e1c003f57cdbc6258580cb2059999aa51b4f2.tar.xz rust-openssl-772e1c003f57cdbc6258580cb2059999aa51b4f2.zip | |
Add some digest support
Diffstat (limited to 'openssl/src/hash.rs')
| -rw-r--r-- | openssl/src/hash.rs | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/openssl/src/hash.rs b/openssl/src/hash.rs index 582a2ada..49797df8 100644 --- a/openssl/src/hash.rs +++ b/openssl/src/hash.rs @@ -4,6 +4,10 @@ use std::io; use std::io::prelude::*; use std::ops::{Deref, DerefMut}; +use error::ErrorStack; +use nid::Nid; +use {cvt, cvt_p}; + cfg_if! { if #[cfg(ossl110)] { use ffi::{EVP_MD_CTX_free, EVP_MD_CTX_new}; @@ -12,9 +16,6 @@ cfg_if! { } } -use error::ErrorStack; -use {cvt, cvt_p}; - #[derive(Copy, Clone)] pub struct MessageDigest(*const ffi::EVP_MD); @@ -23,6 +24,22 @@ impl MessageDigest { MessageDigest(x) } + /// Returns the `MessageDigest` corresponding to an `Nid`. + /// + /// This corresponds to [`EVP_get_digestbynid`]. + /// + /// [`EVP_get_digestbynid`]: https://www.openssl.org/docs/man1.1.0/crypto/EVP_DigestInit.html + pub fn from_nid(type_: Nid) -> Option<MessageDigest> { + unsafe { + let ptr = ffi::EVP_get_digestbynid(type_.as_raw()); + if ptr.is_null() { + None + } else { + Some(MessageDigest(ptr)) + } + } + } + pub fn md5() -> MessageDigest { unsafe { MessageDigest(ffi::EVP_md5()) } } @@ -405,4 +422,12 @@ mod tests { hash_test(MessageDigest::ripemd160(), test); } } + + #[test] + fn from_nid() { + assert_eq!( + MessageDigest::from_nid(Nid::SHA256).unwrap().as_ptr(), + MessageDigest::sha256().as_ptr() + ); + } } |