From 52c7868bb615b04feb01be88cd1f47af866f12ad Mon Sep 17 00:00:00 2001 From: Benjamin Fry Date: Sun, 22 Jan 2017 21:27:31 -0800 Subject: add pkcs12_create and to_der funcs --- openssl-sys/src/lib.rs | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'openssl-sys/src/lib.rs') diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index 0cbd0da7..0af15251 100644 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -1951,7 +1951,19 @@ 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_create(pass: *const c_char, + friendly_name: *const c_char, + pkey: *const EVP_PKEY, + cert: *const X509, + ca: *const stack_st_X509, + nid_key: c_int, + nid_cert: c_int, + iter: c_int, + mac_iter: c_int, + keytype: c_int) -> *mut PKCS12; pub fn PKCS12_parse(p12: *mut PKCS12, pass: *const c_char, pkey: *mut *mut EVP_PKEY, -- cgit v1.2.3 From fbfecd63aeb0cd1ee24d017df2d89078a53bf0fe Mon Sep 17 00:00:00 2001 From: Benjamin Fry Date: Sun, 22 Jan 2017 22:23:21 -0800 Subject: add some documentation --- openssl-sys/src/lib.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'openssl-sys/src/lib.rs') diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index 0af15251..cf158601 100644 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -1097,6 +1097,7 @@ pub const OCSP_RESPONSE_STATUS_SIGREQUIRED: c_int = 5; pub const OCSP_RESPONSE_STATUS_UNAUTHORIZED: c_int = 6; pub const PKCS5_SALT_LEN: c_int = 8; +pub const PKCS12_DEFAULT_ITER: c_int = 2048; pub const RSA_F4: c_long = 0x10001; -- cgit v1.2.3 From 540387d5ee074a22a686da704a8f0bac85e02fa5 Mon Sep 17 00:00:00 2001 From: Benjamin Fry Date: Sun, 22 Jan 2017 22:43:27 -0800 Subject: fix ptr types --- openssl-sys/src/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'openssl-sys/src/lib.rs') diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index f12e1f2d..7413be10 100644 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -1977,9 +1977,9 @@ extern { pub fn d2i_PKCS12(a: *mut *mut PKCS12, pp: *mut *const u8, length: c_long) -> *mut PKCS12; pub fn PKCS12_create(pass: *const c_char, friendly_name: *const c_char, - pkey: *const EVP_PKEY, - cert: *const X509, - ca: *const stack_st_X509, + pkey: *mut EVP_PKEY, + cert: *mut X509, + ca: *mut stack_st_X509, nid_key: c_int, nid_cert: c_int, iter: c_int, -- cgit v1.2.3 From 591022a7fa4b43d152154fd95bb67fce5ecfa28e Mon Sep 17 00:00:00 2001 From: Benjamin Fry Date: Mon, 23 Jan 2017 22:12:11 -0800 Subject: fix multi-version compat --- openssl-sys/src/lib.rs | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'openssl-sys/src/lib.rs') diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index 7413be10..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 {} @@ -1975,16 +1974,6 @@ extern { 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_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; pub fn PKCS12_parse(p12: *mut PKCS12, pass: *const c_char, pkey: *mut *mut EVP_PKEY, -- cgit v1.2.3