aboutsummaryrefslogtreecommitdiff
path: root/openssl-sys/src/ossl110.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2017-01-24 09:36:55 +0100
committerGitHub <[email protected]>2017-01-24 09:36:55 +0100
commit0f31df2fc3a8a3191b4f73479fe7c5aeeaecaecd (patch)
tree42748403c87bb16411f71d4b26ddaea6014e4fd7 /openssl-sys/src/ossl110.rs
parentMerge pull request #550 from Keruspe/master (diff)
parentfix multi-version compat (diff)
downloadrust-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/ossl110.rs')
-rw-r--r--openssl-sys/src/ossl110.rs12
1 files changed, 12 insertions, 0 deletions
diff --git a/openssl-sys/src/ossl110.rs b/openssl-sys/src/ossl110.rs
index 75c6253e..b7fdebab 100644
--- a/openssl-sys/src/ossl110.rs
+++ b/openssl-sys/src/ossl110.rs
@@ -11,6 +11,7 @@ pub enum EVP_MD_CTX {}
pub enum EVP_PKEY {}
pub enum HMAC_CTX {}
pub enum OPENSSL_STACK {}
+pub enum PKCS12 {}
pub enum RSA {}
pub enum SSL {}
pub enum SSL_CTX {}
@@ -179,4 +180,15 @@ extern {
pub fn OPENSSL_sk_free(st: *mut ::OPENSSL_STACK);
pub fn OPENSSL_sk_pop_free(st: *mut ::OPENSSL_STACK, free: Option<unsafe extern "C" fn (*mut c_void)>);
pub fn OPENSSL_sk_pop(st: *mut ::OPENSSL_STACK) -> *mut c_void;
+
+ pub fn PKCS12_create(pass: *const c_char,
+ friendly_name: *const c_char,
+ pkey: *mut EVP_PKEY,
+ cert: *mut X509,
+ ca: *mut stack_st_X509,
+ nid_key: c_int,
+ nid_cert: c_int,
+ iter: c_int,
+ mac_iter: c_int,
+ keytype: c_int) -> *mut PKCS12;
}