From af4488357c9b3e003b883e89c16aaa675ad0c6ac Mon Sep 17 00:00:00 2001
From: Laurence Tratt <laurie@tratt.net>
Date: Mon, 3 Dec 2018 17:33:53 +0000
Subject: [PATCH 1/2] Explicitly support LibreSSL 2.9.0.

---
 .circleci/config.yml      | 7 +++++++
 openssl-sys/build/main.rs | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7a8d4e5ff4..f153515922 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -109,6 +109,9 @@ libressl_250: &LIBRESSL_250
 libressl_28x: &LIBRESSL_28x
   LIBRARY: libressl
   VERSION: 2.8.2
+libressl_290: &LIBRESSL_290
+  LIBRARY: libressl
+  VERSION: 2.9.0
 
 x86_64: &X86_64
   TARGET: x86_64-unknown-linux-gnu
@@ -197,6 +200,10 @@ jobs:
     <<: *JOB
     environment:
       <<: [*LIBRESSL_28x, *X86_64, *BASE]
+  x86_64-libressl-2.9.0:
+    <<: *JOB
+    environment:
+      <<: [*LIBRESSL_290, *X86_64, *BASE]
   macos:
     <<: *MACOS_JOB
     environment:
diff --git a/openssl-sys/build/main.rs b/openssl-sys/build/main.rs
index 3582ba9203..69def400eb 100644
--- 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.
 
 "

From e8a64c9937ba54865544257658d1b0b3531bc820 Mon Sep 17 00:00:00 2001
From: Laurence Tratt <laurie@tratt.net>
Date: Mon, 3 Dec 2018 17:48:08 +0000
Subject: [PATCH 2/2] Only run 2.9.0 tests.

---
 .circleci/config.yml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f153515922..62ef72c936 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -106,9 +106,6 @@ openssl_101: &OPENSSL_101
 libressl_250: &LIBRESSL_250
   LIBRARY: libressl
   VERSION: 2.5.0
-libressl_28x: &LIBRESSL_28x
-  LIBRARY: libressl
-  VERSION: 2.8.2
 libressl_290: &LIBRESSL_290
   LIBRARY: libressl
   VERSION: 2.9.0
@@ -196,10 +193,6 @@ jobs:
     <<: *JOB
     environment:
       <<: [*LIBRESSL_250, *X86_64, *BASE]
-  x86_64-libressl-2.8.x:
-    <<: *JOB
-    environment:
-      <<: [*LIBRESSL_28x, *X86_64, *BASE]
   x86_64-libressl-2.9.0:
     <<: *JOB
     environment:
@@ -231,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