Skip to content

Commit

Permalink
Merge pull request #1849 from sfackler/libressl-371
Browse files Browse the repository at this point in the history
Support LibreSSL 3.7.1
  • Loading branch information
sfackler committed Mar 19, 2023
2 parents e62129f + 286320c commit f533aa1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 23 deletions.
24 changes: 2 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,17 +181,7 @@ jobs:
bindgen: true
library:
name: libressl
version: 3.5.3
- target: x86_64-unknown-linux-gnu
bindgen: true
library:
name: libressl
version: 3.6.1
- target: x86_64-unknown-linux-gnu
bindgen: true
library:
name: libressl
version: 3.7.0
version: 3.7.1
- target: x86_64-unknown-linux-gnu
bindgen: false
library:
Expand All @@ -201,17 +191,7 @@ jobs:
bindgen: false
library:
name: libressl
version: 3.5.3
- target: x86_64-unknown-linux-gnu
bindgen: false
library:
name: libressl
version: 3.6.1
- target: x86_64-unknown-linux-gnu
bindgen: false
library:
name: libressl
version: 3.7.0
version: 3.7.1
name: ${{ matrix.target }}-${{ matrix.library.name }}-${{ matrix.library.version }}-${{ matrix.bindgen }}
runs-on: ubuntu-latest
env:
Expand Down
3 changes: 2 additions & 1 deletion openssl-sys/build/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ See rust-openssl documentation for more information:
(3, 6, 0) => ('3', '6', '0'),
(3, 6, _) => ('3', '6', 'x'),
(3, 7, 0) => ('3', '7', '0'),
(3, 7, 1) => ('3', '7', '1'),
_ => version_error(),
};

Expand Down Expand Up @@ -336,7 +337,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.7.0, but a different version of OpenSSL was found. The build is now aborting
through 3.7.1, but a different version of OpenSSL was found. The build is now aborting
due to this version mismatch.
"
Expand Down

0 comments on commit f533aa1

Please sign in to comment.