From 71ee9439ca52cea88e7906a8f55435b3ba455a21 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 27 Jul 2018 09:52:47 -0700
Subject: Support builds of OpenSSL from vendored source (take 2)

This is a revival of #684 to see if I can help push it across the finish line!

Closes #580
---
 openssl/Cargo.toml      | 2 ++
 openssl/src/ssl/test.rs | 6 ++++++
 2 files changed, 8 insertions(+)

(limited to 'openssl')

diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml
index b14a7d28..317918f0 100644
--- a/openssl/Cargo.toml
+++ b/openssl/Cargo.toml
@@ -16,6 +16,8 @@ v102 = []
 v110 = []
 v111 = []
 
+vendored = ['openssl-sys/vendored']
+
 [dependencies]
 bitflags = "1.0"
 cfg-if = "0.1"
diff --git a/openssl/src/ssl/test.rs b/openssl/src/ssl/test.rs
index 05938af4..08a93b97 100644
--- a/openssl/src/ssl/test.rs
+++ b/openssl/src/ssl/test.rs
@@ -775,6 +775,7 @@ fn refcount_ssl_context() {
 
 #[test]
 #[cfg_attr(libressl250, ignore)]
+#[cfg_attr(all(target_os = "macos", feature = "vendored"), ignore)]
 fn default_verify_paths() {
     let mut ctx = SslContext::builder(SslMethod::tls()).unwrap();
     ctx.set_default_verify_paths().unwrap();
@@ -804,6 +805,7 @@ fn add_extra_chain_cert() {
 
 #[test]
 #[cfg(any(ossl102, ossl110))]
+#[cfg_attr(all(target_os = "macos", feature = "vendored"), ignore)]
 fn verify_valid_hostname() {
     let mut ctx = SslContext::builder(SslMethod::tls()).unwrap();
     ctx.set_default_verify_paths().unwrap();
@@ -845,6 +847,7 @@ fn verify_invalid_hostname() {
 
 #[test]
 #[cfg_attr(libressl250, ignore)]
+#[cfg_attr(all(target_os = "macos", feature = "vendored"), ignore)]
 fn connector_valid_hostname() {
     let connector = SslConnector::builder(SslMethod::tls()).unwrap().build();
 
@@ -861,6 +864,7 @@ fn connector_valid_hostname() {
 }
 
 #[test]
+#[cfg_attr(all(target_os = "macos", feature = "vendored"), ignore)]
 fn connector_invalid_hostname() {
     let connector = SslConnector::builder(SslMethod::tls()).unwrap().build();
 
@@ -870,6 +874,7 @@ fn connector_invalid_hostname() {
 
 #[test]
 #[cfg_attr(libressl250, ignore)]
+#[cfg_attr(all(target_os = "macos", feature = "vendored"), ignore)]
 fn connector_invalid_no_hostname_verification() {
     let connector = SslConnector::builder(SslMethod::tls()).unwrap().build();
 
@@ -1202,6 +1207,7 @@ fn idle_session() {
 
 #[test]
 #[cfg_attr(libressl250, ignore)]
+#[cfg_attr(all(target_os = "macos", feature = "vendored"), ignore)]
 fn active_session() {
     let connector = SslConnector::builder(SslMethod::tls()).unwrap().build();
 
-- 
cgit v1.2.3