From 213de3ce72f47a2b8278626c6cb5a4cc7f800d29 Mon Sep 17 00:00:00 2001
From: Charlie Li <git@vishwin.info>
Date: Mon, 17 Oct 2022 20:41:23 -0400
Subject: [PATCH] Ignore two PKCS#7 tests on LibreSSL 3.6.0 only, re-enable for
 3.6.1

---
 openssl/build.rs     | 8 ++++++++
 openssl/src/pkcs7.rs | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/openssl/build.rs b/openssl/build.rs
index 81bae9d9b..fc6492292 100644
--- a/openssl/build.rs
+++ b/openssl/build.rs
@@ -94,5 +94,13 @@ fn main() {
         if version >= 0x3_05_00_00_0 {
             println!("cargo:rustc-cfg=libressl350");
         }
+
+        if version >= 0x3_06_00_00_0 {
+            println!("cargo:rustc-cfg=libressl360");
+        }
+
+        if version >= 0x3_06_01_00_0 {
+            println!("cargo:rustc-cfg=libressl361");
+        }
     }
 }
diff --git a/openssl/src/pkcs7.rs b/openssl/src/pkcs7.rs
index e1b30f928..ae4571db8 100644
--- a/openssl/src/pkcs7.rs
+++ b/openssl/src/pkcs7.rs
@@ -361,7 +361,9 @@ mod tests {
         assert_eq!(content.expect("should be non-empty"), message.as_bytes());
     }
 
+    /// https://marc.info/?l=openbsd-cvs&m=166602943014106&w=2
     #[test]
+    #[cfg_attr(all(libressl360, not(libressl361)), ignore)]
     fn sign_verify_test_normal() {
         let cert = include_bytes!("../test/cert.pem");
         let cert = X509::from_pem(cert).unwrap();
@@ -397,7 +399,9 @@ mod tests {
         assert!(content.is_none());
     }
 
+    /// https://marc.info/?l=openbsd-cvs&m=166602943014106&w=2
     #[test]
+    #[cfg_attr(all(libressl360, not(libressl361)), ignore)]
     fn signers() {
         let cert = include_bytes!("../test/cert.pem");
         let cert = X509::from_pem(cert).unwrap();
-- 
GitLab