min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #471 from sfackler/no-comp 

Handle OPENSSL_NO_COMP
This commit is contained in:
Steven Fackler 2016-10-14 23:09:11 -07:00 committed by GitHub
parent e1d1006fad f520aa2860
commit 64b8e5e553
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openssl-sys/src/lib.rs
View File

@ -599,6 +599,7 @@ extern {
pub fn SSL_get_ex_data_X509_STORE_CTX_idx() -> c_int; 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_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; 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_current_compression(ssl: *mut SSL) -> *const COMP_METHOD;
pub fn SSL_get_peer_certificate(ssl: *const SSL) -> *mut X509; pub fn SSL_get_peer_certificate(ssl: *const SSL) -> *mut X509;
pub fn SSL_get_ssl_method(ssl: *mut SSL) -> *const SSL_METHOD; pub fn SSL_get_ssl_method(ssl: *mut SSL) -> *const SSL_METHOD;
@ -615,6 +616,7 @@ extern {
#[cfg(not(ossl101))] #[cfg(not(ossl101))]
pub fn SSL_get0_param(ssl: *mut ::SSL) -> *mut X509_VERIFY_PARAM; 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_COMP_get_name(comp: *const COMP_METHOD) -> *const c_char;
pub fn SSL_CIPHER_get_name(cipher: *const SSL_CIPHER) -> *const c_char; pub fn SSL_CIPHER_get_name(cipher: *const SSL_CIPHER) -> *const c_char;

5
openssl/build.rs
View File

@ -18,4 +18,9 @@ fn main() {
println!("cargo:rustc-cfg=ossl101"); println!("cargo:rustc-cfg=ossl101");
println!("cargo:rustc-cfg=ossl10x"); println!("cargo:rustc-cfg=ossl10x");
} }
if let Ok(vars) = env::var("DEP_OPENSSL_OSSLCONF") {
for var in vars.split(",") {
println!("cargo:rustc-cfg=osslconf=\"{}\"", var);
}
}
} }

10
openssl/src/ssl/mod.rs
View File

@ -952,6 +952,11 @@ impl<'a> SslRef<'a> {
/// The result will be either None, indicating no compression is in use, or /// The result will be either None, indicating no compression is in use, or
/// a string with the compression name. /// a string with the compression name.
pub fn compression(&self) -> Option<String> { pub fn compression(&self) -> Option<String> {
self._compression()
}
#[cfg(not(osslconf = "OPENSSL_NO_COMP"))]
fn _compression(&self) -> Option<String> {
let ptr = unsafe { ffi::SSL_get_current_compression(self.as_ptr()) }; let ptr = unsafe { ffi::SSL_get_current_compression(self.as_ptr()) };
if ptr == ptr::null() { if ptr == ptr::null() {
return None; return None;
@ -965,6 +970,11 @@ impl<'a> SslRef<'a> {
Some(s) Some(s)
} }
#[cfg(osslconf = "OPENSSL_NO_COMP")]
fn _compression(&self) -> Option<String> {
None
}
/// Returns the server's name for the current connection /// Returns the server's name for the current connection
pub fn servername(&self) -> Option<String> { pub fn servername(&self) -> Option<String> {
let name = unsafe { ffi::SSL_get_servername(self.as_ptr(), ffi::TLSEXT_NAMETYPE_host_name) }; let name = unsafe { ffi::SSL_get_servername(self.as_ptr(), ffi::TLSEXT_NAMETYPE_host_name) };