diff options
| author | Steven Fackler <[email protected]> | 2017-10-03 20:31:22 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-10-03 20:31:22 -0700 |
| commit | fc9f10d4e596953141165a2b1a3513fbaa579658 (patch) | |
| tree | 11a6f6d11bc412fc89a4bfb3517ced56bf047012 /openssl/src/pkcs12.rs | |
| parent | Merge pull request #743 from AndyGauge/doc-asn1 (diff) | |
| parent | Convert try! usage to ? (diff) | |
| download | rust-openssl-fc9f10d4e596953141165a2b1a3513fbaa579658.tar.xz rust-openssl-fc9f10d4e596953141165a2b1a3513fbaa579658.zip | |
Merge pull request #750 from johnthagen/remove-try
Convert try! usage to ?
Diffstat (limited to 'openssl/src/pkcs12.rs')
| -rw-r--r-- | openssl/src/pkcs12.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openssl/src/pkcs12.rs b/openssl/src/pkcs12.rs index d2508037..6e42f73b 100644 --- a/openssl/src/pkcs12.rs +++ b/openssl/src/pkcs12.rs @@ -34,19 +34,19 @@ impl Pkcs12Ref { let mut cert = ptr::null_mut(); let mut chain = ptr::null_mut(); - try!(cvt(ffi::PKCS12_parse( + cvt(ffi::PKCS12_parse( self.as_ptr(), pass.as_ptr(), &mut pkey, &mut cert, &mut chain, - ))); + ))?; let pkey = PKey::from_ptr(pkey); let cert = X509::from_ptr(cert); let chain = if chain.is_null() { - try!(Stack::new()) + Stack::new()? } else { Stack::from_ptr(chain) }; |