Merge pull request #1720 from vishwin/master

LibreSSL 3.6.1+
sfackler · Nov 3, 2022 · bb87002 · bb87002
2 parents e462e83 + 0d2b5f9
commit bb87002
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -183,7 +183,7 @@ jobs:
               bindgen: true
               library:
                 name: libressl
-                version: 3.6.0
+                version: 3.6.1
             - target: x86_64-unknown-linux-gnu
               bindgen: false
               library:
@@ -198,7 +198,7 @@ jobs:
               bindgen: false
               library:
                 name: libressl
-                version: 3.6.0
+                version: 3.6.1
           exclude:
             - library:
                 name: boringssl

diff --git a/openssl-sys/build/main.rs b/openssl-sys/build/main.rs
@@ -281,6 +281,7 @@ See rust-openssl documentation for more information:
             (3, 4, _) => ('3', '4', 'x'),
             (3, 5, _) => ('3', '5', 'x'),
             (3, 6, 0) => ('3', '6', '0'),
+            (3, 6, _) => ('3', '6', 'x'),
             _ => version_error(),
         };
 
@@ -323,7 +324,7 @@ fn version_error() -> ! {
         "
 
 This crate is only compatible with OpenSSL (version 1.0.1 through 1.1.1, or 3.0.0), or LibreSSL 2.5
-through 3.6.0, but a different version of OpenSSL was found. The build is now aborting
+through 3.6.x, but a different version of OpenSSL was found. The build is now aborting
 due to this version mismatch.
 
 "