From ae282a78e2c16dda2a7594b86a77334d6afdd40e Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Fri, 14 Oct 2016 16:15:50 -0700 Subject: Remove link_name usage --- openssl/src/crypto/hash.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'openssl/src') diff --git a/openssl/src/crypto/hash.rs b/openssl/src/crypto/hash.rs index d87c43c5..e3bf4997 100644 --- a/openssl/src/crypto/hash.rs +++ b/openssl/src/crypto/hash.rs @@ -3,6 +3,11 @@ use std::io; use std::ptr; use ffi; +#[cfg(ossl110)] +use ffi::{EVP_MD_CTX_new, EVP_MD_CTX_free}; +#[cfg(any(ossl101, ossl102))] +use ffi::{EVP_MD_CTX_create as EVP_MD_CTX_new, EVP_MD_CTX_destroy as EVP_MD_CTX_free}; + use HashTypeInternals; use error::ErrorStack; use nid::Nid; @@ -100,7 +105,7 @@ impl Hasher { pub fn new(ty: Type) -> Result { ffi::init(); - let ctx = unsafe { try_ssl_null!(ffi::EVP_MD_CTX_new()) }; + let ctx = unsafe { try_ssl_null!(EVP_MD_CTX_new()) }; let md = ty.evp_md(); let mut h = Hasher { @@ -172,7 +177,7 @@ impl Write for Hasher { impl Clone for Hasher { fn clone(&self) -> Hasher { let ctx = unsafe { - let ctx = ffi::EVP_MD_CTX_new(); + let ctx = EVP_MD_CTX_new(); assert!(!ctx.is_null()); let r = ffi::EVP_MD_CTX_copy_ex(ctx, self.ctx); assert_eq!(r, 1); @@ -193,7 +198,7 @@ impl Drop for Hasher { if self.state != Finalized { drop(self.finish()); } - ffi::EVP_MD_CTX_free(self.ctx); + EVP_MD_CTX_free(self.ctx); } } } -- cgit v1.2.3