diff options
| author | Steven Fackler <[email protected]> | 2015-09-16 01:11:58 -0400 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2015-09-16 01:11:58 -0400 |
| commit | 618b68f9c08de6503945041a85cd8723a634a313 (patch) | |
| tree | 5a27457085f7740c6ea20342a6cf97c316dcf34f /openssl-sys/src | |
| parent | Merge pull request #270 from mvdnes/crypto_segv (diff) | |
| parent | Add DH::from_pem() to load DH parameters from a file (diff) | |
| download | rust-openssl-618b68f9c08de6503945041a85cd8723a634a313.tar.xz rust-openssl-618b68f9c08de6503945041a85cd8723a634a313.zip | |
Merge pull request #262 from jedisct1/read_dhparams
Add DH::from_pem() to load DH parameters from a file
Diffstat (limited to 'openssl-sys/src')
| -rw-r--r-- | openssl-sys/src/lib.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index 9b5fd744..c2c6157c 100644 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -477,7 +477,8 @@ extern "C" { #[cfg_attr(target_os = "nacl", link_name = "HMAC_Update")] pub fn HMAC_Update_shim(ctx: *mut HMAC_CTX, input: *const u8, len: c_uint) -> c_int; - + pub fn PEM_read_bio_DHparams(bio: *mut BIO, out: *mut *mut DH, callback: Option<PasswordCallback>, + user_data: *mut c_void) -> *mut DH; pub fn PEM_read_bio_X509(bio: *mut BIO, out: *mut *mut X509, callback: Option<PasswordCallback>, user_data: *mut c_void) -> *mut X509; pub fn PEM_read_bio_X509_REQ(bio: *mut BIO, out: *mut *mut X509_REQ, callback: Option<PasswordCallback>, |