dnim/rust-postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reexport openssl in tokio-postgres as well

Browse Source
This commit is contained in:
Steven Fackler 2017-05-01 22:09:50 -07:00
parent f990e9c112
commit 1352f32421
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tokio-postgres/src/lib.rs
View File

@ -69,11 +69,6 @@ extern crate futures;
#[cfg(unix)]
extern crate tokio_uds;
#[cfg(feature = "tokio-openssl")]
extern crate tokio_openssl;
#[cfg(feature = "openssl")]
extern crate openssl;
use fallible_iterator::FallibleIterator;
use futures::{Future, IntoFuture, BoxFuture, Stream, Sink, Poll, StartSend, Async};
use futures::future::Either;

2
tokio-postgres/src/test.rs
View File

@ -214,7 +214,7 @@ fn ssl_user_ssl_required() {
#[cfg(feature = "with-openssl")]
#[test]
fn openssl_required() {
use openssl::ssl::{SslMethod, SslConnectorBuilder};
use tls::openssl::openssl::ssl::{SslMethod, SslConnectorBuilder};
use tls::openssl::OpenSsl;
let mut builder = SslConnectorBuilder::new(SslMethod::tls()).unwrap();

8
tokio-postgres/src/tls/openssl.rs
View File

@ -1,10 +1,12 @@
//! OpenSSL support.
extern crate tokio_openssl;
pub extern crate openssl;
use futures::{Future, BoxFuture};
use openssl::ssl::{SslMethod, SslConnector, SslConnectorBuilder};
use openssl::error::ErrorStack;
use self::openssl::ssl::{SslMethod, SslConnector, SslConnectorBuilder};
use self::openssl::error::ErrorStack;
use std::error::Error;
use tokio_openssl::{SslConnectorExt, SslStream};
use self::tokio_openssl::{SslConnectorExt, SslStream};
use tls::{Stream, TlsStream, Handshake};