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

chore(net): Upgrading to latest rust openssl 0.6.0

Browse Source
This commit is contained in:
Markus Kobler
2015-04-06 16:04:19 +01:00
parent 7d9bab784d
commit 660a362b68
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/net.rs
View File

@@ -7,8 +7,7 @@ use std::mem;
use std::path::Path; use std::path::Path;
use std::sync::Arc; use std::sync::Arc;
use openssl::ssl::{Ssl, SslStream, SslContext}; use openssl::ssl::{Ssl, SslStream, SslContext, SSL_VERIFY_NONE};
use openssl::ssl::SslVerifyMode::SslVerifyNone;
use openssl::ssl::SslMethod::Sslv23; use openssl::ssl::SslMethod::Sslv23;
use openssl::ssl::error::{SslError, StreamError, OpenSslErrors, SslSessionClosed}; use openssl::ssl::error::{SslError, StreamError, OpenSslErrors, SslSessionClosed};
use openssl::x509::X509FileType; use openssl::x509::X509FileType;
@@ -16,13 +15,6 @@ use openssl::x509::X509FileType;
use typeable::Typeable; use typeable::Typeable;
use {traitobject}; use {traitobject};
macro_rules! try_some {
($expr:expr) => (match $expr {
Some(val) => { return Err(val); },
_ => {}
})
}
/// The write-status indicating headers have not been written. /// The write-status indicating headers have not been written.
pub enum Fresh {} pub enum Fresh {}
@@ -180,12 +172,10 @@ impl HttpListener {
/// Start listening to an address over HTTPS. /// Start listening to an address over HTTPS.
pub fn https<To: ToSocketAddrs>(addr: To, cert: &Path, key: &Path) -> io::Result<HttpListener> { pub fn https<To: ToSocketAddrs>(addr: To, cert: &Path, key: &Path) -> io::Result<HttpListener> {
let mut ssl_context = try!(SslContext::new(Sslv23).map_err(lift_ssl_error)); let mut ssl_context = try!(SslContext::new(Sslv23).map_err(lift_ssl_error));
try_some!(ssl_context.set_cipher_list("DEFAULT").map(lift_ssl_error)); try!(ssl_context.set_cipher_list("DEFAULT").map_err(lift_ssl_error));
try_some!(ssl_context.set_certificate_file( try!(ssl_context.set_certificate_file(cert, X509FileType::PEM).map_err(lift_ssl_error));
cert, X509FileType::PEM).map(lift_ssl_error)); try!(ssl_context.set_private_key_file(key, X509FileType::PEM).map_err(lift_ssl_error));
try_some!(ssl_context.set_private_key_file( ssl_context.set_verify(SSL_VERIFY_NONE, None);
key, X509FileType::PEM).map(lift_ssl_error));
ssl_context.set_verify(SslVerifyNone, None);
Ok(HttpListener::Https(try!(TcpListener::bind(addr)), Arc::new(ssl_context))) Ok(HttpListener::Https(try!(TcpListener::bind(addr)), Arc::new(ssl_context)))
} }
} }