Merge pull request #107 from sfackler/vendored

Add a vendored feature

.travis.yml

@@ -22,6 +22,3 @@ script:
     else
       cargo test;
     fi
-- if [ -z "$TEST_IOS" ]; then
-      rustdoc --test README.md -L target/debug/deps -L target/debug;
-    fi;

Cargo.toml

@@ -7,6 +7,9 @@ description = "A wrapper over a platform's native TLS implementation"
 repository = "https://github.com/sfackler/rust-native-tls"
 readme = "README.md"
 
+[features]
+vendored = ["openssl/vendored"]
+
 [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
 security-framework = "0.2.1"
 security-framework-sys = "0.2.1"
@@ -18,7 +21,7 @@ tempfile = "3.0"
 schannel = "0.1.13"
 
 [target.'cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios")))'.dependencies]
-openssl = "0.10.9"
+openssl = "0.10.11"
 openssl-sys = "0.9.30"
 openssl-probe = "0.1"
 

src/lib.rs

@@ -31,6 +31,12 @@
 //!     * Includes hostname verification for clients
 //! * Supports asynchronous I/O for both the server and the client
 //!
+//! # Cargo Features
+//!
+//! * `vendored` - If enabled, the crate will compile and statically link to a
+//!     vendored copy of OpenSSL. This feature has no effect on Windows and
+//!     macOS, where OpenSSL is not used.
+//!
 //! # Examples
 //!
 //! To connect as a client to a remote server: