Support LibreSSL 2.8.x

Closes #1009
sfackler · Oct 18, 2018 · 9fd7584 · 9fd7584
1 parent c482f6d
commit 9fd7584
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 23 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -106,12 +106,9 @@ openssl_101: &OPENSSL_101
 libressl_250: &LIBRESSL_250
   LIBRARY: libressl
   VERSION: 2.5.0
-libressl_270: &LIBRESSL_280
+libressl_28x: &LIBRESSL_28x
   LIBRARY: libressl
-  VERSION: 2.8.0
-libressl_281: &LIBRESSL_281
-  LIBRARY: libressl
-  VERSION: 2.8.1
+  VERSION: 2.8.2
 
 x86_64: &X86_64
   TARGET: x86_64-unknown-linux-gnu
@@ -196,14 +193,10 @@ jobs:
     <<: *JOB
     environment:
       <<: [*LIBRESSL_250, *X86_64, *BASE]
-  x86_64-libressl-2.8.0:
-    <<: *JOB
-    environment:
-      <<: [*LIBRESSL_280, *X86_64, *BASE]
-  x86_64-libressl-2.8.1:
+  x86_64-libressl-2.8.x:
     <<: *JOB
     environment:
-      <<: [*LIBRESSL_281, *X86_64, *BASE]
+      <<: [*LIBRESSL_28x, *X86_64, *BASE]
   macos:
     <<: *MACOS_JOB
     environment:
@@ -231,7 +224,6 @@ workflows:
     - armhf-openssl-1.1.0
     - armhf-openssl-1.0.2
     - x86_64-libressl-2.5.0
-    - x86_64-libressl-2.8.0
-    - x86_64-libressl-2.8.1
+    - x86_64-libressl-2.8.x
     - macos
     - macos-vendored
diff --git a/openssl-sys/build/main.rs b/openssl-sys/build/main.rs
@@ -1,9 +1,9 @@
 extern crate cc;
+#[cfg(feature = "vendored")]
+extern crate openssl_src;
 extern crate pkg_config;
 #[cfg(target_env = "msvc")]
 extern crate vcpkg;
-#[cfg(feature = "vendored")]
-extern crate openssl_src;
 
 use std::collections::HashSet;
 use std::env;
@@ -103,20 +103,23 @@ fn main() {
 
 #[cfg(feature = "vendored")]
 mod imp {
-	use std::path::PathBuf;
-	use openssl_src;
-
-	pub fn get_openssl(_target: &str) -> (PathBuf, PathBuf) {
-		let artifacts = openssl_src::Build::new().build();
-		(artifacts.lib_dir().to_path_buf(), artifacts.include_dir().to_path_buf())
-	}
+    use openssl_src;
+    use std::path::PathBuf;
+
+    pub fn get_openssl(_target: &str) -> (PathBuf, PathBuf) {
+        let artifacts = openssl_src::Build::new().build();
+        (
+            artifacts.lib_dir().to_path_buf(),
+            artifacts.include_dir().to_path_buf(),
+        )
+    }
 }
 
 #[cfg(not(feature = "vendored"))]
 mod imp {
     use pkg_config;
-    use std::path::{Path, PathBuf};
     use std::ffi::OsString;
+    use std::path::{Path, PathBuf};
     use std::process::{self, Command};
 
     use super::env;
@@ -500,6 +503,7 @@ See rust-openssl README for more information:
             (7, _) => ('7', 'x'),
             (8, 0) => ('8', '0'),
             (8, 1) => ('8', '1'),
+            (8, _) => ('8', 'x'),
             _ => version_error(),
         };