Commit 2453c0f9 authored by Steven Fackler's avatar Steven Fackler
Browse files

Fix npn feature

parent 36c90bb2

openssl/src/ssl/mod.rs

+4 −0
Original line number Diff line number Diff line
@@ -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;

openssl/src/ssl/tests.rs

+6 −0
Original line number Diff line number Diff line
@@ -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() {