diff options
| author | Steven Fackler <[email protected]> | 2016-10-17 09:14:33 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-10-17 09:14:33 -0700 |
| commit | f6bf022cf214869fc5a4be80617759fe7ee89d8f (patch) | |
| tree | 0a13df9c28a0a967ba7477979c2c0883aa6ef456 /openssl/src/crypto/pkcs12.rs | |
| parent | Merge pull request #475 from sfackler/no-enums (diff) | |
| parent | Fix missing import (diff) | |
| download | rust-openssl-f6bf022cf214869fc5a4be80617759fe7ee89d8f.tar.xz rust-openssl-f6bf022cf214869fc5a4be80617759fe7ee89d8f.zip | |
Merge pull request #476 from sfackler/error-handling
Overhaul error handling plus random APIs
Diffstat (limited to 'openssl/src/crypto/pkcs12.rs')
| -rw-r--r-- | openssl/src/crypto/pkcs12.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/openssl/src/crypto/pkcs12.rs b/openssl/src/crypto/pkcs12.rs index b028f29d..846b7baf 100644 --- a/openssl/src/crypto/pkcs12.rs +++ b/openssl/src/crypto/pkcs12.rs @@ -6,6 +6,7 @@ use std::cmp; use std::ptr; use std::ffi::CString; +use {cvt, cvt_p}; use crypto::pkey::PKey; use error::ErrorStack; use x509::X509; @@ -26,7 +27,7 @@ impl Pkcs12 { ffi::init(); let mut ptr = der.as_ptr() as *const c_uchar; let length = cmp::min(der.len(), c_long::max_value() as usize) as c_long; - let p12 = try_ssl_null!(ffi::d2i_PKCS12(ptr::null_mut(), &mut ptr, length)); + let p12 = try!(cvt_p(ffi::d2i_PKCS12(ptr::null_mut(), &mut ptr, length))); Ok(Pkcs12(p12)) } } @@ -40,7 +41,7 @@ impl Pkcs12 { let mut cert = ptr::null_mut(); let mut chain = ptr::null_mut(); - try_ssl!(ffi::PKCS12_parse(self.0, pass.as_ptr(), &mut pkey, &mut cert, &mut chain)); + try!(cvt(ffi::PKCS12_parse(self.0, pass.as_ptr(), &mut pkey, &mut cert, &mut chain))); let pkey = PKey::from_ptr(pkey); let cert = X509::from_ptr(cert); |