aboutsummaryrefslogtreecommitdiff
path: root/openssl-sys/src
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2015-06-27 19:37:45 -0700
committerSteven Fackler <[email protected]>2015-06-27 19:37:45 -0700
commit9d0acfe6155e1f432a80d0bfa99efbbdf0b07100 (patch)
tree46cbc4d2e61351c593edc39adbfa1ab47124c9a6 /openssl-sys/src
parentStrip other LD_LIBRARY_PATH reference (diff)
downloadrust-openssl-9d0acfe6155e1f432a80d0bfa99efbbdf0b07100.tar.xz
rust-openssl-9d0acfe6155e1f432a80d0bfa99efbbdf0b07100.zip
Fix set_hostname
It was previously failing to null terminate the hostname string (was anyone actually using this?). Also move the macro expansion to the C shim.
Diffstat (limited to 'openssl-sys/src')
-rw-r--r--openssl-sys/src/lib.rs2
-rw-r--r--openssl-sys/src/openssl_shim.c4
2 files changed, 6 insertions, 0 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index 20185e5a..5204c3bf 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -606,6 +606,8 @@ extern "C" {
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"]
pub fn SSL_CTX_set_read_ahead(ctx: *mut SSL_CTX, m: c_long) -> c_long;
+ #[link_name = "SSL_set_tlsext_host_name_shim"]
+ pub fn SSL_set_tlsext_host_name(s: *mut SSL, name: *const c_char) -> c_long;
}
pub mod probe;
diff --git a/openssl-sys/src/openssl_shim.c b/openssl-sys/src/openssl_shim.c
index 9b4a9fa2..7b4f9c74 100644
--- a/openssl-sys/src/openssl_shim.c
+++ b/openssl-sys/src/openssl_shim.c
@@ -78,3 +78,7 @@ long SSL_CTX_add_extra_chain_cert_shim(SSL_CTX *ctx, X509 *x509) {
long SSL_CTX_set_read_ahead_shim(SSL_CTX *ctx, long m) {
return SSL_CTX_set_read_ahead(ctx, m);
}
+
+long SSL_set_tlsext_host_name_shim(SSL *s, char *name) {
+ return SSL_set_tlsext_host_name(s, name);
+}