Commit 11291cc5 authored by Ladislav Sládeček's avatar Ladislav Sládeček
Browse files

Rename 'indata' to 'detached_data'.

parent 5cd24292

openssl-sys/src/handwritten/cms.rs

+1 −1
Original line number Diff line number Diff line
@@ -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;

openssl/src/cms.rs

+4 −4
Original line number Diff line number Diff line
@@ -240,24 +240,24 @@ impl CmsContentInfo { 
        &mut self,

        certs: Option<&StackRef<X509>>,

        store: &X509StoreRef,

        indata: Option<&[u8]>,

        detached_data: Option<&[u8]>,

        output_data: Option<&mut Vec<u8>>,

        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(),

            ))?;