forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #616 from hyperium/ssl-direct-streams

Browse Source 
refactor(ssl): use openssl::DirectStreams
This commit is contained in:
Sean McArthur
2015-07-23 13:30:52 -07:00
parent da817ba8bf 71db6a46c0
commit aa09034d2c
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -29,7 +29,7 @@ version = "0.1"
default-features = false default-features = false
[dependencies.openssl] [dependencies.openssl]
version = "0.6" version = "0.6.4"
optional = true optional = true
[dependencies.solicit] [dependencies.solicit]

21
src/net.rs
View File

@@ -202,6 +202,20 @@ impl Write for HttpStream {
} }
} }
#[cfg(windows)]
impl ::std::os::windows::io::AsRawSocket for HttpStream {
fn as_raw_socket(&self) -> ::std::os::windows::io::RawSocket {
self.0.as_raw_socket()
}
}
#[cfg(unix)]
impl ::std::os::unix::io::AsRawFd for HttpStream {
fn as_raw_fd(&self) -> i32 {
self.0.as_raw_fd()
}
}
impl NetworkStream for HttpStream { impl NetworkStream for HttpStream {
#[inline] #[inline]
fn peer_addr(&mut self) -> io::Result<SocketAddr> { fn peer_addr(&mut self) -> io::Result<SocketAddr> {
@@ -439,16 +453,13 @@ mod openssl {
type Stream = SslStream<HttpStream>; type Stream = SslStream<HttpStream>;
fn wrap_client(&self, stream: HttpStream, host: &str) -> ::Result<Self::Stream> { fn wrap_client(&self, stream: HttpStream, host: &str) -> ::Result<Self::Stream> {
//if let Some(ref verifier) = self.verifier {
// verifier(&mut context);
//}
let ssl = try!(Ssl::new(&self.context)); let ssl = try!(Ssl::new(&self.context));
try!(ssl.set_hostname(host)); try!(ssl.set_hostname(host));
SslStream::new_from(ssl, stream).map_err(From::from) SslStream::connect(ssl, stream).map_err(From::from)
} }
fn wrap_server(&self, stream: HttpStream) -> ::Result<Self::Stream> { fn wrap_server(&self, stream: HttpStream) -> ::Result<Self::Stream> {
match SslStream::new_server(&self.context, stream) { match SslStream::accept(&*self.context, stream) {
Ok(ssl_stream) => Ok(ssl_stream), Ok(ssl_stream) => Ok(ssl_stream),
Err(SslIoError(e)) => { Err(SslIoError(e)) => {
Err(io::Error::new(io::ErrorKind::ConnectionAborted, e).into()) Err(io::Error::new(io::ErrorKind::ConnectionAborted, e).into())