Merge branch 'release-v0.7.14' into release

F3real · Jul 1, 2016 · b8fb29d · b8fb29d
2 parents 743451e + 5135fca
commit b8fb29d
Show file tree

Hide file tree

Showing 11 changed files with 200 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ addons:
     - gcc-arm-linux-gnueabihf
 rust:
 - nightly
-- 1.7.0
+- 1.8.0
 os:
 - osx
 - linux
@@ -25,6 +25,4 @@ matrix:
 before_install:
 - ./openssl/test/build.sh
 script:
-- cargo fetch --manifest-path openssl/Cargo.toml # generate a cargo.lock
-- cargo update --manifest-path openssl/Cargo.toml -p bitflags --precise 0.5.0
 - ./openssl/test/run.sh
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/sfackler/rust-openssl.svg?branch=master)](https://travis-ci.org/sfackler/rust-openssl)
 
-[Documentation](https://sfackler.github.io/rust-openssl/doc/v0.7.13/openssl).
+[Documentation](https://sfackler.github.io/rust-openssl/doc/v0.7.14/openssl).
 
 ## Building
 

diff --git a/openssl-sys-extras/Cargo.toml b/openssl-sys-extras/Cargo.toml
@@ -1,19 +1,19 @@
 [package]
 name = "openssl-sys-extras"
-version = "0.7.13"
+version = "0.7.14"
 authors = ["Steven Fackler <[email protected]>"]
 license = "MIT"
 description = "Extra FFI bindings to OpenSSL that require a C shim"
 repository = "https://github.com/sfackler/rust-openssl"
-documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.13/openssl_sys_extras"
+documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.14/openssl_sys_extras"
 build = "build.rs"
 
 [features]
 ecdh_auto = []
 
 [dependencies]
 libc = "0.2"
-openssl-sys = { version = "0.7.13", path = "../openssl-sys" }
+openssl-sys = { version = "0.7.14", path = "../openssl-sys" }
 
 [build-dependencies]
 gcc = "0.3"
diff --git a/openssl-sys-extras/src/lib.rs b/openssl-sys-extras/src/lib.rs
@@ -1,5 +1,5 @@
 #![allow(non_upper_case_globals, non_snake_case)]
-#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.13")]
+#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.14")]
 
 extern crate openssl_sys;
 extern crate libc;
@@ -60,6 +60,8 @@ extern {
     pub fn SSL_CTX_set_options_shim(ctx: *mut SSL_CTX, options: c_long) -> c_long;
     pub fn SSL_CTX_get_options_shim(ctx: *mut SSL_CTX) -> c_long;
     pub fn SSL_CTX_clear_options_shim(ctx: *mut SSL_CTX, options: c_long) -> c_long;
+    #[link_name = "SSL_CTX_set_mode_shim"]
+    pub fn SSL_CTX_set_mode(ctx: *mut SSL_CTX, options: c_long) -> c_long;
     #[link_name = "SSL_CTX_add_extra_chain_cert_shim"]
     pub fn SSL_CTX_add_extra_chain_cert(ctx: *mut SSL_CTX, x509: *mut X509) -> c_long;
     #[link_name = "SSL_CTX_set_read_ahead_shim"]

diff --git a/openssl-sys-extras/src/openssl_shim.c b/openssl-sys-extras/src/openssl_shim.c
@@ -93,6 +93,10 @@ long SSL_CTX_clear_options_shim(SSL_CTX *ctx, long options) {
     return SSL_CTX_clear_options(ctx, options);
 }
 
+long SSL_CTX_set_mode_shim(SSL_CTX *ctx, long options) {
+    return SSL_CTX_set_mode(ctx, options);
+}
+
 long SSL_CTX_add_extra_chain_cert_shim(SSL_CTX *ctx, X509 *x509) {
     return SSL_CTX_add_extra_chain_cert(ctx, x509);
 }

diff --git a/openssl-sys/Cargo.toml b/openssl-sys/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "openssl-sys"
-version = "0.7.13"
+version = "0.7.14"
 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.7.13/openssl_sys"
+documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.14/openssl_sys"
 links = "openssl"
 build = "build.rs"
 

diff --git 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.7.13")]
+#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.14")]
 
 extern crate libc;
 
@@ -270,8 +270,10 @@ pub const SSL_CTRL_SET_TLSEXT_SERVERNAME_CB:  c_int = 53;
 pub const SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG: c_int = 54;
 pub const SSL_CTRL_SET_TLSEXT_HOSTNAME: c_int = 55;
 pub const SSL_CTRL_EXTRA_CHAIN_CERT: c_int = 14;
-
 pub const SSL_CTRL_SET_READ_AHEAD: c_int = 41;
+
+pub const SSL_MODE_AUTO_RETRY: c_long = 4;
+
 pub const SSL_ERROR_NONE: c_int = 0;
 pub const SSL_ERROR_SSL: c_int = 1;
 pub const SSL_ERROR_SYSCALL: c_int = 5;

diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "openssl"
-version = "0.7.13"
+version = "0.7.14"
 authors = ["Steven Fackler <[email protected]>"]
 license = "Apache-2.0"
 description = "OpenSSL bindings"
 repository = "https://github.com/sfackler/rust-openssl"
-documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.13/openssl"
+documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.14/openssl"
 readme = "../README.md"
 keywords = ["crypto", "tls", "ssl", "dtls"]
 build = "build.rs"
@@ -32,8 +32,8 @@ nightly = []
 bitflags = ">= 0.5.0, < 0.8.0"
 lazy_static = "0.2"
 libc = "0.2"
-openssl-sys = { version = "0.7.13", path = "../openssl-sys" }
-openssl-sys-extras = { version = "0.7.13", path = "../openssl-sys-extras" }
+openssl-sys = { version = "0.7.14", path = "../openssl-sys" }
+openssl-sys-extras = { version = "0.7.14", path = "../openssl-sys-extras" }
 
 [build-dependencies]
 gcc = "0.3"