diff options
| author | Steven Fackler <[email protected]> | 2016-10-30 14:26:28 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2016-10-30 14:26:28 -0700 |
| commit | 43b430e5b0723784862fb090ef091bc404542989 (patch) | |
| tree | dca400888bfabd951c4ad348fa08963ad3df21e3 /openssl/src/ssl/mod.rs | |
| parent | Merge pull request #503 from sfackler/ecdhe (diff) | |
| download | rust-openssl-43b430e5b0723784862fb090ef091bc404542989.tar.xz rust-openssl-43b430e5b0723784862fb090ef091bc404542989.zip | |
Pass SslMethod into constructors
Diffstat (limited to 'openssl/src/ssl/mod.rs')
| -rw-r--r-- | openssl/src/ssl/mod.rs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs index ffcc61ab..f363d452 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,10 @@ //! 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::new(SslMethod::tls(), +//! &identity.pkey, +//! &identity.cert, +//! &identity.chain) //! .unwrap() //! .build(); //! let connector = Arc::new(connector); |