Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LibreSSL 4.0.0 #2315

Merged
merged 2 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -184,17 +184,17 @@ jobs:
bindgen: true
library:
name: libressl
version: 3.7.3
version: 3.8.4
- target: x86_64-unknown-linux-gnu
bindgen: true
library:
name: libressl
version: 3.8.3
version: 3.9.2
- target: x86_64-unknown-linux-gnu
bindgen: true
library:
name: libressl
version: 3.9.1
version: 4.0.0
- target: x86_64-unknown-linux-gnu
bindgen: false
library:
Expand All @@ -204,17 +204,17 @@ jobs:
bindgen: false
library:
name: libressl
version: 3.7.3
version: 3.8.4
- target: x86_64-unknown-linux-gnu
bindgen: false
library:
name: libressl
version: 3.8.3
version: 3.9.2
- target: x86_64-unknown-linux-gnu
bindgen: false
library:
name: libressl
version: 3.9.1
version: 4.0.0
name: ${{ matrix.target }}-${{ matrix.library.name }}-${{ matrix.library.version }}-${{ matrix.bindgen }}
runs-on: ubuntu-latest
env:
Expand Down
4 changes: 3 additions & 1 deletion openssl-sys/build/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,8 @@ See rust-openssl documentation for more information:
(3, 8, _) => ('3', '8', 'x'),
(3, 9, 0) => ('3', '9', '0'),
(3, 9, _) => ('3', '9', 'x'),
(4, 0, 0) => ('4', '0', '0'),
(4, 0, _) => ('4', '0', 'x'),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are y'all committing that there will be no ABI breaking changes and that 4.0.1 will be stable?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we do. As the release announcement says:

We have released LibreSSL 4.0.0, which will be arriving in the LibreSSL directory of your local OpenBSD mirror soon. This is the first stable release for the 4.0.x branch, also available with OpenBSD 7.6

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, in that case I think we don't need the first line, and we only need the 40x line (and to update the existing checks in the code)?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, maybe I misunderstood the intent of the "x" lines, I think this is fine as is.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was also unsure, but I think it makes sense to stick with what we used to do previously. Usually we release one or two test releases, but this didn't happen this time for various reasons.

_ => version_error(),
};

Expand Down Expand Up @@ -422,7 +424,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 3.9.x, but a different version of OpenSSL was found. The build is now aborting
through 4.0.x, but a different version of OpenSSL was found. The build is now aborting
due to this version mismatch.
"
Expand Down