aboutsummaryrefslogtreecommitdiff
path: root/openssl/src
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2015-06-28 10:21:06 -0700
committerSteven Fackler <[email protected]>2015-06-28 10:21:06 -0700
commit94b0f26c10e6a5862264d578e7cd47c05d252e3d (patch)
treea202211b77ad4131da0109f78725d47d311a7fb3 /openssl/src
parentDocs (diff)
downloadrust-openssl-94b0f26c10e6a5862264d578e7cd47c05d252e3d.tar.xz
rust-openssl-94b0f26c10e6a5862264d578e7cd47c05d252e3d.zip
Fix windows build
Diffstat (limited to 'openssl/src')
-rw-r--r--openssl/src/ssl/mod.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index 0bbba4c8..6d4b1f81 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -1042,6 +1042,7 @@ impl<S: Read+Write+::std::os::unix::io::AsRawFd> SslStream<S> {
impl<S: Read+Write+::std::os::windows::io::AsRawSocket> SslStream<S> {
/// Creates an SSL/TLS client operating over the provided stream.
pub fn connect<T: IntoSsl>(ssl: T, stream: S) -> Result<SslStream<S>, SslError> {
+ let ssl = try!(ssl.into_ssl());
let fd = stream.as_raw_socket() as c_int;
let stream = try!(DirectStream::connect(ssl, stream, fd));
Ok(SslStream {
@@ -1051,6 +1052,7 @@ impl<S: Read+Write+::std::os::windows::io::AsRawSocket> SslStream<S> {
/// Creates an SSL/TLS server operating over the provided stream.
pub fn accept<T: IntoSsl>(ssl: T, stream: S) -> Result<SslStream<S>, SslError> {
+ let ssl = try!(ssl.into_ssl());
let fd = stream.as_raw_socket() as c_int;
let stream = try!(DirectStream::accept(ssl, stream, fd));
Ok(SslStream {