diff options
| author | Steven Fackler <[email protected]> | 2016-10-30 15:59:56 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-10-30 15:59:56 -0700 |
| commit | fb6052d288dfaca4015a64337fcecff571e8c96e (patch) | |
| tree | b78975836135254e185d119c05c87ee8b56ac9e3 /openssl/src/ssl/mod.rs | |
| parent | Merge pull request #503 from sfackler/ecdhe (diff) | |
| parent | Update docs (diff) | |
| download | rust-openssl-fb6052d288dfaca4015a64337fcecff571e8c96e.tar.xz rust-openssl-fb6052d288dfaca4015a64337fcecff571e8c96e.zip | |
Merge pull request #504 from sfackler/connector-tweaks
Connector tweaks
Diffstat (limited to 'openssl/src/ssl/mod.rs')
| -rw-r--r-- | openssl/src/ssl/mod.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs index ffcc61ab..802ce8f0 100644 --- a/openssl/src/ssl/mod.rs +++ b/openssl/src/ssl/mod.rs @@ -8,11 +8,11 @@ //! To connect as a client to a remote server: //! //! ``` -//! use openssl::ssl::ClientConnectorBuilder; +//! use openssl::ssl::{SslMethod, ClientConnectorBuilder}; //! use std::io::{Read, Write}; //! use std::net::TcpStream; //! -//! let connector = ClientConnectorBuilder::tls().unwrap().build(); +//! let connector = ClientConnectorBuilder::new(SslMethod::tls()).unwrap().build(); //! //! let stream = TcpStream::connect("google.com:443").unwrap(); //! let mut stream = connector.connect("google.com", stream).unwrap(); @@ -27,7 +27,7 @@ //! //! ```no_run //! use openssl::pkcs12::Pkcs12; -//! use openssl::ssl::{ServerConnectorBuilder, SslStream}; +//! use openssl::ssl::{SslMethod, ServerConnectorBuilder, SslStream}; //! use std::fs::File; //! use std::io::{Read, Write}; //! use std::net::{TcpListener, TcpStream}; @@ -43,7 +43,8 @@ //! let pkcs12 = Pkcs12::from_der(&pkcs12).unwrap(); //! let identity = pkcs12.parse("password123").unwrap(); //! -//! let connector = ServerConnectorBuilder::tls(&identity.pkey, &identity.cert, &identity.chain) +//! let connector = ServerConnectorBuilder::mozilla_intermediate( +//! SslMethod::tls(), &identity.pkey, &identity.cert, &identity.chain) //! .unwrap() //! .build(); //! let connector = Arc::new(connector); |