pipeline fixes

sfackler · Aug 29, 2024 · cdab526 · cdab526
1 parent 75d5cc2
commit cdab526
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 29 deletions.
diff --git a/openssl-sys/src/handwritten/x509.rs b/openssl-sys/src/handwritten/x509.rs
@@ -212,6 +212,8 @@ extern "C" {
 
     pub fn X509_ALGOR_new() -> *mut X509_ALGOR;
     pub fn X509_ALGOR_free(x: *mut X509_ALGOR);
+
+    #[cfg(ossl101)]
     pub fn X509_ALGOR_set_md(alg: *mut X509_ALGOR, md: *const EVP_MD);
 
     pub fn X509_ALGOR_cmp(alg0: *const X509_ALGOR, alg1: *const X509_ALGOR) -> c_int;

diff --git a/openssl-sys/src/ts.rs b/openssl-sys/src/ts.rs
@@ -1,36 +1,13 @@
 use libc::*;
 
-use crate::{
-    ASN1_INTEGER, ASN1_OBJECT, ASN1_OCTET_STRING, BIO, EVP_MD, EVP_PKEY, X509, X509_ALGOR,
-};
-
-use super::ASN1_STRING;
+use super::*;
 
 pub enum TS_MSG_IMPRINT {}
 pub enum TS_REQ {}
 pub enum TS_RESP {}
 pub enum TS_TST_INFO {}
 pub enum TS_RESP_CTX {}
-
-cfg_if! {
-    if #[cfg(ossl110)] {
-        pub enum TS_VERIFY_CTX {}
-    } else {
-        #[repr(C)]
-        pub struct TS_VERIFY_CTX {
-            flags: c_uint,
-            store: *mut X509_STORE,
-            certs: *mut stack_st_X509,
-            policy: *mut ASN1_OBJECT,
-            md_alg: *mut X509_ALGOR,
-            imprint: *mut c_uchar,
-            imprint_len: c_uint,
-            data: *mut BIO,
-            nonce: *mut ASN1_INTEGER,
-            tsa_name: *mut GENERAL_NAME,
-        }
-    }
-}
+pub enum TS_VERIFY_CTX {}
 
 pub const TS_VFY_SIGNATURE: c_uint = 0x1;
 pub const TS_VFY_VERSION: c_uint = 0x2;

diff --git a/openssl/src/lib.rs b/openssl/src/lib.rs
@@ -193,6 +193,7 @@ pub mod ssl;
 pub mod stack;
 pub mod string;
 pub mod symm;
+#[cfg(all(not(boringssl), not(libressl)))]
 pub mod ts;
 pub mod version;
 pub mod x509;

diff --git a/openssl/src/ts.rs b/openssl/src/ts.rs
@@ -410,7 +410,7 @@ impl TsRespContext {
     }
 }
 
-foreign_type_and_impl_send_sync!{
+foreign_type_and_impl_send_sync! {
     type CType = ffi::TS_TST_INFO;
     fn drop = ffi::TS_TST_INFO_free;
     pub struct TsTstInfo;

diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs
@@ -2291,6 +2291,7 @@ impl X509AlgorithmRef {
         }
     }
 
+    #[cfg(ossl101)]
     #[corresponds(X509_ALGOR_set_md)]
     pub fn set_md(&mut self, md: MessageDigest) {
         unsafe {
@@ -2301,9 +2302,7 @@ impl X509AlgorithmRef {
 
 impl PartialEq for X509AlgorithmRef {
     fn eq(&self, other: &Self) -> bool {
-        unsafe {
-            ffi::X509_ALGOR_cmp(self.as_ptr(), other.as_ptr()) == 0
-        }
+        unsafe { ffi::X509_ALGOR_cmp(self.as_ptr(), other.as_ptr()) == 0 }
     }
 }