aboutsummaryrefslogtreecommitdiff
path: root/openssl/src
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-10-29 18:16:45 -0700
committerSteven Fackler <[email protected]>2016-10-29 18:17:46 -0700
commit23fe1e85e96a1148da1b9bfee570880770eca3cb (patch)
tree469c8a353b972ae937f893958c39faa3f5531792 /openssl/src
parentAdd module level docs (diff)
downloadrust-openssl-23fe1e85e96a1148da1b9bfee570880770eca3cb.tar.xz
rust-openssl-23fe1e85e96a1148da1b9bfee570880770eca3cb.zip
Pull Curl's CA list for Windows tests
Diffstat (limited to 'openssl/src')
-rw-r--r--openssl/src/ssl/mod.rs2
-rw-r--r--openssl/src/ssl/tests/mod.rs5
2 files changed, 1 insertions, 6 deletions
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index ae7abea9..cd7c1426 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -7,7 +7,7 @@
//!
//! To connect as a client to a remote server:
//!
-//! ```no_run
+//! ```
//! use openssl::ssl::ClientConnectorBuilder;
//! use std::io::{Read, Write};
//! use std::net::TcpStream;
diff --git a/openssl/src/ssl/tests/mod.rs b/openssl/src/ssl/tests/mod.rs
index f98f9928..5a8067c9 100644
--- a/openssl/src/ssl/tests/mod.rs
+++ b/openssl/src/ssl/tests/mod.rs
@@ -1018,7 +1018,6 @@ fn refcount_ssl_context() {
}
#[test]
-#[cfg_attr(windows, ignore)] // don't have a trusted CA list easily available :(
fn default_verify_paths() {
let mut ctx = SslContext::builder(SslMethod::tls()).unwrap();
ctx.set_default_verify_paths().unwrap();
@@ -1044,7 +1043,6 @@ fn add_extra_chain_cert() {
}
#[test]
-#[cfg_attr(windows, ignore)] // don't have a trusted CA list easily available :(
#[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))]
fn verify_valid_hostname() {
let mut ctx = SslContext::builder(SslMethod::tls()).unwrap();
@@ -1068,7 +1066,6 @@ fn verify_valid_hostname() {
}
#[test]
-#[cfg_attr(windows, ignore)] // don't have a trusted CA list easily available :(
#[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))]
fn verify_invalid_hostname() {
let mut ctx = SslContext::builder(SslMethod::tls()).unwrap();
@@ -1084,7 +1081,6 @@ fn verify_invalid_hostname() {
}
#[test]
-#[cfg_attr(windows, ignore)] // don't have a trusted CA list easily available :(
fn connector_valid_hostname() {
let connector = ClientConnectorBuilder::tls().unwrap().build();
@@ -1101,7 +1097,6 @@ fn connector_valid_hostname() {
}
#[test]
-#[cfg_attr(windows, ignore)] // don't have a trusted CA list easily available :(
fn connector_invalid_hostname() {
let connector = ClientConnectorBuilder::tls().unwrap().build();