Sync X509StoreBuilder with openssl

cloudflare · Nov 26, 2024 · c8641d8 · c8641d8
1 parent fc2e217
commit c8641d8
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 16 deletions.
diff --git a/boring/src/aes.rs b/boring/src/aes.rs
@@ -39,9 +39,9 @@
 //!
 use crate::ffi;
 use libc::{c_int, c_uint, size_t};
+use openssl_macros::corresponds;
 use std::mem::MaybeUninit;
 use std::ptr;
-use openssl_macros::corresponds;
 
 /// Provides Error handling for parsing keys.
 #[derive(Debug)]

diff --git a/boring/src/ssl/test/custom_verify.rs b/boring/src/ssl/test/custom_verify.rs
@@ -64,7 +64,13 @@ fn untrusted_with_set_cert() {
             let cert = ssl.peer_certificate().unwrap();
             let cert_chain = ssl.peer_cert_chain().unwrap();
 
-            assert_eq!(store.objects().len(), 0);
+            assert_eq!(
+                unsafe {
+                    #[allow(deprecated)]
+                    store.objects().len()
+                },
+                0
+            );
 
             X509StoreContext::new()
                 .unwrap()
@@ -94,7 +100,13 @@ fn trusted_with_set_cert() {
             let cert = ssl.peer_certificate().unwrap();
             let cert_chain = ssl.peer_cert_chain().unwrap();
 
-            assert_eq!(store.objects().len(), 1);
+            assert_eq!(
+                unsafe {
+                    #[allow(deprecated)]
+                    store.objects().len()
+                },
+                1
+            );
 
             X509StoreContext::new()
                 .unwrap()

diff --git a/boring/src/x509/store.rs b/boring/src/x509/store.rs
@@ -43,12 +43,12 @@
 use crate::error::ErrorStack;
 use crate::ffi;
 use crate::stack::StackRef;
-use crate::x509::verify::{X509Flags, X509VerifyParamRef};
+use crate::x509::verify::{X509VerifyFlags, X509VerifyParamRef};
 use crate::x509::{X509Object, X509};
 use crate::{cvt, cvt_p};
 use foreign_types::{ForeignType, ForeignTypeRef};
-use std::mem;
 use openssl_macros::corresponds;
+use std::mem;
 
 foreign_type_and_impl_send_sync! {
     type CType = ffi::X509_STORE;
@@ -96,15 +96,11 @@ impl X509StoreBuilderRef {
         unsafe { cvt(ffi::X509_STORE_set_default_paths(self.as_ptr())).map(|_| ()) }
     }
 
-    /// Sets verify flags.
-    ///
-    /// This corresponds to [`X509_STORE_set_flags`].
-    ///
-    /// [`X509_STORE_set_flags`]: https://www.openssl.org/docs/manmaster/man3/X509_STORE_set_flags.html
+    /// Sets certificate chain validation related flags.
     #[corresponds(X509_STORE_set_flags)]
-    pub fn set_flags(&mut self, flags: X509Flags) {
+    pub fn set_flags(&mut self, flags: X509VerifyFlags) {
         unsafe {
-            ffi::X509_STORE_set_flags(self.as_ptr(), flags.bits());
+            cvt(ffi::X509_STORE_set_flags(self.as_ptr(), flags.bits())).unwrap();
         }
     }
 
@@ -116,6 +112,12 @@ impl X509StoreBuilderRef {
     pub fn verify_param_mut(&mut self) -> &mut X509VerifyParamRef {
         unsafe { X509VerifyParamRef::from_ptr_mut(ffi::X509_STORE_get0_param(self.as_ptr())) }
     }
+
+    /// Sets certificate chain validation related parameters.
+    #[corresponds(X509_STORE_set1_param)]
+    pub fn set_param(&mut self, param: &X509VerifyParamRef) -> Result<(), ErrorStack> {
+        unsafe { cvt(ffi::X509_STORE_set1_param(self.as_ptr(), param.as_ptr())).map(|_| ()) }
+    }
 }
 
 foreign_type_and_impl_send_sync! {
@@ -128,8 +130,14 @@ foreign_type_and_impl_send_sync! {
 
 impl X509StoreRef {
     /// Get a reference to the cache of certificates in this store.
+    ///
+    /// # Safety
+    /// References may be invalidated by any access to the shared cache.
+    #[deprecated(
+        note = "This method is unsound https://github.com/sfackler/rust-openssl/issues/2096"
+    )]
     #[corresponds(X509_STORE_get0_objects)]
-    pub fn objects(&self) -> &StackRef<X509Object> {
+    pub unsafe fn objects(&self) -> &StackRef<X509Object> {
         unsafe { StackRef::from_ptr(ffi::X509_STORE_get0_objects(self.as_ptr())) }
     }
 }
diff --git a/boring/src/x509/verify.rs b/boring/src/x509/verify.rs
@@ -1,8 +1,8 @@
 use crate::ffi;
 use foreign_types::{ForeignType, ForeignTypeRef};
 use libc::{c_int, c_uint, c_ulong, time_t};
-use std::net::IpAddr;
 use openssl_macros::corresponds;
+use std::net::IpAddr;
 
 use crate::error::ErrorStack;
 use crate::{cvt, cvt_p};
@@ -82,15 +82,23 @@ impl X509VerifyParamRef {
     #[corresponds(X509_VERIFY_PARAM_set_flags)]
     pub fn set_flags(&mut self, flags: X509VerifyFlags) {
         unsafe {
-            cvt(ffi::X509_VERIFY_PARAM_set_flags(self.as_ptr(), flags.bits())).unwrap();
+            cvt(ffi::X509_VERIFY_PARAM_set_flags(
+                self.as_ptr(),
+                flags.bits(),
+            ))
+            .unwrap();
         }
     }
 
     /// Clear verification flags.
     #[corresponds(X509_VERIFY_PARAM_clear_flags)]
     pub fn clear_flags(&mut self, flags: X509VerifyFlags) {
         unsafe {
-            cvt(ffi::X509_VERIFY_PARAM_clear_flags(self.as_ptr(), flags.bits())).unwrap();
+            cvt(ffi::X509_VERIFY_PARAM_clear_flags(
+                self.as_ptr(),
+                flags.bits(),
+            ))
+            .unwrap();
         }
     }