diff options
| author | Steven Fackler <[email protected]> | 2016-07-01 18:43:58 -0400 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2016-07-01 18:43:58 -0400 |
| commit | b8fb29db5c246175a096260eacca38180cd77dd0 (patch) | |
| tree | 4fbf3759478b731b3c571ad361023feb6093bbf2 /openssl/src/ssl/mod.rs | |
| parent | Merge branch 'release-v0.7.13' into release (diff) | |
| parent | Release v0.7.14 (diff) | |
| download | rust-openssl-0.7.14.tar.xz rust-openssl-0.7.14.zip | |
Merge branch 'release-v0.7.14' into releasev0.7.14
Diffstat (limited to 'openssl/src/ssl/mod.rs')
| -rw-r--r-- | openssl/src/ssl/mod.rs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs index f207416f..d0954bc7 100644 --- a/openssl/src/ssl/mod.rs +++ b/openssl/src/ssl/mod.rs @@ -566,6 +566,9 @@ impl SslContext { let ctx = SslContext { ctx: ctx }; + // this is a bit dubious (?) + try!(ctx.set_mode(ffi::SSL_MODE_AUTO_RETRY)); + if method.is_dtls() { ctx.set_read_ahead(1); } @@ -648,8 +651,12 @@ impl SslContext { } } + fn set_mode(&self, mode: c_long) -> Result<(), SslError> { + wrap_ssl_result(unsafe { ffi_extras::SSL_CTX_set_mode(self.ctx, mode) as c_int }) + } + pub fn set_tmp_dh(&self, dh: DH) -> Result<(), SslError> { - wrap_ssl_result(unsafe { ffi_extras::SSL_CTX_set_tmp_dh(self.ctx, dh.raw()) as i32 }) + wrap_ssl_result(unsafe { ffi_extras::SSL_CTX_set_tmp_dh(self.ctx, dh.raw()) as c_int }) } /// Use the default locations of trusted certificates for verification. |