aboutsummaryrefslogtreecommitdiff
path: root/openssl-sys
diff options
context:
space:
mode:
authorDaniel Albert <[email protected]>2016-01-20 19:59:41 +0000
committerDaniel Albert <[email protected]>2016-01-20 19:59:41 +0000
commit74db7db560ea1a9fc5fd9243e59cc5e5fced5dfd (patch)
tree32c6a4923e3a4aca44e94f7083cb0ed5b30dc631 /openssl-sys
parentFix incorrect unsafe declaration (diff)
parentMerge pull request #334 from jmesmon/ssl-context (diff)
downloadrust-openssl-74db7db560ea1a9fc5fd9243e59cc5e5fced5dfd.tar.xz
rust-openssl-74db7db560ea1a9fc5fd9243e59cc5e5fced5dfd.zip
Merge branch 'master' of https://github.com/sfackler/rust-openssl
Diffstat (limited to 'openssl-sys')
-rw-r--r--openssl-sys/src/lib.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index 519b0001..28d4a59c 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -566,6 +566,9 @@ extern "C" {
pub fn PEM_read_bio_PUBKEY(bio: *mut BIO, out: *mut *mut EVP_PKEY, callback: Option<PasswordCallback>,
user_data: *mut c_void) -> *mut X509;
+ pub fn PEM_read_bio_RSAPrivateKey(bio: *mut BIO, rsa: *mut *mut RSA, callback: Option<PasswordCallback>, user_data: *mut c_void) -> *mut RSA;
+ pub fn PEM_read_bio_RSA_PUBKEY(bio: *mut BIO, rsa: *mut *mut RSA, callback: Option<PasswordCallback>, user_data: *mut c_void) -> *mut RSA;
+
pub fn PEM_write_bio_PrivateKey(bio: *mut BIO, pkey: *mut EVP_PKEY, cipher: *const EVP_CIPHER,
kstr: *mut c_char, klen: c_int,
callback: Option<PasswordCallback>,