aboutsummaryrefslogtreecommitdiff
path: root/openssl/src
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-08-14 11:24:18 -0700
committerSteven Fackler <[email protected]>2016-08-14 11:24:18 -0700
commite6c4135c53c830a97af4231a02e0f84c18dc720a (patch)
tree7faa2e69a9f744bc0929ba3d760658e5cc18c584 /openssl/src
parentFix memory leak in general name stack (diff)
downloadrust-openssl-e6c4135c53c830a97af4231a02e0f84c18dc720a.tar.xz
rust-openssl-e6c4135c53c830a97af4231a02e0f84c18dc720a.zip
Docs for pkcs12
Diffstat (limited to 'openssl/src')
-rw-r--r--openssl/src/crypto/pkcs12.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/openssl/src/crypto/pkcs12.rs b/openssl/src/crypto/pkcs12.rs
index f35fa2c6..89bcbd5c 100644
--- a/openssl/src/crypto/pkcs12.rs
+++ b/openssl/src/crypto/pkcs12.rs
@@ -20,6 +20,7 @@ impl Drop for Pkcs12 {
}
impl Pkcs12 {
+ /// Deserializes a `Pkcs12` structure from DER-encoded data.
pub fn from_der(der: &[u8]) -> Result<Pkcs12, ErrorStack> {
unsafe {
ffi::init();
@@ -30,6 +31,7 @@ impl Pkcs12 {
}
}
+ /// Extracts the contents of the `Pkcs12`.
pub fn parse(&self, pass: &str) -> Result<ParsedPkcs12, ErrorStack> {
unsafe {
let pass = CString::new(pass).unwrap();