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

Pull Curl's CA list for Windows tests

This commit is contained in:
Steven Fackler 2016-10-29 18:16:45 -07:00
parent 761dd780c1
commit 23fe1e85e9
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor.yml
View File

@ -1,4 +1,5 @@
environment: environment:
SSL_CERT_FILE: "C:\\OpenSSL\\cacert.pem"
matrix: matrix:
# 1.1.0, 64/32 bit # 1.1.0, 64/32 bit
- TARGET: i686-pc-windows-gnu - TARGET: i686-pc-windows-gnu
@ -23,6 +24,7 @@ install:
# install OpenSSL # install OpenSSL
- ps: Start-FileDownload "http://slproweb.com/download/Win${env:BITS}OpenSSL-${env:OPENSSL_VERSION}.exe" - ps: Start-FileDownload "http://slproweb.com/download/Win${env:BITS}OpenSSL-${env:OPENSSL_VERSION}.exe"
- Win%BITS%OpenSSL-%OPENSSL_VERSION%.exe /SILENT /VERYSILENT /SP- /DIR="C:\OpenSSL" - Win%BITS%OpenSSL-%OPENSSL_VERSION%.exe /SILENT /VERYSILENT /SP- /DIR="C:\OpenSSL"
- ps: Start-FileDownload "https://curl.haxx.se/ca/cacert.pem" -FileName "C:\OpenSSL\cacert.pem"
# Install Rust # Install Rust
- curl -sSf -o rustup-init.exe https://win.rustup.rs/ - curl -sSf -o rustup-init.exe https://win.rustup.rs/

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

@ -7,7 +7,7 @@
//! //!
//! To connect as a client to a remote server: //! To connect as a client to a remote server:
//! //!
//! ```no_run //! ```
//! use openssl::ssl::ClientConnectorBuilder; //! use openssl::ssl::ClientConnectorBuilder;
//! use std::io::{Read, Write}; //! use std::io::{Read, Write};
//! use std::net::TcpStream; //! use std::net::TcpStream;

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

@ -1018,7 +1018,6 @@ fn refcount_ssl_context() {
} }
#[test] #[test]
#[cfg_attr(windows, ignore)] // don't have a trusted CA list easily available :(
fn default_verify_paths() { fn default_verify_paths() {
let mut ctx = SslContext::builder(SslMethod::tls()).unwrap(); let mut ctx = SslContext::builder(SslMethod::tls()).unwrap();
ctx.set_default_verify_paths().unwrap(); ctx.set_default_verify_paths().unwrap();
@ -1044,7 +1043,6 @@ fn add_extra_chain_cert() {
} }
#[test] #[test]
#[cfg_attr(windows, ignore)] // don't have a trusted CA list easily available :(
#[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))] #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))]
fn verify_valid_hostname() { fn verify_valid_hostname() {
let mut ctx = SslContext::builder(SslMethod::tls()).unwrap(); let mut ctx = SslContext::builder(SslMethod::tls()).unwrap();
@ -1068,7 +1066,6 @@ fn verify_valid_hostname() {
} }
#[test] #[test]
#[cfg_attr(windows, ignore)] // don't have a trusted CA list easily available :(
#[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))] #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))]
fn verify_invalid_hostname() { fn verify_invalid_hostname() {
let mut ctx = SslContext::builder(SslMethod::tls()).unwrap(); let mut ctx = SslContext::builder(SslMethod::tls()).unwrap();
@ -1084,7 +1081,6 @@ fn verify_invalid_hostname() {
} }
#[test] #[test]
#[cfg_attr(windows, ignore)] // don't have a trusted CA list easily available :(
fn connector_valid_hostname() { fn connector_valid_hostname() {
let connector = ClientConnectorBuilder::tls().unwrap().build(); let connector = ClientConnectorBuilder::tls().unwrap().build();
@ -1101,7 +1097,6 @@ fn connector_valid_hostname() {
} }
#[test] #[test]
#[cfg_attr(windows, ignore)] // don't have a trusted CA list easily available :(
fn connector_invalid_hostname() { fn connector_invalid_hostname() {
let connector = ClientConnectorBuilder::tls().unwrap().build(); let connector = ClientConnectorBuilder::tls().unwrap().build();