min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Expose EVP_MD_type() 

This gives us the ability to get the Nid from a MessageDigest.
This commit is contained in:
Nathaniel McCallum 2019-03-17 14:47:07 -04:00
parent a335c1b2f5
commit d9cb5433b1
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openssl-sys/src/evp.rs
View File

@ -23,6 +23,7 @@ pub unsafe fn EVP_get_digestbynid(type_: c_int) -> *const EVP_MD {
extern "C" { extern "C" {
pub fn EVP_MD_size(md: *const EVP_MD) -> c_int; pub fn EVP_MD_size(md: *const EVP_MD) -> c_int;
pub fn EVP_MD_type(md: *const EVP_MD) -> c_int;
#[cfg(any(ossl110, libressl273))] #[cfg(any(ossl110, libressl273))]
pub fn EVP_CIPHER_key_length(cipher: *const EVP_CIPHER) -> c_int; pub fn EVP_CIPHER_key_length(cipher: *const EVP_CIPHER) -> c_int;

5
openssl/src/hash.rs
View File

@ -106,6 +106,11 @@ impl MessageDigest {
pub fn size(&self) -> usize { pub fn size(&self) -> usize {
unsafe { ffi::EVP_MD_size(self.0) as usize } unsafe { ffi::EVP_MD_size(self.0) as usize }
} }
/// The name of the digest
pub fn type_(&self) -> Nid {
Nid::from_raw(unsafe { ffi::EVP_MD_type(self.0) })
}
} }
unsafe impl Sync for MessageDigest {} unsafe impl Sync for MessageDigest {}