diff options
| author | Steven Fackler <[email protected]> | 2016-01-22 15:57:24 -0800 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2016-01-22 15:57:24 -0800 |
| commit | 1417ebdd6efdad271026152da63eb0f442fb1c5e (patch) | |
| tree | 7b480e4ddd427ee67cc912452c78fb087808eace /openssl-sys | |
| parent | Merge branch 'release-v0.7.4' into release (diff) | |
| parent | Release v0.7.5 (diff) | |
| download | rust-openssl-0.7.5.tar.xz rust-openssl-0.7.5.zip | |
Merge branch 'release-v0.7.5' into releasev0.7.5
Diffstat (limited to 'openssl-sys')
| -rw-r--r-- | openssl-sys/Cargo.toml | 4 | ||||
| -rw-r--r-- | openssl-sys/src/lib.rs | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/openssl-sys/Cargo.toml b/openssl-sys/Cargo.toml index 735c4d51..25957320 100644 --- a/openssl-sys/Cargo.toml +++ b/openssl-sys/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "openssl-sys" -version = "0.7.4" +version = "0.7.5" authors = ["Alex Crichton <[email protected]>", "Steven Fackler <[email protected]>"] license = "MIT" description = "FFI bindings to OpenSSL" repository = "https://github.com/sfackler/rust-openssl" -documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.4/openssl_sys" +documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.5/openssl_sys" links = "openssl" build = "build.rs" diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index f780b6d9..b4e97c1b 100644 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -1,6 +1,6 @@ #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] #![allow(dead_code)] -#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.4")] +#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.5")] extern crate libc; @@ -48,7 +48,6 @@ pub type bio_info_cb = Option<unsafe extern "C" fn(*mut BIO, #[repr(C)] #[derive(Copy, Clone)] -#[allow(raw_pointer_derive)] pub struct BIO_METHOD { pub type_: c_int, pub name: *const c_char, @@ -527,6 +526,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>, |