Add support of openssl 1.1.1

* See issue #758 Signed-off-by: Florentin Dubois <florentin.dubois@clever-cloud.com>
sozu-proxy · Jul 13, 2022 · 9b14a65 · 9b14a65
1 parent 1b3cd3c
commit 9b14a65
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/lib/build.rs b/lib/build.rs
@@ -1,20 +1,18 @@
 use std::env;
 
 fn main() {
-    match env::var("DEP_OPENSSL_VERSION") {
-        Ok(ref v) if v == "101" => {
-            println!("cargo:rustc-cfg=ossl101");
+    match &env::var("DEP_OPENSSL_VERSION") {
+        Ok(v) if v == "101" || v == "102" => {
+            println!("cargo:rustc-cfg=ossl{}", v);
             println!("cargo:rustc-cfg=ossl10x");
         }
-        Ok(ref v) if v == "102" => {
-            println!("cargo:rustc-cfg=ossl102");
-            println!("cargo:rustc-cfg=ossl10x");
-        }
-        Ok(ref v) if v == "110" => {
-            println!("cargo:rustc-cfg=ossl110");
+        Ok(v) if v == "110" || v == "111" => {
+            println!("cargo:rustc-cfg=ossl{}", v);
+            println!("cargo:rustc-cfg=ossl11x");
         }
         _ => {
-            println!("cargo:rustc-cfg=ossl110");
+            println!("cargo:rustc-cfg=ossl111");
+            println!("cargo:rustc-cfg=ossl11x");
         } //panic!("Unable to detect OpenSSL version"),
     }
 

diff --git a/lib/src/https_openssl.rs b/lib/src/https_openssl.rs
@@ -2381,15 +2381,15 @@ fn setup_curves(ctx: &mut SslContextBuilder) -> Result<(), ErrorStack> {
     ctx.set_ecdh_auto(true)
 }
 
-#[cfg(ossl110)]
+#[cfg(ossl11x)]
 fn setup_curves(ctx: &mut SslContextBuilder) -> Result<(), ErrorStack> {
     use openssl::ec::EcKey;
 
     let curve = EcKey::from_curve_name(nid::Nid::X9_62_PRIME256V1)?;
     ctx.set_tmp_ecdh(&curve)
 }
 
-#[cfg(all(not(ossl101), not(ossl102), not(ossl110)))]
+#[cfg(all(not(ossl101), not(ossl102), not(ossl11x)))]
 fn setup_curves(_: &mut SslContextBuilder) -> Result<(), ErrorStack> {
     compile_error!("unsupported openssl version, please open an issue");
     Ok(())