summaryrefslogtreecommitdiff
path: root/openssl
diff options
context:
space:
mode:
authorSteven Fackler <sfackler@gmail.com>2016-10-15 13:39:47 -0700
committerSteven Fackler <sfackler@gmail.com>2016-10-15 13:39:47 -0700
commit228b8fbc5b5567f19b66754f589d47851817c411 (patch)
tree483cb4c310c6db8b176a70bb88bb205afabdd19d /openssl
parentd7501d42857363121f398aaad95dc6a8fdced80e (diff)
downloadrust-openssl-228b8fbc5b5567f19b66754f589d47851817c411.zip
Correctly bind BIO_new_mem_buf
Diffstat (limited to 'openssl')
-rw-r--r--openssl/src/bio.rs11
1 files changed, 10 insertions, 1 deletions
diff --git a/openssl/src/bio.rs b/openssl/src/bio.rs
index 0d82a6c3..22d2cee3 100644
--- a/openssl/src/bio.rs
+++ b/openssl/src/bio.rs
@@ -22,7 +22,7 @@ impl<'a> MemBioSlice<'a> {
assert!(buf.len() <= c_int::max_value() as usize);
let bio = unsafe {
- try_ssl_null!(ffi::BIO_new_mem_buf(buf.as_ptr() as *const _, buf.len() as c_int))
+ try_ssl_null!(BIO_new_mem_buf(buf.as_ptr() as *const _, buf.len() as c_int))
};
Ok(MemBioSlice(bio, PhantomData))
@@ -65,3 +65,12 @@ impl MemBio {
}
}
}
+
+#[cfg(not(ossl101))]
+use ffi::BIO_new_mem_buf;
+
+#[cfg(ossl101)]
+#[allow(bad_style)]
+unsafe fn BIO_new_mem_buf(buf: *const ::libc::c_void, len: ::libc::c_int) -> *mut ffi::BIO {
+ ffi::BIO_new_mem_buf(buf as *mut _, len)
+}