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

Merge pull request #1119 from sfackler/openssl-111c 

Bump CI versions
This commit is contained in:
Steven Fackler 2019-05-31 08:48:19 -07:00 committed by GitHub
parent 0202c20ca3 958c1811b0
commit d7a768ea91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.circleci/config.yml
View File

@ -202,13 +202,13 @@ jobs:
openssl_111: &openssl_111 openssl_111: &openssl_111
library: openssl library: openssl
version: 1.1.1b version: 1.1.1c
openssl_110: &openssl_110 openssl_110: &openssl_110
library: openssl library: openssl
version: 1.1.0j version: 1.1.0k
openssl_102: &openssl_102 openssl_102: &openssl_102
library: openssl library: openssl
version: 1.0.2r version: 1.0.2s
openssl_101: &openssl_101 openssl_101: &openssl_101
library: openssl library: openssl
version: 1.0.1u version: 1.0.1u

4
appveyor.yml
View File

@ -4,13 +4,13 @@ environment:
# 1.1.1, 64 bit # 1.1.1, 64 bit
- TARGET: x86_64-pc-windows-msvc - TARGET: x86_64-pc-windows-msvc
BITS: 64 BITS: 64
OPENSSL_VERSION: 1_1_1b OPENSSL_VERSION: 1_1_1c
OPENSSL_DIR: C:\OpenSSL OPENSSL_DIR: C:\OpenSSL
# 1.0.2, 32 bit # 1.0.2, 32 bit
- TARGET: i686-pc-windows-msvc - TARGET: i686-pc-windows-msvc
BITS: 32 BITS: 32
OPENSSL_VERSION: 1_0_2r OPENSSL_VERSION: 1_0_2s
OPENSSL_DIR: C:\OpenSSL OPENSSL_DIR: C:\OpenSSL
# mingw # mingw

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

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

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

@ -1314,7 +1314,11 @@ extern "C" {
} }
cfg_if! { cfg_if! {
if #[cfg(ossl110)] { if #[cfg(ossl111c)] {
extern "C" {
pub fn SSL_session_reused(ssl: *const SSL) -> c_int;
}
} else if #[cfg(ossl110)] {
extern "C" { extern "C" {
pub fn SSL_session_reused(ssl: *mut SSL) -> c_int; pub fn SSL_session_reused(ssl: *mut SSL) -> c_int;
} }