Unverified Commit d7a768ea authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

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

Bump CI versions
parents 0202c20c 958c1811

.circleci/config.yml

+3 −3
Original line number Diff line number Diff line
@@ -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

appveyor.yml

+2 −2
Original line number Diff line number Diff line
@@ -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

openssl-sys/build/cfgs.rs

+3 −0
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ pub fn get(openssl_version: Option<u64>, libressl_version: Option<u64>) -> Vec<& 
        if openssl_version >= 0x1_01_01_02_0 {

            cfgs.push("ossl111b");

        }

        if openssl_version >= 0x1_01_01_03_0 {

            cfgs.push("ossl111c");

        }

    }



    cfgs

openssl-sys/src/ssl.rs

+5 −1
Original line number Diff line number Diff line
@@ -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;

        }