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.

Sign up for GitHub

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

Jump to bottom

LibreSSL 3.8.1 support #2035

Merged
merged 1 commit into from Sep 1, 2023
Merged

LibreSSL 3.8.1 support #2035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions openssl-sys/build/cfgs.rs
View file
Open in desktop
Expand Up @@ -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();

Expand Down
5 changes: 3 additions & 2 deletions openssl-sys/build/main.rs
View file
Open in desktop
Expand Up @@ -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(),
};

Expand Down Expand Up @@ -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.

"
Expand Down
2 changes: 1 addition & 1 deletion openssl-sys/src/crypto.rs
View file
Open in desktop
Expand Up @@ -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))] {
Copy link
Owner

Choose a reason for hiding this comment

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

Glad to see my libressl ABI stability paranoia remains justified.

pub const CRYPTO_EX_INDEX_SSL: c_int = 0;
pub const CRYPTO_EX_INDEX_SSL_CTX: c_int = 1;
} else if #[cfg(libressl)] {
Expand Down