diff options
| author | Manuel Schölling <[email protected]> | 2015-03-15 15:52:09 +0100 |
|---|---|---|
| committer | Manuel Schölling <[email protected]> | 2015-04-06 12:23:11 +0200 |
| commit | dbef985e328f97905ce58ef14914100bd7e55e62 (patch) | |
| tree | 3b73290978d74ef74181267b73819e49613dcb67 /openssl/src/ssl/tests.rs | |
| parent | Use latest OpenSSL version in travis tests and more verbose error message in ... (diff) | |
| download | rust-openssl-dbef985e328f97905ce58ef14914100bd7e55e62.tar.xz rust-openssl-dbef985e328f97905ce58ef14914100bd7e55e62.zip | |
Move connected_socket to its own crate and fix SSL_CTX_set_read_ahead()
Diffstat (limited to 'openssl/src/ssl/tests.rs')
| -rw-r--r-- | openssl/src/ssl/tests.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/openssl/src/ssl/tests.rs b/openssl/src/ssl/tests.rs index fd587e30..d1a91500 100644 --- a/openssl/src/ssl/tests.rs +++ b/openssl/src/ssl/tests.rs @@ -14,8 +14,6 @@ use crypto::hash::Type::{SHA256}; use ssl; use ssl::SslMethod; use ssl::SslMethod::Sslv23; -#[cfg(feature="dtlsv1")] -use ssl::SslMethod::Dtlsv1; use ssl::{SslContext, SslStream, VerifyCallback}; use ssl::SSL_VERIFY_PEER; use x509::X509StoreContext; @@ -29,7 +27,10 @@ use ssl::connected_socket::Connect; #[cfg(feature="dtlsv1")] use std::net::UdpSocket; -const PROTOCOL:SslMethod = Sslv23; +#[cfg(feature="dtlsv1")] +use ssl::SslMethod::Dtlsv1; +#[cfg(feature="dtlsv1")] +use connected_socket::Connect; #[cfg(test)] mod udp { @@ -61,7 +62,8 @@ macro_rules! run_test( use ssl; use ssl::SslMethod; use ssl::{SslContext, SslStream, VerifyCallback}; - use ssl::connected_socket::Connect; + #[cfg(feature="dtlsv1")] + use connected_socket::Connect; use ssl::SslVerifyMode::SSL_VERIFY_PEER; use crypto::hash::Type::SHA256; use x509::X509StoreContext; @@ -319,7 +321,6 @@ fn test_read() { io::copy(&mut stream, &mut io::sink()).ok().expect("read error"); } - /// Tests that connecting with the client using NPN, but the server not does not /// break the existing connection behavior. #[test] |