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

Fix const changes in 1.1.1b

This commit is contained in:
Steven Fackler 2019-02-26 20:31:01 -08:00
parent 83b58057dd
commit ab298d0264
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openssl-sys/build/cfgs.rs
View File

@ -49,6 +49,9 @@ pub fn get(openssl_version: Option<u64>, libressl_version: Option<u64>) -> Vec<&
if openssl_version >= 0x1_01_01_00_0 { if openssl_version >= 0x1_01_01_00_0 {
cfgs.push("ossl111"); cfgs.push("ossl111");
} }
if openssl_version >= 0x1_01_01_02_0 {
cfgs.push("ossl111b");
}
} }
cfgs cfgs

30
openssl-sys/src/ssl.rs
View File

@ -1090,9 +1090,21 @@ extern "C" {
CAfile: *const c_char, CAfile: *const c_char,
CApath: *const c_char, CApath: *const c_char,
) -> c_int; ) -> c_int;
}
pub fn SSL_get_ssl_method(ssl: *mut SSL) -> *const SSL_METHOD; cfg_if! {
if #[cfg(ossl111b)] {
extern "C" {
pub fn SSL_get_ssl_method(ssl: *const SSL) -> *const SSL_METHOD;
}
} else {
extern "C" {
pub fn SSL_get_ssl_method(ssl: *mut SSL) -> *const SSL_METHOD;
}
}
}
extern "C" {
pub fn SSL_set_connect_state(s: *mut SSL); pub fn SSL_set_connect_state(s: *mut SSL);
pub fn SSL_set_accept_state(s: *mut SSL); pub fn SSL_set_accept_state(s: *mut SSL);
@ -1250,11 +1262,25 @@ cfg_if! {
if #[cfg(libressl)] { if #[cfg(libressl)] {
extern "C" { extern "C" {
pub fn SSL_get_current_compression(ssl: *mut SSL) -> *const libc::c_void; pub fn SSL_get_current_compression(ssl: *mut SSL) -> *const libc::c_void;
}
} else if #[cfg(osslconf = "OPENSSL_NO_COMP")] {
} else if #[cfg(openssl111b)] {
extern "C" {
pub fn SSL_get_current_compression(ssl: *const SSL) -> *const COMP_METHOD;
}
} else {
extern "C" {
pub fn SSL_get_current_compression(ssl: *mut SSL) -> *const COMP_METHOD;
}
}
}
cfg_if! {
if #[cfg(libressl)] {
extern "C" {
pub fn SSL_COMP_get_name(comp: *const libc::c_void) -> *const c_char; pub fn SSL_COMP_get_name(comp: *const libc::c_void) -> *const c_char;
} }
} else if #[cfg(not(osslconf = "OPENSSL_NO_COMP"))] { } else if #[cfg(not(osslconf = "OPENSSL_NO_COMP"))] {
extern "C" { extern "C" {
pub fn SSL_get_current_compression(ssl: *mut SSL) -> *const COMP_METHOD;
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;
} }
} }