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

Merge pull request #2398 from botovq/libressl-4.1 

Support Libressl 4.1
parents 6a459820 ae9d9881

.github/workflows/ci.yml

+6 −6
Original line number Diff line number Diff line
@@ -192,17 +192,17 @@ jobs: 
              bindgen: true

              library:

                name: libressl

                version: 3.8.4

                version: 3.9.2

            - target: x86_64-unknown-linux-gnu

              bindgen: true

              library:

                name: libressl

                version: 3.9.2

                version: 4.0.0

            - target: x86_64-unknown-linux-gnu

              bindgen: true

              library:

                name: libressl

                version: 4.0.0

                version: 4.1.0

            - target: x86_64-unknown-linux-gnu

              bindgen: false

              library:
@@ -212,17 +212,17 @@ jobs: 
              bindgen: false

              library:

                name: libressl

                version: 3.8.4

                version: 3.9.2

            - target: x86_64-unknown-linux-gnu

              bindgen: false

              library:

                name: libressl

                version: 3.9.2

                version: 4.0.0

            - target: x86_64-unknown-linux-gnu

              bindgen: false

              library:

                name: libressl

                version: 4.0.0

                version: 4.1.0

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

      runs-on: ubuntu-22.04

      env:

openssl-sys/build/main.rs

+3 −1
Original line number Diff line number Diff line
@@ -449,6 +449,8 @@ See rust-openssl documentation for more information: 
            (3, 9, _) => ('3', '9', 'x'),

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

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

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

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

            _ => version_error(),

        };
@@ -491,7 +493,7 @@ fn version_error() -> ! { 
        "



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

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

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

due to this version mismatch.



"