Unverified Commit 2d7c86ca authored by Alex Gaynor's avatar Alex Gaynor Committed by GitHub
Browse files

Merge pull request #2035 from alex/libressl-381 

LibreSSL 3.8.1 support
parents 00dacb93 fc1ca1f6

.github/workflows/ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ jobs: 
              bindgen: false

              library:

                name: libressl

                version: 3.8.0

                version: 3.8.1

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

      runs-on: ubuntu-latest

      env:

openssl-sys/build/cfgs.rs

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

            cfgs.push("libressl370");

        }

        if libressl_version >= 0x3_08_01_00_0 {

            cfgs.push("libressl381");

        }

    } else {

        let openssl_version = openssl_version.unwrap();

openssl-sys/build/main.rs

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

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

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

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

            _ => version_error(),

        };
@@ -314,8 +315,8 @@ fn version_error() -> ! { 
    panic!(

        "



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.8.0, but a different version of OpenSSL was found. The build is now aborting

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

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

due to this version mismatch.



"

openssl-sys/src/crypto.rs

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ pub const CRYPTO_LOCK_SSL_CTX: c_int = 12; 
pub const CRYPTO_LOCK_SSL_SESSION: c_int = 14;



cfg_if! {

    if #[cfg(ossl110)] {

    if #[cfg(any(ossl110, libressl381))] {

        pub const CRYPTO_EX_INDEX_SSL: c_int = 0;

        pub const CRYPTO_EX_INDEX_SSL_CTX: c_int = 1;

    } else if #[cfg(libressl)] {