aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ssl
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2015-09-01 00:10:03 -0400
committerSteven Fackler <[email protected]>2015-09-01 00:10:03 -0400
commite28b73e1f61c40f40a26dcd30a2b18eca16eaa9b (patch)
treeafe2b8a61370546e8c8953f2837adf7d1407fcdf /openssl/src/ssl
parentMerge branch 'release' (diff)
parentAdd support for set_tmp_dh() and RFC5114 DH parameters for forward secrecy. (diff)
downloadrust-openssl-e28b73e1f61c40f40a26dcd30a2b18eca16eaa9b.tar.xz
rust-openssl-e28b73e1f61c40f40a26dcd30a2b18eca16eaa9b.zip
Merge pull request #259 from jedisct1/dh
Add support for DHE for forward secrecy
Diffstat (limited to 'openssl/src/ssl')
-rw-r--r--openssl/src/ssl/mod.rs7
1 files changed, 7 insertions, 0 deletions
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index 35180d3a..ee2e1f9f 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -21,6 +21,7 @@ use std::slice;
use bio::{MemBio};
use ffi;
+use dh::DH;
use ssl::error::{SslError, SslSessionClosed, StreamError, OpenSslErrors};
use x509::{X509StoreContext, X509FileType, X509};
use crypto::pkey::PKey;
@@ -492,6 +493,12 @@ impl SslContext {
}
}
+ pub fn set_tmp_dh(&self, dh: DH) -> Result<(),SslError> {
+ wrap_ssl_result(unsafe {
+ ffi::SSL_CTX_set_tmp_dh(self.ctx, dh.raw()) as i32
+ })
+ }
+
#[allow(non_snake_case)]
/// Specifies the file that contains trusted CA certificates.
pub fn set_CA_file<P: AsRef<Path>>(&mut self, file: P) -> Result<(),SslError> {