Merge branch 'breaks'

Author: sfackler

.travis.yml

@@ -8,7 +8,7 @@ before_script:
 - "./.travis/setup.sh"
 script:
 - cargo test
-- cargo test --features "uuid rustc-serialize time unix_socket serde chrono"
+- cargo test --features "uuid rustc-serialize time unix_socket serde chrono openssl"
 - cargo doc --no-deps --features "unix_socket"
 after_success:
   - test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && test $TRAVIS_RUST_VERSION == "nightly" && ./.travis/update_docs.sh

Cargo.toml

@@ -24,18 +24,19 @@ path = "tests/test.rs"
 phf_codegen = "0.7"
 
 [dependencies]
-phf = "0.7"
-openssl = "0.6"
-log = "0.3"
-rustc-serialize = "0.3"
+bufstream = "0.1"
 byteorder = "0.3"
 debug-builders = "0.1"
-bufstream = "0.1"
-uuid = { version = "0.1", optional = true }
-unix_socket = { version = "0.3", optional = true }
-time = { version = "0.1.14", optional = true }
-serde = { version = "0.3", optional = true }
+log = "0.3"
+phf = "0.7"
+rust-crypto = "0.2"
+rustc-serialize = "0.3"
 chrono = { version = "0.2.14", optional = true }
+openssl = { version = "0.6", optional = true }
+serde = { version = "0.3", optional = true }
+time = { version = "0.1.14", optional = true }
+unix_socket = { version = "0.3", optional = true }
+uuid = { version = "0.1", optional = true }
 
 [dev-dependencies]
 url = "0.2"

src/error.rs

@@ -1,7 +1,6 @@
 pub use ugh_privacy::DbError;
 
 use byteorder;
-use openssl::ssl::error::SslError;
 use phf;
 use std::error;
 use std::convert::From;
@@ -29,8 +28,8 @@ pub enum ConnectError {
     UnsupportedAuthentication,
     /// The Postgres server does not support SSL encryption.
     NoSslSupport,
-    /// There was an error initializing the SSL session.
-    SslError(SslError),
+    /// There was an error initializing the SSL session
+    SslError(Box<error::Error>),
     /// There was an error communicating with the server.
     IoError(io::Error),
     /// The server sent an unexpected response.
@@ -67,7 +66,7 @@ impl error::Error for ConnectError {
     fn cause(&self) -> Option<&error::Error> {
         match *self {
             ConnectError::DbError(ref err) => Some(err),
-            ConnectError::SslError(ref err) => Some(err),
+            ConnectError::SslError(ref err) => Some(&**err),
             ConnectError::IoError(ref err) => Some(err),
             _ => None
         }
@@ -86,12 +85,6 @@ impl From<DbError> for ConnectError {
     }
 }
 
-impl From<SslError> for ConnectError {
-    fn from(err: SslError) -> ConnectError {
-        ConnectError::SslError(err)
-    }
-}
-
 impl From<byteorder::Error> for ConnectError {
     fn from(err: byteorder::Error) -> ConnectError {
         ConnectError::IoError(From::from(err))

src/io/mod.rs

@@ -0,0 +1,27 @@
+//! Types and traits for SSL adaptors.
+pub use priv_io::Stream;
+
+use std::error::Error;
+use std::io::prelude::*;
+
+#[cfg(feature = "openssl")]
+mod openssl;
+
+/// A trait implemented by SSL adaptors.
+pub trait StreamWrapper: Read+Write+Send {
+    /// Returns a reference to the underlying `Stream`.
+    fn get_ref(&self) -> &Stream;
+
+    /// Returns a mutable reference to the underlying `Stream`.
+    fn get_mut(&mut self) -> &mut Stream;
+}
+
+/// A trait implemented by types that can negotiate SSL over a Postgres stream.
+pub trait NegotiateSsl {
+    /// Negotiates an SSL session, returning a wrapper around the provided
+    /// stream.
+    ///
+    /// The host portion of the connection parameters is provided for hostname
+    /// verification.
+    fn negotiate_ssl(&self, host: &str, stream: Stream) -> Result<Box<StreamWrapper>, Box<Error>>;
+}

src/io/openssl.rs

@@ -0,0 +1,23 @@
+extern crate openssl;
+
+use std::error::Error;
+
+use self::openssl::ssl::{SslContext, SslStream};
+use io::{StreamWrapper, Stream, NegotiateSsl};
+
+impl StreamWrapper for SslStream<Stream> {
+    fn get_ref(&self) -> &Stream {
+        self.get_ref()
+    }
+
+    fn get_mut(&mut self) -> &mut Stream {
+        self.get_mut()
+    }
+}
+
+impl NegotiateSsl for SslContext {
+    fn negotiate_ssl(&self, _: &str, stream: Stream) -> Result<Box<StreamWrapper>, Box<Error>> {
+        let stream = try!(SslStream::new(self, stream));
+        Ok(Box::new(stream))
+    }
+}