aboutsummaryrefslogtreecommitdiff
path: root/openssl-sys/src
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-10-14 23:09:11 -0700
committerGitHub <[email protected]>2016-10-14 23:09:11 -0700
commit64b8e5e55398b2411ee7ad7fc715b6db37adfba1 (patch)
tree26c6af539a68c5651cebcb669b52808fea654154 /openssl-sys/src
parentCheck feature compatibility in build script (diff)
parentHandle OPENSSL_NO_COMP (diff)
downloadrust-openssl-64b8e5e55398b2411ee7ad7fc715b6db37adfba1.tar.xz
rust-openssl-64b8e5e55398b2411ee7ad7fc715b6db37adfba1.zip
Merge pull request #471 from sfackler/no-comp
Handle OPENSSL_NO_COMP
Diffstat (limited to 'openssl-sys/src')
-rw-r--r--openssl-sys/src/lib.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index 026d6e6b..3faa1e57 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -599,6 +599,7 @@ extern {
pub fn SSL_get_ex_data_X509_STORE_CTX_idx() -> c_int;
pub fn SSL_get_SSL_CTX(ssl: *const SSL) -> *mut SSL_CTX;
pub fn SSL_set_SSL_CTX(ssl: *mut SSL, ctx: *mut SSL_CTX) -> *mut SSL_CTX;
+ #[cfg(not(osslconf = "OPENSSL_NO_COMP"))]
pub fn SSL_get_current_compression(ssl: *mut SSL) -> *const COMP_METHOD;
pub fn SSL_get_peer_certificate(ssl: *const SSL) -> *mut X509;
pub fn SSL_get_ssl_method(ssl: *mut SSL) -> *const SSL_METHOD;
@@ -615,6 +616,7 @@ extern {
#[cfg(not(ossl101))]
pub fn SSL_get0_param(ssl: *mut ::SSL) -> *mut X509_VERIFY_PARAM;
+ #[cfg(not(osslconf = "OPENSSL_NO_COMP"))]
pub fn SSL_COMP_get_name(comp: *const COMP_METHOD) -> *const c_char;
pub fn SSL_CIPHER_get_name(cipher: *const SSL_CIPHER) -> *const c_char;