Commit 110b4a46 authored by gonzalo's avatar gonzalo Committed by Henrik Böving
Browse files

Keep LibreSSL up-to-date to -current 3.4.0

parent 78caec6f

.github/workflows/ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ jobs: 
            - target: x86_64-unknown-linux-gnu

              library:

                name: libressl

                version: 3.3.3

                version: 3.4.0

      name: ${{ matrix.target }}-${{ matrix.library.name }}-${{ matrix.library.version }}

      runs-on: ubuntu-latest

      env:

openssl-sys/build/cfgs.rs

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

            cfgs.push("libressl332");

        }

        if libressl_version >= 0x3_03_03_00_0 {

            cfgs.push("libressl333");

        }

        if libressl_version >= 0x3_04_00_00_0 {

            cfgs.push("libressl340");

        }

    } else {

        let openssl_version = openssl_version.unwrap();

openssl-sys/build/main.rs

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

            (3, 3, 1) => ('3', '3', '1'),

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

            (3, 4, 0) => ('3', '4', '0'),

            (3, 4, _) => ('3', '4', 'x'),

            _ => version_error(),

        };
@@ -273,7 +275,7 @@ fn version_error() -> ! { 
        "



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

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

through 3.4.x, 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
@@ -315,7 +315,7 @@ cfg_if! { 
    if #[cfg(ossl102)] {

        pub const SSL_OP_NO_DTLSv1: c_ulong = 0x04000000;

        pub const SSL_OP_NO_DTLSv1_2: c_ulong = 0x08000000;

    } else if #[cfg(libressl332)] {

    } else if #[cfg(libressl340)] {

        pub const SSL_OP_NO_DTLSv1: c_ulong = 0x40000000;

        pub const SSL_OP_NO_DTLSv1_2: c_ulong = 0x80000000;

    }

openssl/build.rs

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

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

        }



        if version >= 0x3_04_00_00_0 {

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

        }

    }

}