diff options
| author | Steven Fackler <[email protected]> | 2016-10-30 14:34:05 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2016-10-30 14:34:05 -0700 |
| commit | 7d13176cd1719dd0047c3fafad8e0fd6bbaa1711 (patch) | |
| tree | 6b6ccfd94f2fcc573684528f65dd449fa8871424 /openssl/src | |
| parent | Pass SslMethod into constructors (diff) | |
| download | rust-openssl-7d13176cd1719dd0047c3fafad8e0fd6bbaa1711.tar.xz rust-openssl-7d13176cd1719dd0047c3fafad8e0fd6bbaa1711.zip | |
Rename nwe to mozilla_intermediate
Diffstat (limited to 'openssl/src')
| -rw-r--r-- | openssl/src/ssl/connector.rs | 10 | ||||
| -rw-r--r-- | openssl/src/ssl/mod.rs | 6 | ||||
| -rw-r--r-- | openssl/src/ssl/tests/mod.rs | 3 |
3 files changed, 9 insertions, 10 deletions
diff --git a/openssl/src/ssl/connector.rs b/openssl/src/ssl/connector.rs index 794523bb..0bac87cf 100644 --- a/openssl/src/ssl/connector.rs +++ b/openssl/src/ssl/connector.rs @@ -103,11 +103,11 @@ impl ServerConnectorBuilder { /// /// The default configuration is based off of the intermediate profile of Mozilla's server side /// TLS configuration recommendations, and is subject to change. - pub fn new<I>(method: SslMethod, - private_key: &PKeyRef, - certificate: &X509Ref, - chain: I) - -> Result<ServerConnectorBuilder, ErrorStack> + pub fn mozilla_intermediate<I>(method: SslMethod, + private_key: &PKeyRef, + certificate: &X509Ref, + chain: I) + -> Result<ServerConnectorBuilder, ErrorStack> where I: IntoIterator, I::Item: AsRef<X509Ref> { diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs index f363d452..802ce8f0 100644 --- a/openssl/src/ssl/mod.rs +++ b/openssl/src/ssl/mod.rs @@ -43,10 +43,8 @@ //! let pkcs12 = Pkcs12::from_der(&pkcs12).unwrap(); //! let identity = pkcs12.parse("password123").unwrap(); //! -//! let connector = ServerConnectorBuilder::new(SslMethod::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); diff --git a/openssl/src/ssl/tests/mod.rs b/openssl/src/ssl/tests/mod.rs index 5e5d8988..0c0c7957 100644 --- a/openssl/src/ssl/tests/mod.rs +++ b/openssl/src/ssl/tests/mod.rs @@ -1112,7 +1112,8 @@ fn connector_client_server() { let t = thread::spawn(move || { let key = PKey::private_key_from_pem(KEY).unwrap(); let cert = X509::from_pem(CERT).unwrap(); - let connector = ServerConnectorBuilder::new(SslMethod::tls(), &key, &cert, None::<X509>) + let connector = ServerConnectorBuilder::mozilla_intermediate( + SslMethod::tls(), &key, &cert, None::<X509>) .unwrap() .build(); let stream = listener.accept().unwrap().0; |