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

Merge pull request #1008 from alexcrichton/bump 

Bump dependency on openssl-src-rs
This commit is contained in:
Steven Fackler 2018-10-16 08:54:20 -07:00 committed by GitHub
parent 8bd3ece403 dab71dbf0a
commit 2e6dbcd5c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openssl-sys/Cargo.toml
View File

@ -20,7 +20,7 @@ libc = "0.2"
[build-dependencies] [build-dependencies]
pkg-config = "0.3.9" pkg-config = "0.3.9"
cc = "1.0" cc = "1.0"
openssl-src = { version = "110.0.4", optional = true } openssl-src = { version = "111.0.1", optional = true }
[target.'cfg(target_env = "msvc")'.build-dependencies] [target.'cfg(target_env = "msvc")'.build-dependencies]
vcpkg = "0.2" vcpkg = "0.2"

1
openssl-sys/build/main.rs
View File

@ -29,6 +29,7 @@ const DEFINES: &'static [&'static str] = &[
"OPENSSL_NO_SRP", "OPENSSL_NO_SRP",
"OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_SSL3_METHOD",
"OPENSSL_NO_TLSEXT", "OPENSSL_NO_TLSEXT",
"OPENSSL_NO_STDIO",
]; ];
enum Version { enum Version {

1
openssl-sys/src/bio.rs
View File

@ -73,6 +73,7 @@ cfg_if! {
} }
} }
extern "C" { extern "C" {
#[cfg(not(osslconf = "OPENSSL_NO_STDIO"))]
pub fn BIO_new_fp(stream: *mut FILE, close_flag: c_int) -> *mut BIO; pub fn BIO_new_fp(stream: *mut FILE, close_flag: c_int) -> *mut BIO;
#[cfg(any(ossl110, libressl273))] #[cfg(any(ossl110, libressl273))]
pub fn BIO_set_data(a: *mut ::BIO, data: *mut c_void); pub fn BIO_set_data(a: *mut ::BIO, data: *mut c_void);