Merge pull request #2498 from rust-openssl/botovq-libressl-4.2

botovq · botovq · commit db109f70b6a5 · 2025-10-14T18:50:39.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -195,17 +195,17 @@ jobs:
               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: true
               library:
                 name: libressl
-                version: 4.1.0
+                version: 4.2.0
             - target: x86_64-unknown-linux-gnu
               bindgen: false
               library:
@@ -215,17 +215,17 @@ jobs:
               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
             - target: x86_64-unknown-linux-gnu
               bindgen: false
               library:
                 name: libressl
-                version: 4.1.0
+                version: 4.2.0
             - target: x86_64-unknown-linux-gnu
               bindgen: false
               library:
diff --git a/openssl-sys/build/main.rs b/openssl-sys/build/main.rs
@@ -435,6 +435,7 @@ See rust-openssl documentation for more information:
             (4, 0, _) => ('4', '0', 'x'),
             (4, 1, 0) => ('4', '1', '0'),
             (4, 1, _) => ('4', '1', 'x'),
+            (4, 2, _) => ('4', '2', 'x'),
             _ => version_error(),
         };
 
@@ -474,7 +475,7 @@ fn version_error() -> ! {
         "
 
 This crate is only compatible with OpenSSL (version 1.0.2 through 1.1.1, or 3), or LibreSSL 3.4
-through 4.1.x, but a different version of OpenSSL was found. The build is now aborting
+through 4.2.x, but a different version of OpenSSL was found. The build is now aborting
 due to this version mismatch.
 
 "
diff --git a/openssl/build.rs b/openssl/build.rs
@@ -35,6 +35,7 @@ fn main() {
     println!("cargo:rustc-check-cfg=cfg(libressl390)");
     println!("cargo:rustc-check-cfg=cfg(libressl400)");
     println!("cargo:rustc-check-cfg=cfg(libressl410)");
+    println!("cargo:rustc-check-cfg=cfg(libressl420)");
 
     println!("cargo:rustc-check-cfg=cfg(ossl101)");
     println!("cargo:rustc-check-cfg=cfg(ossl102)");
@@ -110,6 +111,9 @@ fn main() {
         if version >= 0x4_01_00_00_0 {
             println!("cargo:rustc-cfg=libressl410");
         }
+        if version >= 0x4_02_00_00_0 {
+            println!("cargo:rustc-cfg=libressl420");
+        }
     }
 
     if let Ok(vars) = env::var("DEP_OPENSSL_CONF") {
diff --git a/openssl/src/lib.rs b/openssl/src/lib.rs
@@ -1,7 +1,7 @@
 //! Bindings to OpenSSL
 //!
 //! This crate provides a safe interface to the popular OpenSSL cryptography library. OpenSSL versions 1.0.2 through
-//! 3.x.x and LibreSSL versions 3.4 through 4.1.x are supported.
+//! 3.x.x and LibreSSL versions 3.4 through 4.2.x are supported.
 //!
 //! # Building
 //!

Original file line number	Diff line number	Diff line change
`@@ -435,6 +435,7 @@ See rust-openssl documentation for more information:`
`435`	`435`	`(4, 0, _) => ('4', '0', 'x'),`
`436`	`436`	`(4, 1, 0) => ('4', '1', '0'),`
`437`	`437`	`(4, 1, _) => ('4', '1', 'x'),`
	`438`	`+ (4, 2, _) => ('4', '2', 'x'),`
`438`	`439`	`_ => version_error(),`
`439`	`440`	`};`
`440`	`441`
`@@ -474,7 +475,7 @@ fn version_error() -> ! {`
`474`	`475`	`"`
`475`	`476`
`476`	`477`	`This crate is only compatible with OpenSSL (version 1.0.2 through 1.1.1, or 3), or LibreSSL 3.4`
`477`		`-through 4.1.x, but a different version of OpenSSL was found. The build is now aborting`
	`478`	`+through 4.2.x, but a different version of OpenSSL was found. The build is now aborting`
`478`	`479`	`due to this version mismatch.`
`479`	`480`
`480`	`481`	`"`