diff options
| author | Steven Fackler <[email protected]> | 2018-02-16 22:37:14 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-02-16 22:37:14 -0800 |
| commit | b1e7bf4d54365bd53a19992f4089153b0d3b76a8 (patch) | |
| tree | fcc78f8952afb73d53450ae62ae3c5142428785b /openssl/src/ssl/test.rs | |
| parent | Merge pull request #842 from nyradr/Documentation_fix_openssl_symm (diff) | |
| parent | Fix libressl (diff) | |
| download | rust-openssl-b1e7bf4d54365bd53a19992f4089153b0d3b76a8.tar.xz rust-openssl-b1e7bf4d54365bd53a19992f4089153b0d3b76a8.zip | |
Merge pull request #843 from sfackler/session-callback-2
Session callback 2
Diffstat (limited to 'openssl/src/ssl/test.rs')
| -rw-r--r-- | openssl/src/ssl/test.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/openssl/src/ssl/test.rs b/openssl/src/ssl/test.rs index 17bc37d9..1913d835 100644 --- a/openssl/src/ssl/test.rs +++ b/openssl/src/ssl/test.rs @@ -19,9 +19,7 @@ use hash::MessageDigest; use ocsp::{OcspResponse, OcspResponseStatus}; use ssl; use ssl::{Error, HandshakeError, ShutdownResult, Ssl, SslAcceptor, SslConnector, SslContext, - SslFiletype, SslMethod, SslStream, SslVerifyMode, StatusType}; -#[cfg(any(all(feature = "v110", ossl110), all(feature = "v111", ossl111)))] -use ssl::SslSessionCacheMode; + SslFiletype, SslMethod, SslSessionCacheMode, SslStream, SslVerifyMode, StatusType}; use x509::{X509, X509Name, X509StoreContext, X509VerifyResult}; #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110), all(feature = "v111", ossl111)))] @@ -1248,7 +1246,6 @@ fn status_callbacks() { } #[test] -#[cfg(any(all(feature = "v110", ossl110), all(feature = "v111", ossl111)))] fn new_session_callback() { static CALLED_BACK: AtomicBool = ATOMIC_BOOL_INIT; |