min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tests

This commit is contained in:
Steven Fackler 2017-12-25 20:11:38 -07:00
parent 69652d5dad
commit 7d0c6c9442
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openssl/src/ssl/connector.rs
View File

@ -378,9 +378,9 @@ impl DerefMut for SslAcceptorBuilder {
#[cfg(ossl101)] #[cfg(ossl101)]
fn setup_curves(ctx: &mut SslContextBuilder) -> Result<(), ErrorStack> { fn setup_curves(ctx: &mut SslContextBuilder) -> Result<(), ErrorStack> {
use ec::EcKey; use ec::EcKey;
use nid; use nid::Nid;
let curve = EcKey::from_curve_name(nid::X9_62_PRIME256V1)?; let curve = EcKey::from_curve_name(Nid::X9_62_PRIME256V1)?;
ctx.set_tmp_ecdh(&curve) ctx.set_tmp_ecdh(&curve)
} }
@ -419,7 +419,7 @@ fn setup_verify(ctx: &mut SslContextBuilder) {
#[cfg(ossl101)] #[cfg(ossl101)]
fn setup_verify(ctx: &mut SslContextBuilder) { fn setup_verify(ctx: &mut SslContextBuilder) {
ctx.set_verify_callback(SSL_VERIFY_PEER, |p, x509| { ctx.set_verify_callback(SslVerifyMode::PEER, |p, x509| {
let hostname = match x509.ssl() { let hostname = match x509.ssl() {
Ok(Some(ssl)) => ssl.ex_data(*HOSTNAME_IDX), Ok(Some(ssl)) => ssl.ex_data(*HOSTNAME_IDX),
_ => None, _ => None,
@ -453,7 +453,7 @@ mod verify {
use std::net::IpAddr; use std::net::IpAddr;
use std::str; use std::str;
use nid; use nid::Nid;
use x509::{GeneralName, X509NameRef, X509Ref, X509StoreContextRef}; use x509::{GeneralName, X509NameRef, X509Ref, X509StoreContextRef};
use stack::Stack; use stack::Stack;
@ -505,7 +505,7 @@ mod verify {
} }
fn verify_subject_name(domain: &str, subject_name: &X509NameRef) -> bool { fn verify_subject_name(domain: &str, subject_name: &X509NameRef) -> bool {
match subject_name.entries_by_nid(nid::COMMONNAME).next() { match subject_name.entries_by_nid(Nid::COMMONNAME).next() {
Some(pattern) => { Some(pattern) => {
let pattern = match str::from_utf8(pattern.data().as_slice()) { let pattern = match str::from_utf8(pattern.data().as_slice()) {
Ok(pattern) => pattern, Ok(pattern) => pattern,

4
openssl/src/ssl/mod.rs
View File

@ -212,9 +212,9 @@ bitflags! {
/// Only support TLSv1.2: /// Only support TLSv1.2:
/// ///
/// ```rust /// ```rust
/// use openssl::ssl::{SSL_OP_NO_SSL_MASK, SSL_OP_NO_TLSV1_2}; /// use openssl::ssl::SslOptions;
/// ///
/// let options = SSL_OP_NO_SSL_MASK & !SSL_OP_NO_TLSV1_2; /// let options = SslOptions::NO_SSL_MASK & !SslOptions::NO_TLSV1_2;
/// ``` /// ```
#[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))] #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))]
const NO_SSL_MASK = ffi::SSL_OP_NO_SSL_MASK; const NO_SSL_MASK = ffi::SSL_OP_NO_SSL_MASK;

14
openssl/src/ssl/tests/mod.rs
View File

@ -22,7 +22,7 @@ use ssl::{Error, HandshakeError, ShutdownResult, Ssl, SslAcceptorBuilder, SslCon
SslContext, SslMethod, SslStream, SslVerifyMode, StatusType}; SslContext, SslMethod, SslStream, SslVerifyMode, StatusType};
use x509::{X509, X509Filetype, X509Name, X509StoreContext}; use x509::{X509, X509Filetype, X509Name, X509StoreContext};
#[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))] #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))]
use x509::verify::X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS; use x509::verify::X509CheckFlags;
use pkey::PKey; use pkey::PKey;
use std::net::UdpSocket; use std::net::UdpSocket;
@ -989,7 +989,7 @@ fn verify_valid_hostname() {
let mut ssl = Ssl::new(&ctx.build()).unwrap(); let mut ssl = Ssl::new(&ctx.build()).unwrap();
ssl.param_mut() ssl.param_mut()
.set_hostflags(X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS); .set_hostflags(X509CheckFlags::NO_PARTIAL_WILDCARDS);
ssl.param_mut().set_host("google.com").unwrap(); ssl.param_mut().set_host("google.com").unwrap();
let s = TcpStream::connect("google.com:443").unwrap(); let s = TcpStream::connect("google.com:443").unwrap();
@ -1013,7 +1013,7 @@ fn verify_invalid_hostname() {
let mut ssl = Ssl::new(&ctx.build()).unwrap(); let mut ssl = Ssl::new(&ctx.build()).unwrap();
ssl.param_mut() ssl.param_mut()
.set_hostflags(X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS); .set_hostflags(X509CheckFlags::NO_PARTIAL_WILDCARDS);
ssl.param_mut().set_host("foobar.com").unwrap(); ssl.param_mut().set_host("foobar.com").unwrap();
let s = TcpStream::connect("google.com:443").unwrap(); let s = TcpStream::connect("google.com:443").unwrap();
@ -1247,7 +1247,7 @@ fn tmp_dh_callback() {
all(feature = "v102", ossl102)))] all(feature = "v102", ossl102)))]
fn tmp_ecdh_callback() { fn tmp_ecdh_callback() {
use ec::EcKey; use ec::EcKey;
use nid; use nid::Nid;
static CALLED_BACK: AtomicBool = ATOMIC_BOOL_INIT; static CALLED_BACK: AtomicBool = ATOMIC_BOOL_INIT;
@ -1263,7 +1263,7 @@ fn tmp_ecdh_callback() {
.unwrap(); .unwrap();
ctx.set_tmp_ecdh_callback(|_, _, _| { ctx.set_tmp_ecdh_callback(|_, _, _| {
CALLED_BACK.store(true, Ordering::SeqCst); CALLED_BACK.store(true, Ordering::SeqCst);
EcKey::new_by_curve_name(nid::X9_62_PRIME256V1) EcKey::new_by_curve_name(Nid::X9_62_PRIME256V1)
}); });
let ssl = Ssl::new(&ctx.build()).unwrap(); let ssl = Ssl::new(&ctx.build()).unwrap();
ssl.accept(stream).unwrap(); ssl.accept(stream).unwrap();
@ -1315,7 +1315,7 @@ fn tmp_dh_callback_ssl() {
all(feature = "v102", ossl102)))] all(feature = "v102", ossl102)))]
fn tmp_ecdh_callback_ssl() { fn tmp_ecdh_callback_ssl() {
use ec::EcKey; use ec::EcKey;
use nid; use nid::Nid;
static CALLED_BACK: AtomicBool = ATOMIC_BOOL_INIT; static CALLED_BACK: AtomicBool = ATOMIC_BOOL_INIT;
@ -1332,7 +1332,7 @@ fn tmp_ecdh_callback_ssl() {
let mut ssl = Ssl::new(&ctx.build()).unwrap(); let mut ssl = Ssl::new(&ctx.build()).unwrap();
ssl.set_tmp_ecdh_callback(|_, _, _| { ssl.set_tmp_ecdh_callback(|_, _, _| {
CALLED_BACK.store(true, Ordering::SeqCst); CALLED_BACK.store(true, Ordering::SeqCst);
EcKey::new_by_curve_name(nid::X9_62_PRIME256V1) EcKey::new_by_curve_name(Nid::X9_62_PRIME256V1)
}); });
ssl.accept(stream).unwrap(); ssl.accept(stream).unwrap();
}); });