Merge pull request #1025 from ltratt/master

Explicitly support LibreSSL 2.9.0.
sfackler · Dec 16, 2018 · e75793e · e75793e
2 parents 91a78bc + e8a64c9
commit e75793e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -106,9 +106,9 @@ openssl_101: &OPENSSL_101
 libressl_250: &LIBRESSL_250
   LIBRARY: libressl
   VERSION: 2.5.0
-libressl_28x: &LIBRESSL_28x
+libressl_290: &LIBRESSL_290
   LIBRARY: libressl
-  VERSION: 2.8.2
+  VERSION: 2.9.0
 
 x86_64: &X86_64
   TARGET: x86_64-unknown-linux-gnu
@@ -193,10 +193,10 @@ jobs:
     <<: *JOB
     environment:
       <<: [*LIBRESSL_250, *X86_64, *BASE]
-  x86_64-libressl-2.8.x:
+  x86_64-libressl-2.9.0:
     <<: *JOB
     environment:
-      <<: [*LIBRESSL_28x, *X86_64, *BASE]
+      <<: [*LIBRESSL_290, *X86_64, *BASE]
   macos:
     <<: *MACOS_JOB
     environment:
@@ -224,6 +224,6 @@ workflows:
     - armhf-openssl-1.1.0
     - armhf-openssl-1.0.2
     - x86_64-libressl-2.5.0
-    - x86_64-libressl-2.8.x
+    - x86_64-libressl-2.9.0
     - macos
     - macos-vendored
diff --git a/openssl-sys/build/main.rs b/openssl-sys/build/main.rs
@@ -504,6 +504,7 @@ See rust-openssl README for more information:
             (8, 0) => ('8', '0'),
             (8, 1) => ('8', '1'),
             (8, _) => ('8', 'x'),
+            (9, 0) => ('9', '0'),
             _ => version_error(),
         };
 
@@ -544,7 +545,7 @@ fn version_error() -> ! {
         "
 
 This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5
-through 2.8.1, but a different version of OpenSSL was found. The build is now aborting
+through 2.9.0, but a different version of OpenSSL was found. The build is now aborting
 due to this version mismatch.
 
 "