From 11291cc5b8e23a1455b184d282e7794090db204d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Sl=C3=A1de=C4=8Dek?= Date: Mon, 13 Feb 2023 16:35:33 +0100 Subject: [PATCH] Rename 'indata' to 'detached_data'. --- openssl-sys/src/handwritten/cms.rs | 2 +- openssl/src/cms.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openssl-sys/src/handwritten/cms.rs b/openssl-sys/src/handwritten/cms.rs index e62e6295f..a13ea423c 100644 --- a/openssl-sys/src/handwritten/cms.rs +++ b/openssl-sys/src/handwritten/cms.rs @@ -40,7 +40,7 @@ extern "C" { cms: *mut CMS_ContentInfo, certs: *mut stack_st_X509, store: *mut X509_STORE, - indata: *mut BIO, + detached_data: *mut BIO, out: *mut BIO, flags: c_uint, ) -> c_int; diff --git a/openssl/src/cms.rs b/openssl/src/cms.rs index c68b74dd6..3b4964c9f 100644 --- a/openssl/src/cms.rs +++ b/openssl/src/cms.rs @@ -240,24 +240,24 @@ impl CmsContentInfo { &mut self, certs: Option<&StackRef>, store: &X509StoreRef, - indata: Option<&[u8]>, + detached_data: Option<&[u8]>, output_data: Option<&mut Vec>, flags: CMSOptions, ) -> Result<(), ErrorStack> { unsafe { let certs_ptr = certs.map_or(ptr::null_mut(), |p| p.as_ptr()); - let indata_bio = match indata { + let detached_data_bio = match detached_data { Some(data) => Some(MemBioSlice::new(data)?), None => None, }; - let indata_bio_ptr = indata_bio.as_ref().map_or(ptr::null_mut(), |p| p.as_ptr()); + let detached_data_bio_ptr = detached_data_bio.as_ref().map_or(ptr::null_mut(), |p| p.as_ptr()); let out_bio = MemBio::new()?; cvt(ffi::CMS_verify( self.as_ptr(), certs_ptr, store.as_ptr(), - indata_bio_ptr, + detached_data_bio_ptr, out_bio.as_ptr(), flags.bits(), ))?; -- GitLab