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

Merge pull request #1705 from vishwin/master 

LibreSSL 3.6.0
parents f5f7dba2 56ef65a7

.github/workflows/ci.yml

+4 −4
Original line number Diff line number Diff line
@@ -180,12 +180,12 @@ jobs: 
              bindgen: true

              library:

                name: libressl

                version: 3.4.3

                version: 3.5.3

            - target: x86_64-unknown-linux-gnu

              bindgen: true

              library:

                name: libressl

                version: 3.5.2

                version: 3.6.0

            - target: x86_64-unknown-linux-gnu

              bindgen: false

              library:
@@ -195,12 +195,12 @@ jobs: 
              bindgen: false

              library:

                name: libressl

                version: 3.4.3

                version: 3.5.3

            - target: x86_64-unknown-linux-gnu

              bindgen: false

              library:

                name: libressl

                version: 3.5.2

                version: 3.6.0

          exclude:

            - library:

                name: boringssl

openssl-sys/build/main.rs

+2 −1
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ See rust-openssl documentation for more information: 
            (3, 4, 0) => ('3', '4', '0'),

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

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

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

            _ => version_error(),

        };
@@ -322,7 +323,7 @@ fn version_error() -> ! { 
        "



This crate is only compatible with OpenSSL (version 1.0.1 through 1.1.1, or 3.0.0), or LibreSSL 2.5

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

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

due to this version mismatch.



"

openssl/build.rs

+8 −0
Original line number Diff line number Diff line
@@ -94,5 +94,13 @@ fn main() { 
        if version >= 0x3_05_00_00_0 {

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

        }



        if version >= 0x3_06_00_00_0 {

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

        }



        if version >= 0x3_06_01_00_0 {

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

        }

    }

}

openssl/src/pkcs7.rs

+4 −0
Original line number Diff line number Diff line
@@ -361,7 +361,9 @@ mod tests { 
        assert_eq!(content.expect("should be non-empty"), message.as_bytes());

    }



    /// https://marc.info/?l=openbsd-cvs&m=166602943014106&w=2

    #[test]

    #[cfg_attr(all(libressl360, not(libressl361)), ignore)]

    fn sign_verify_test_normal() {

        let cert = include_bytes!("../test/cert.pem");

        let cert = X509::from_pem(cert).unwrap();
@@ -397,7 +399,9 @@ mod tests { 
        assert!(content.is_none());

    }



    /// https://marc.info/?l=openbsd-cvs&m=166602943014106&w=2

    #[test]

    #[cfg_attr(all(libressl360, not(libressl361)), ignore)]

    fn signers() {

        let cert = include_bytes!("../test/cert.pem");

        let cert = X509::from_pem(cert).unwrap();