Commit f0b8a2e4 authored by Charlie Li's avatar Charlie Li
Browse files

Support LibreSSL 2.9.1 

LibreSSL 2.9.1 added generic DTLS methods.

While here, bump CircleCI.
parent 2024379f

.circleci/config.yml

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ workflows: 
          name: x86_64-libressl-2.9

          target: x86_64-unknown-linux-gnu

          library: libressl

          version: 2.9.0

          version: 2.9.1

      - macos:

          name: macos

      - macos:

openssl-sys/build/cfgs.rs

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

            cfgs.push("libressl281");

        }

        if libressl_version >= 0x2_09_01_00_0 {

            cfgs.push("libressl291");

        }

    } else {

        let openssl_version = openssl_version.unwrap();

openssl-sys/build/main.rs

+2 −1
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ See rust-openssl README for more information: 
            (8, 1) => ('8', '1'),

            (8, _) => ('8', 'x'),

            (9, 0) => ('9', '0'),

            (9, 1) => ('9', '1'),

            _ => version_error(),

        };
@@ -239,7 +240,7 @@ fn version_error() -> ! { 
        "



This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5

through 2.9.0, but a different version of OpenSSL was found. The build is now aborting

through 2.9.1, but a different version of OpenSSL was found. The build is now aborting

due to this version mismatch.



"

openssl-sys/src/ssl.rs

+1 −1
Original line number Diff line number Diff line
@@ -1057,7 +1057,7 @@ extern "C" { 
}



cfg_if! {

    if #[cfg(ossl110)] {

    if #[cfg(ossl110, libressl291)] {

        extern "C" {

            pub fn TLS_method() -> *const SSL_METHOD;

openssl/build.rs

+4 −0
Original line number Diff line number Diff line
@@ -53,5 +53,9 @@ fn main() { 
        if version >= 0x2_08_00_00_0 {

            println!("cargo:rustc-cfg=libressl280");

        }



        if version >= 0x2_09_01_00_0 {

            println!("cargo:rustc-cfg=libressl291");

        }

    }

}