diff options
| author | D.K <[email protected]> | 2014-10-02 14:42:28 -0400 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2014-10-04 19:40:34 -0700 |
| commit | 09ecc7e521bd3003a4449fb8e234c3525ec81dee (patch) | |
| tree | cab3b810cd126df22269c75b98ab9c9fb10f020d | |
| parent | Merge pull request #64 from reem/fix/big-num-is-zero (diff) | |
| download | rust-openssl-09ecc7e521bd3003a4449fb8e234c3525ec81dee.tar.xz rust-openssl-09ecc7e521bd3003a4449fb8e234c3525ec81dee.zip | |
Changes made to support 0.12.0-dev ( October 2, 2014 )
| -rw-r--r-- | src/ffi.rs | 6 | ||||
| -rw-r--r-- | src/ssl/mod.rs | 2 |
2 files changed, 3 insertions, 5 deletions
@@ -171,14 +171,12 @@ pub static X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE: c_int = 45; pub static X509_V_ERR_UNSUPPORTED_NAME_SYNTAX: c_int = 53; pub static X509_V_OK: c_int = 0; -#[cfg(target_os = "macos", feature = "tlsv1_1")] -#[cfg(target_os = "macos", feature = "tlsv1_2")] +#[cfg( any( all(target_os = "macos", feature = "tlsv1_1"),all(target_os = "macos", feature = "tlsv1_2")))] #[link(name="ssl.1.0.0")] #[link(name="crypto.1.0.0")] extern {} -#[cfg(not(target_os = "macos"))] -#[cfg(target_os = "macos", not(feature = "tlsv1_1"), not(feature = "tlsv1_2"))] +#[cfg(any( not( target_os = "macos"), all(target_os = "macos", not(feature = "tlsv1_1"), not(feature = "tlsv1_2"))))] #[link(name="ssl")] #[link(name="crypto")] extern {} diff --git a/src/ssl/mod.rs b/src/ssl/mod.rs index ab467f7e..379a98cf 100644 --- a/src/ssl/mod.rs +++ b/src/ssl/mod.rs @@ -494,7 +494,7 @@ impl<S: Stream> Writer for SslStream<S> { let mut start = 0; while start < buf.len() { let ret = self.in_retry_wrapper(|ssl| { - ssl.write(buf.slice_from(start)) + ssl.write(buf.split_at(start).val1()) }); match ret { Ok(len) => start += len as uint, |