Merge pull request sfackler#1757 from vishwin/master

LibreSSL 3.7.0
wiktor-k · Dec 19, 2022 · d780a8f · d780a8f
2 parents d0999b5 + fda7d92
commit d780a8f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -187,6 +187,11 @@ jobs:
               library:
                 name: libressl
                 version: 3.6.1
+            - target: x86_64-unknown-linux-gnu
+              bindgen: true
+              library:
+                name: libressl
+                version: 3.7.0
             - target: x86_64-unknown-linux-gnu
               bindgen: false
               library:
@@ -202,6 +207,11 @@ jobs:
               library:
                 name: libressl
                 version: 3.6.1
+            - target: x86_64-unknown-linux-gnu
+              bindgen: false
+              library:
+                name: libressl
+                version: 3.7.0
           exclude:
             - library:
                 name: boringssl

diff --git a/openssl-sys/build/cfgs.rs b/openssl-sys/build/cfgs.rs
@@ -43,6 +43,9 @@ pub fn get(openssl_version: Option<u64>, libressl_version: Option<u64>) -> Vec<&
         if libressl_version >= 0x3_05_00_00_0 {
             cfgs.push("libressl350");
         }
+        if libressl_version >= 0x3_07_00_00_0 {
+            cfgs.push("libressl370");
+        }
     } else {
         let openssl_version = openssl_version.unwrap();
 

diff --git a/openssl-sys/build/main.rs b/openssl-sys/build/main.rs
@@ -282,6 +282,7 @@ See rust-openssl documentation for more information:
             (3, 5, _) => ('3', '5', 'x'),
             (3, 6, 0) => ('3', '6', '0'),
             (3, 6, _) => ('3', '6', 'x'),
+            (3, 7, 0) => ('3', '7', '0'),
             _ => version_error(),
         };
 
@@ -324,7 +325,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.x, but a different version of OpenSSL was found. The build is now aborting
+through 3.7.0, but a different version of OpenSSL was found. The build is now aborting
 due to this version mismatch.
 
 "

diff --git a/openssl-sys/src/x509_vfy.rs b/openssl-sys/src/x509_vfy.rs
@@ -100,9 +100,9 @@ cfg_if! {
 #[cfg(ossl300)]
 pub const X509_V_ERR_INVALID_CA: c_int = 79;
 
-#[cfg(not(ossl110))]
+#[cfg(not(any(ossl110, libressl370)))]
 pub const X509_V_FLAG_CB_ISSUER_CHECK: c_ulong = 0x1;
-#[cfg(ossl110)]
+#[cfg(any(ossl110, libressl370))]
 pub const X509_V_FLAG_CB_ISSUER_CHECK: c_ulong = 0x0;
 pub const X509_V_FLAG_USE_CHECK_TIME: c_ulong = 0x2;
 pub const X509_V_FLAG_CRL_CHECK: c_ulong = 0x4;