diff options
| author | Steven Fackler <[email protected]> | 2017-01-24 09:36:55 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-01-24 09:36:55 +0100 |
| commit | 0f31df2fc3a8a3191b4f73479fe7c5aeeaecaecd (patch) | |
| tree | 42748403c87bb16411f71d4b26ddaea6014e4fd7 /openssl-sys/src/lib.rs | |
| parent | Merge pull request #550 from Keruspe/master (diff) | |
| parent | fix multi-version compat (diff) | |
| download | rust-openssl-0f31df2fc3a8a3191b4f73479fe7c5aeeaecaecd.tar.xz rust-openssl-0f31df2fc3a8a3191b4f73479fe7c5aeeaecaecd.zip | |
Merge pull request #563 from bluejekyll/master
Adding pkcs12_create bindings
Diffstat (limited to 'openssl-sys/src/lib.rs')
| -rw-r--r-- | openssl-sys/src/lib.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index 34bdb9e0..01be1b23 100644 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -55,7 +55,6 @@ pub enum X509_REQ {} pub enum X509_STORE {} pub enum X509_STORE_CTX {} pub enum bio_st {} -pub enum PKCS12 {} pub enum DH_METHOD {} pub enum RSA_METHOD {} pub enum BN_MONT_CTX {} @@ -1112,6 +1111,7 @@ pub const OCSP_RESPONSE_STATUS_UNAUTHORIZED: c_int = 6; pub const OPENSSL_EC_NAMED_CURVE: c_int = 1; pub const PKCS5_SALT_LEN: c_int = 8; +pub const PKCS12_DEFAULT_ITER: c_int = 2048; pub const RSA_F4: c_long = 0x10001; @@ -1971,6 +1971,8 @@ extern { pub fn i2d_RSAPrivateKey(k: *const RSA, buf: *mut *mut u8) -> c_int; pub fn d2i_RSAPrivateKey(k: *mut *mut RSA, buf: *mut *const u8, len: c_long) -> *mut RSA; + pub fn i2d_PKCS12_bio(b: *mut BIO, a: *mut PKCS12) -> c_int; + pub fn i2d_PKCS12(a: *mut PKCS12, buf: *mut *mut u8) -> c_int; pub fn d2i_PKCS12(a: *mut *mut PKCS12, pp: *mut *const u8, length: c_long) -> *mut PKCS12; pub fn PKCS12_parse(p12: *mut PKCS12, pass: *const c_char, |