diff options
| author | Steven Fackler <[email protected]> | 2015-03-25 22:02:14 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2015-03-25 22:02:14 -0700 |
| commit | 2453c0f96c18530e8d0326a0585b678717f2f043 (patch) | |
| tree | 159ea9b2480464fe8df6673c98308e6b38fef4d1 /openssl/src | |
| parent | Fix deprecation warnings (diff) | |
| download | rust-openssl-2453c0f96c18530e8d0326a0585b678717f2f043.tar.xz rust-openssl-2453c0f96c18530e8d0326a0585b678717f2f043.zip | |
Fix npn feature
Diffstat (limited to 'openssl/src')
| -rw-r--r-- | openssl/src/ssl/mod.rs | 4 | ||||
| -rw-r--r-- | openssl/src/ssl/tests.rs | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs index 0763c207..aa3d5280 100644 --- a/openssl/src/ssl/mod.rs +++ b/openssl/src/ssl/mod.rs @@ -13,6 +13,10 @@ use std::ptr; use std::sync::{Once, ONCE_INIT, Arc}; use std::ops::{Deref, DerefMut}; use std::cmp; +#[cfg(feature = "npn")] +use libc::{c_uchar, c_uint}; +#[cfg(feature = "npn")] +use std::slice; use bio::{MemBio}; use ffi; diff --git a/openssl/src/ssl/tests.rs b/openssl/src/ssl/tests.rs index 3000dae0..5322ebde 100644 --- a/openssl/src/ssl/tests.rs +++ b/openssl/src/ssl/tests.rs @@ -3,6 +3,10 @@ use std::net::TcpStream; use std::io; use std::io::prelude::*; use std::path::Path; +#[cfg(feature = "npn")] +use std::net::TcpListener; +#[cfg(feature = "npn")] +use std::thread; use crypto::hash::Type::{SHA256}; use ssl; @@ -10,6 +14,8 @@ use ssl::SslMethod::Sslv23; use ssl::{SslContext, SslStream, VerifyCallback}; use ssl::SslVerifyMode::SslVerifyPeer; use x509::X509StoreContext; +#[cfg(feature = "npn")] +use x509::X509FileType; #[test] fn test_new_ctx() { |