aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/cms.rs
diff options
context:
space:
mode:
authorjohnthagen <[email protected]>2017-10-03 17:44:02 -0400
committerjohnthagen <[email protected]>2017-10-03 17:44:02 -0400
commitb5bb8de4f2bd18735346a6062a13d95bcf82bdee (patch)
tree11a6f6d11bc412fc89a4bfb3517ced56bf047012 /openssl/src/cms.rs
parentMerge pull request #743 from AndyGauge/doc-asn1 (diff)
downloadrust-openssl-b5bb8de4f2bd18735346a6062a13d95bcf82bdee.tar.xz
rust-openssl-b5bb8de4f2bd18735346a6062a13d95bcf82bdee.zip
Convert try! usage to ?
Diffstat (limited to 'openssl/src/cms.rs')
-rw-r--r--openssl/src/cms.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/openssl/src/cms.rs b/openssl/src/cms.rs
index 9619d0b8..ee4b0816 100644
--- a/openssl/src/cms.rs
+++ b/openssl/src/cms.rs
@@ -26,17 +26,17 @@ impl CmsContentInfoRef {
unsafe {
let pkey = pkey.as_ptr();
let cert = cert.as_ptr();
- let out = try!(MemBio::new());
+ let out = MemBio::new()?;
let flags: u32 = 0;
- try!(cvt(ffi::CMS_decrypt(
+ cvt(ffi::CMS_decrypt(
self.as_ptr(),
pkey,
cert,
ptr::null_mut(),
out.as_ptr(),
flags.into(),
- )));
+ ))?;
Ok(out.get_buf().to_owned())
}
@@ -47,12 +47,12 @@ impl CmsContentInfoRef {
impl CmsContentInfo {
pub fn smime_read_cms(smime: &[u8]) -> Result<CmsContentInfo, ErrorStack> {
unsafe {
- let bio = try!(MemBioSlice::new(smime));
+ let bio = MemBioSlice::new(smime)?;
- let cms = try!(cvt_p(ffi::SMIME_read_CMS(
+ let cms = cvt_p(ffi::SMIME_read_CMS(
bio.as_ptr(),
ptr::null_mut(),
- )));
+ ))?;
Ok(CmsContentInfo::from_ptr(cms))
}