aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ssl/tests/mod.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-10-30 14:26:28 -0700
committerSteven Fackler <[email protected]>2016-10-30 14:26:28 -0700
commit43b430e5b0723784862fb090ef091bc404542989 (patch)
treedca400888bfabd951c4ad348fa08963ad3df21e3 /openssl/src/ssl/tests/mod.rs
parentMerge pull request #503 from sfackler/ecdhe (diff)
downloadrust-openssl-43b430e5b0723784862fb090ef091bc404542989.tar.xz
rust-openssl-43b430e5b0723784862fb090ef091bc404542989.zip
Pass SslMethod into constructors
Diffstat (limited to 'openssl/src/ssl/tests/mod.rs')
-rw-r--r--openssl/src/ssl/tests/mod.rs10
1 files changed, 6 insertions, 4 deletions
diff --git a/openssl/src/ssl/tests/mod.rs b/openssl/src/ssl/tests/mod.rs
index 5a8067c9..5e5d8988 100644
--- a/openssl/src/ssl/tests/mod.rs
+++ b/openssl/src/ssl/tests/mod.rs
@@ -1082,7 +1082,7 @@ fn verify_invalid_hostname() {
#[test]
fn connector_valid_hostname() {
- let connector = ClientConnectorBuilder::tls().unwrap().build();
+ let connector = ClientConnectorBuilder::new(SslMethod::tls()).unwrap().build();
let s = TcpStream::connect("google.com:443").unwrap();
let mut socket = connector.connect("google.com", s).unwrap();
@@ -1098,7 +1098,7 @@ fn connector_valid_hostname() {
#[test]
fn connector_invalid_hostname() {
- let connector = ClientConnectorBuilder::tls().unwrap().build();
+ let connector = ClientConnectorBuilder::new(SslMethod::tls()).unwrap().build();
let s = TcpStream::connect("google.com:443").unwrap();
assert!(connector.connect("foobar.com", s).is_err());
@@ -1112,14 +1112,16 @@ 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::tls(&key, &cert, None::<X509>).unwrap().build();
+ let connector = ServerConnectorBuilder::new(SslMethod::tls(), &key, &cert, None::<X509>)
+ .unwrap()
+ .build();
let stream = listener.accept().unwrap().0;
let mut stream = connector.connect(stream).unwrap();
stream.write_all(b"hello").unwrap();
});
- let mut connector = ClientConnectorBuilder::tls().unwrap();
+ let mut connector = ClientConnectorBuilder::new(SslMethod::tls()).unwrap();
connector.context_mut().set_CA_file("test/root-ca.pem").unwrap();
let connector = connector.build();