diff options
author | Steven Fackler <sfackler@gmail.com> | 2018-05-20 11:27:45 -0700 |
---|---|---|
committer | Steven Fackler <sfackler@gmail.com> | 2018-05-20 12:33:02 -0700 |
commit | a6fcef01c0aa71359f583342c813b8db5835178d (patch) | |
tree | 33c47b59618e5fe286904462f2d4a540804dd7ef /openssl/src/bio.rs | |
parent | 9df403043b75e407305f7003636dbe1c55f7d245 (diff) | |
download | rust-openssl-a6fcef01c0aa71359f583342c813b8db5835178d.zip |
Overhaul openssl cfgs
Also expose hostname verification on libressl
Diffstat (limited to 'openssl/src/bio.rs')
-rw-r--r-- | openssl/src/bio.rs | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/openssl/src/bio.rs b/openssl/src/bio.rs index 56ba1f3d..51724e3f 100644 --- a/openssl/src/bio.rs +++ b/openssl/src/bio.rs @@ -1,8 +1,8 @@ +use ffi; +use libc::c_int; use std::marker::PhantomData; use std::ptr; use std::slice; -use libc::c_int; -use ffi; use cvt_p; use error::ErrorStack; @@ -68,11 +68,13 @@ 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) +cfg_if! { + if #[cfg(ossl102)] { + use ffi::BIO_new_mem_buf; + } else { + #[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) + } + } } |