aboutsummaryrefslogtreecommitdiff
path: root/openssl-sys
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-07-01 18:43:58 -0400
committerSteven Fackler <[email protected]>2016-07-01 18:43:58 -0400
commitb8fb29db5c246175a096260eacca38180cd77dd0 (patch)
tree4fbf3759478b731b3c571ad361023feb6093bbf2 /openssl-sys
parentMerge branch 'release-v0.7.13' into release (diff)
parentRelease v0.7.14 (diff)
downloadrust-openssl-0.7.14.tar.xz
rust-openssl-0.7.14.zip
Merge branch 'release-v0.7.14' into releasev0.7.14
Diffstat (limited to 'openssl-sys')
-rw-r--r--openssl-sys/Cargo.toml4
-rw-r--r--openssl-sys/src/lib.rs6
2 files changed, 6 insertions, 4 deletions
diff --git a/openssl-sys/Cargo.toml b/openssl-sys/Cargo.toml
index 89b18911..c203b6d6 100644
--- 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
index e6a7c488..ef327a93 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.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;