diff --git a/.circleci/config.yml b/.circleci/config.yml index 95e63d81..649ce429 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -202,13 +202,13 @@ jobs: openssl_111: &openssl_111 library: openssl - version: 1.1.1b + version: 1.1.1c openssl_110: &openssl_110 library: openssl - version: 1.1.0j + version: 1.1.0k openssl_102: &openssl_102 library: openssl - version: 1.0.2r + version: 1.0.2s openssl_101: &openssl_101 library: openssl version: 1.0.1u diff --git a/appveyor.yml b/appveyor.yml index e3062330..e050d00c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,13 +4,13 @@ environment: # 1.1.1, 64 bit - TARGET: x86_64-pc-windows-msvc BITS: 64 - OPENSSL_VERSION: 1_1_1b + OPENSSL_VERSION: 1_1_1c OPENSSL_DIR: C:\OpenSSL # 1.0.2, 32 bit - TARGET: i686-pc-windows-msvc BITS: 32 - OPENSSL_VERSION: 1_0_2r + OPENSSL_VERSION: 1_0_2s OPENSSL_DIR: C:\OpenSSL # mingw diff --git a/openssl-sys/build/cfgs.rs b/openssl-sys/build/cfgs.rs index c74c2bb0..4dd919b1 100644 --- a/openssl-sys/build/cfgs.rs +++ b/openssl-sys/build/cfgs.rs @@ -58,6 +58,9 @@ pub fn get(openssl_version: Option, libressl_version: Option) -> Vec<& if openssl_version >= 0x1_01_01_02_0 { cfgs.push("ossl111b"); } + if openssl_version >= 0x1_01_01_03_0 { + cfgs.push("ossl111c"); + } } cfgs diff --git a/openssl-sys/src/ssl.rs b/openssl-sys/src/ssl.rs index 257d380b..0cad5aac 100644 --- a/openssl-sys/src/ssl.rs +++ b/openssl-sys/src/ssl.rs @@ -1314,7 +1314,11 @@ extern "C" { } 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" { pub fn SSL_session_reused(ssl: *mut SSL) -> c_int; }