aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ssl/callbacks.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2018-02-16 21:26:23 -0800
committerSteven Fackler <[email protected]>2018-02-16 21:31:09 -0800
commit4dffa0c33fc1cc938bbf4fd3b654f7e6f3ce789a (patch)
tree127d24fce62f506a47789fe0d0fad4e6722025f2 /openssl/src/ssl/callbacks.rs
parentMerge pull request #842 from nyradr/Documentation_fix_openssl_symm (diff)
downloadrust-openssl-4dffa0c33fc1cc938bbf4fd3b654f7e6f3ce789a.tar.xz
rust-openssl-4dffa0c33fc1cc938bbf4fd3b654f7e6f3ce789a.zip
SSL session callbacks have always been around
Diffstat (limited to 'openssl/src/ssl/callbacks.rs')
-rw-r--r--openssl/src/ssl/callbacks.rs6
1 files changed, 1 insertions, 5 deletions
diff --git a/openssl/src/ssl/callbacks.rs b/openssl/src/ssl/callbacks.rs
index 0a38952b..b11cac7e 100644
--- a/openssl/src/ssl/callbacks.rs
+++ b/openssl/src/ssl/callbacks.rs
@@ -5,7 +5,6 @@ use std::ptr;
use std::slice;
use std::mem;
use foreign_types::ForeignTypeRef;
-#[cfg(any(all(feature = "v110", ossl110), all(feature = "v111", ossl111)))]
use foreign_types::ForeignType;
use error::ErrorStack;
@@ -13,12 +12,10 @@ use dh::Dh;
#[cfg(any(all(feature = "v101", ossl101), all(feature = "v102", ossl102)))]
use ec::EcKey;
use pkey::Params;
-use ssl::{get_callback_idx, get_ssl_callback_idx, SniError, SslAlert, SslRef};
+use ssl::{get_callback_idx, get_ssl_callback_idx, SniError, SslAlert, SslRef, SslSession};
#[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110),
all(feature = "v111", ossl111)))]
use ssl::AlpnError;
-#[cfg(any(all(feature = "v110", ossl110), all(feature = "v111", ossl111)))]
-use ssl::SslSession;
use x509::X509StoreContextRef;
pub extern "C" fn raw_verify<F>(preverify_ok: c_int, x509_ctx: *mut ffi::X509_STORE_CTX) -> c_int
@@ -279,7 +276,6 @@ where
}
}
-#[cfg(any(all(feature = "v110", ossl110), all(feature = "v111", ossl111)))]
pub unsafe extern "C" fn raw_new_session<F>(
ssl: *mut ffi::SSL,
session: *mut ffi::SSL_SESSION,