diff options
| author | Steven Fackler <[email protected]> | 2018-03-29 11:10:01 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-03-29 11:10:01 +0200 |
| commit | 14662f547eada6691547cc275130ddf67cb18d99 (patch) | |
| tree | d4964db64f67f284112a4a6f5d62b542f295d090 /openssl/src/ssl/mod.rs | |
| parent | Merge pull request #888 from sfackler/version-bumps (diff) | |
| parent | Fix a flag name (diff) | |
| download | rust-openssl-14662f547eada6691547cc275130ddf67cb18d99.tar.xz rust-openssl-14662f547eada6691547cc275130ddf67cb18d99.zip | |
Merge pull request #890 from sfackler/no-feature-cleanup
Clean up a couple of holdovers from old features
Diffstat (limited to 'openssl/src/ssl/mod.rs')
| -rw-r--r-- | openssl/src/ssl/mod.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs index f3c4ed3a..c1021b8b 100644 --- a/openssl/src/ssl/mod.rs +++ b/openssl/src/ssl/mod.rs @@ -87,7 +87,7 @@ use x509::store::{X509StoreBuilderRef, X509StoreRef}; #[cfg(any(ossl102, ossl110))] use x509::store::X509Store; #[cfg(any(ossl102, ossl110))] -use verify::X509VerifyParamRef; +use x509::verify::X509VerifyParamRef; use pkey::{HasPrivate, PKeyRef, Params, Private}; use error::ErrorStack; use ex_data::Index; @@ -1512,12 +1512,14 @@ impl SslContextBuilder { parse_cb: ParseFn, ) -> Result<(), ErrorStack> where - AddFn: Fn(&mut SslRef, ExtensionContext, Option<(usize, &X509Ref)>) -> Result<Option<T>, SslAlert> + AddFn: Fn(&mut SslRef, ExtensionContext, Option<(usize, &X509Ref)>) + -> Result<Option<T>, SslAlert> + 'static + Sync + Send, T: AsRef<[u8]> + 'static + Sync + Send, - ParseFn: Fn(&mut SslRef, ExtensionContext, &[u8], Option<(usize, &X509Ref)>) -> Result<(), SslAlert> + ParseFn: Fn(&mut SslRef, ExtensionContext, &[u8], Option<(usize, &X509Ref)>) + -> Result<(), SslAlert> + 'static + Sync + Send, |