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

Account for differing tmp DH callback behaviour in LibreSSL >= 3.2.1 

Add cfgs for LibreSSL 3.2.1
parent 90418167

openssl-sys/build/cfgs.rs

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

            cfgs.push("libressl291");

        }

        if libressl_version >= 0x3_02_01_00_0 {

            cfgs.push("libressl321");

        }

    } else {

        let openssl_version = openssl_version.unwrap();

openssl/build.rs

+3 −0
Original line number Diff line number Diff line
@@ -63,5 +63,8 @@ fn main() { 
        if version >= 0x2_09_01_00_0 {

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

        }



        if version >= 0x3_02_01_00_0 {

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

    }

}

openssl/src/ssl/test/mod.rs

+1 −1
Original line number Diff line number Diff line
@@ -903,7 +903,7 @@ fn tmp_dh_callback_ssl() { 


    let mut client = server.client();

    // TLS 1.3 has no DH suites, so make sure we don't pick that version

    #[cfg(ossl111)]

    #[cfg(any(ossl111, libressl321))]

    client.ctx().set_options(super::SslOptions::NO_TLSV1_3);

    client.ctx().set_cipher_list("EDH").unwrap();

    client.connect();