aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ssl/tests/mod.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-10-31 20:54:34 -0700
committerSteven Fackler <[email protected]>2016-10-31 20:54:34 -0700
commitcd7fa9fca29296adebe37dfc20d3cebc96010534 (patch)
tree7193bf2b06709e07f4adc4b08f7ec334121d89ab /openssl/src/ssl/tests/mod.rs
parentUpdate ssl (diff)
downloadrust-openssl-cd7fa9fca29296adebe37dfc20d3cebc96010534.tar.xz
rust-openssl-cd7fa9fca29296adebe37dfc20d3cebc96010534.zip
Update x509
Diffstat (limited to 'openssl/src/ssl/tests/mod.rs')
-rw-r--r--openssl/src/ssl/tests/mod.rs23
1 files changed, 3 insertions, 20 deletions
diff --git a/openssl/src/ssl/tests/mod.rs b/openssl/src/ssl/tests/mod.rs
index a874fe3b..13b3a8a7 100644
--- a/openssl/src/ssl/tests/mod.rs
+++ b/openssl/src/ssl/tests/mod.rs
@@ -20,7 +20,7 @@ use ssl::SSL_VERIFY_PEER;
use ssl::{SslMethod, HandshakeError};
use ssl::{SslContext, SslStream, Ssl, ShutdownResult, SslConnectorBuilder, SslAcceptorBuilder,
Error};
-use x509::X509StoreContextRef;
+use x509::X509StoreContext;
use x509::X509FileType;
use x509::X509;
#[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))]
@@ -171,8 +171,9 @@ macro_rules! run_test(
use ssl::{SslContext, Ssl, SslStream};
use ssl::SSL_VERIFY_PEER;
use hash::MessageDigest;
- use x509::X509StoreContextRef;
+ use x509::X509StoreContext;
use serialize::hex::FromHex;
+ use types::Ref;
use super::Server;
#[test]
@@ -771,24 +772,6 @@ fn test_alpn_server_select_none() {
assert!(Ssl::new(&ctx.build()).unwrap().connect(stream).is_err());
}
-#[cfg(test)]
-mod dtlsv1 {
- use serialize::hex::FromHex;
- use std::net::TcpStream;
- use std::thread;
-
- use hash::MessageDigest;
- use ssl::SslMethod;
- use ssl::{SslContext, SslStream};
- use ssl::SSL_VERIFY_PEER;
- use x509::X509StoreContextRef;
-
- #[test]
- fn test_new_ctx() {
- SslContext::builder(SslMethod::dtls()).unwrap();
- }
-}
-
#[test]
#[cfg_attr(any(windows, target_arch = "arm"), ignore)] // FIXME(#467)
fn test_read_dtlsv1() {