aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ssl/tests
diff options
context:
space:
mode:
authorBenjamin Fry <[email protected]>2017-01-22 22:24:45 -0800
committerBenjamin Fry <[email protected]>2017-01-22 22:24:45 -0800
commit225552b823dba58cc2d7f17f86d92e3dcedb3138 (patch)
treec07cd74fdc73fd59fd84f9974c50b7318c8b9654 /openssl/src/ssl/tests
parentadd some documentation (diff)
parentMerge pull request #550 from Keruspe/master (diff)
downloadrust-openssl-225552b823dba58cc2d7f17f86d92e3dcedb3138.tar.xz
rust-openssl-225552b823dba58cc2d7f17f86d92e3dcedb3138.zip
Merge branch 'master' of github.com:sfackler/rust-openssl
Diffstat (limited to 'openssl/src/ssl/tests')
-rw-r--r--openssl/src/ssl/tests/mod.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/openssl/src/ssl/tests/mod.rs b/openssl/src/ssl/tests/mod.rs
index 349c7a4d..536088ab 100644
--- a/openssl/src/ssl/tests/mod.rs
+++ b/openssl/src/ssl/tests/mod.rs
@@ -100,6 +100,7 @@ impl Server {
Server::new_tcp(&["-www"])
}
+ #[allow(dead_code)]
fn new_alpn() -> (Server, TcpStream) {
Server::new_tcp(&["-www",
"-nextprotoneg",
@@ -1428,7 +1429,7 @@ fn status_callbacks() {
let response = OcspResponse::from_der(ssl.ocsp_status().unwrap()).unwrap();
assert_eq!(response.status(), RESPONSE_STATUS_UNAUTHORIZED);
Ok(true)
- });
+ }).unwrap();
let mut ssl = Ssl::new(&ctx.build()).unwrap();
ssl.set_status_type(STATUS_TYPE_OCSP).unwrap();
ssl.connect(stream).unwrap();