ensured the engine functions would be accessible in all versions of o…

…penssl
sfackler · Apr 6, 2024 · 4c1f811 · 4c1f811
1 parent 3032a9c
commit 4c1f811
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/openssl-sys/src/handwritten/engine.rs b/openssl-sys/src/handwritten/engine.rs
@@ -22,7 +22,7 @@ pub const ENGINE_METHOD_EC: u32 = 0x0800;
 pub const ENGINE_METHOD_ALL: u32 = 0xffff;
 pub const ENGINE_METHOD_NONE: u32 = 0xffff;
 
-#[cfg(all(ossl110, not(ossl300)))]
+#[cfg(ossl110)]
 extern "C" {
     pub fn ENGINE_get_first() -> *mut ENGINE;
 
@@ -231,9 +231,6 @@ extern "C" {
         callback_data: *mut c_void,
     ) -> *mut EVP_PKEY;
 
-}
-
-extern "C" {
     #[cfg(ossl100)]
     pub fn ENGINE_cleanup();
 }
diff --git a/systest/build.rs b/systest/build.rs
@@ -82,7 +82,7 @@ fn main() {
             cfg.header("openssl/kdf.h");
         }
 
-        if (0x10100000..0x30000000).contains(&version) {
+        if version >= 0x10000000 {
             cfg.header("openssl/engine.h");
         }