Merge branch 'release-v0.6.7' into releasev0.6.7

5 files changed, 23 insertions, 9 deletions

diff --git a/openssl-sys/Cargo.toml b/openssl-sys/Cargo.toml
index b13fc80a..045e15eb 100644
--- a/openssl-sys/Cargo.toml
+++ b/openssl-sys/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "openssl-sys"
-version = "0.6.6"
+version = "0.6.7"
 authors = ["Alex Crichton <[email protected]>",
            "Steven Fackler <[email protected]>"]
 license = "MIT"
 description = "FFI bindings to OpenSSL"
 repository = "https://github.com/sfackler/rust-openssl"
-documentation = "https://sfackler.github.io/rust-openssl/doc/v0.6.6/openssl_sys"
+documentation = "https://sfackler.github.io/rust-openssl/doc/v0.6.7/openssl_sys"
 
 links = "openssl"
 build = "build.rs"
diff --git a/openssl-sys/build.rs b/openssl-sys/build.rs
index 5f934888..aa47f2de 100644
--- a/openssl-sys/build.rs
+++ b/openssl-sys/build.rs
@@ -62,6 +62,7 @@ fn main() {
     let mut include_dirs = vec![];
 
     if let Some(include_dir) = include_dir {
+        println!("cargo:include={}", include_dir);
         include_dirs.push(PathBuf::from(&include_dir));
     }
 
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index 3bc9e59a..bc177959 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -1,6 +1,6 @@
 #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
 #![allow(dead_code)]
-#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.6.6")]
+#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.6.7")]
 
 extern crate libc;
 
@@ -417,6 +417,9 @@ extern "C" {
     #[cfg(feature = "aes_ctr")]
     pub fn EVP_aes_128_ctr() -> *const EVP_CIPHER;
     // fn EVP_aes_128_gcm() -> EVP_CIPHER;
+    pub fn EVP_aes_128_cfb1() -> *const EVP_CIPHER;
+    pub fn EVP_aes_128_cfb128() -> *const EVP_CIPHER;
+    pub fn EVP_aes_128_cfb8() -> *const EVP_CIPHER;
     pub fn EVP_aes_256_cbc() -> *const EVP_CIPHER;
     pub fn EVP_aes_256_ecb() -> *const EVP_CIPHER;
     #[cfg(feature = "aes_xts")]
@@ -424,6 +427,9 @@ extern "C" {
     #[cfg(feature = "aes_ctr")]
     pub fn EVP_aes_256_ctr() -> *const EVP_CIPHER;
     // fn EVP_aes_256_gcm() -> EVP_CIPHER;
+    pub fn EVP_aes_256_cfb1() -> *const EVP_CIPHER;
+    pub fn EVP_aes_256_cfb128() -> *const EVP_CIPHER;
+    pub fn EVP_aes_256_cfb8() -> *const EVP_CIPHER;
     pub fn EVP_rc4() -> *const EVP_CIPHER;
 
     pub fn EVP_BytesToKey(typ: *const EVP_CIPHER, md: *const EVP_MD,
@@ -487,6 +493,8 @@ extern "C" {
                              user_data: *mut c_void) -> *mut X509_REQ;
     pub fn PEM_read_bio_PrivateKey(bio: *mut BIO, out: *mut *mut EVP_PKEY, callback: Option<PasswordCallback>,
                              user_data: *mut c_void) -> *mut X509;
+    pub fn PEM_read_bio_PUBKEY(bio: *mut BIO, out: *mut *mut EVP_PKEY, callback: Option<PasswordCallback>,
+                             user_data: *mut c_void) -> *mut X509;
 
     pub fn PEM_write_bio_PrivateKey(bio: *mut BIO, pkey: *mut EVP_PKEY, cipher: *const EVP_CIPHER,
                                     kstr: *mut c_char, klen: c_int,
@@ -573,6 +581,7 @@ extern "C" {
     pub fn SSL_CTX_get_ex_data(ctx: *mut SSL_CTX, idx: c_int) -> *mut c_void;
 
     pub fn SSL_CTX_use_certificate_file(ctx: *mut SSL_CTX, cert_file: *const c_char, file_type: c_int) -> c_int;
+    pub fn SSL_CTX_use_certificate_chain_file(ctx: *mut SSL_CTX, cert_chain_file: *const c_char, file_type: c_int) -> c_int;
     pub fn SSL_CTX_use_certificate(ctx: *mut SSL_CTX, cert: *mut X509) -> c_int;
 
     pub fn SSL_CTX_use_PrivateKey_file(ctx: *mut SSL_CTX, key_file: *const c_char, file_type: c_int) -> c_int;
diff --git a/openssl-sys/src/openssl_shim.c b/openssl-sys/src/openssl_shim.c
index f0f55b27..8ebe23ac 100644
--- a/openssl-sys/src/openssl_shim.c
+++ b/openssl-sys/src/openssl_shim.c
@@ -29,7 +29,7 @@ void rust_openssl_set_id_callback() {
 #endif
 
 
-#if OPENSSL_VERSION_NUMBER < 0x1000000L
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
 // Copied from openssl crypto/hmac/hmac.c
 int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx)
      {
@@ -111,7 +111,7 @@ long SSL_CTX_set_tmp_dh_shim(SSL_CTX *ctx, DH *dh) {
     return SSL_CTX_set_tmp_dh(ctx, dh);
 }
 
-#if OPENSSL_VERSION_NUMBER >= 0x1000200L
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L
 int SSL_CTX_set_ecdh_auto_shim(SSL_CTX *ctx, int onoff) {
     return SSL_CTX_set_ecdh_auto(ctx, onoff);
 }
diff --git a/openssl-sys/src/probe.rs b/openssl-sys/src/probe.rs
index 6a67e478..e3711b54 100644
--- a/openssl-sys/src/probe.rs
+++ b/openssl-sys/src/probe.rs
@@ -57,10 +57,14 @@ pub fn probe() -> ProbeResult {
     for certs_dir in find_certs_dirs().iter() {
         // cert.pem looks to be an openssl 1.0.1 thing, while
         // certs/ca-certificates.crt appears to be a 0.9.8 thing
-        try(&mut result.cert_file, certs_dir.join("cert.pem"));
-        try(&mut result.cert_file, certs_dir.join("certs/ca-certificates.crt"));
-        try(&mut result.cert_file, certs_dir.join("certs/ca-root-nss.crt"));
-
+        for cert in [
+            "cert.pem",
+            "certs.pem",
+            "certs/ca-certificates.crt",
+            "certs/ca-root-nss.crt"
+        ].iter() {
+            try(&mut result.cert_file, certs_dir.join(cert));
+        }
         try(&mut result.cert_dir, certs_dir.join("certs"));
     }
     result