min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust set_ssl_context API

This commit is contained in:
Steven Fackler 2016-02-08 23:03:25 -08:00
parent fa62232649
commit a0549c1606
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openssl/src/ssl/mod.rs
View File

@ -1139,18 +1139,11 @@ impl Ssl {
/// change the context corresponding to the current connection /// change the context corresponding to the current connection
/// ///
/// Returns a clone of the SslContext @ctx (ie: the new context). The old context is freed. /// Returns a clone of the SslContext @ctx (ie: the new context). The old context is freed.
pub fn set_ssl_context(&self, ctx: &SslContext) -> SslContext { pub fn set_ssl_context(&self, ctx: &SslContext) -> Result<(), ErrorStack> {
// If duplication of @ctx's cert fails, this returns NULL. This _appears_ to only occur on unsafe {
// allocation failures (meaning panicing is probably appropriate), but it might be nice to try_ssl_null!(ffi::SSL_set_SSL_CTX(self.ssl, ctx.ctx));
// propogate the error. }
assert!(unsafe { ffi::SSL_set_SSL_CTX(self.ssl, ctx.ctx) } != ptr::null_mut()); Ok(())
// FIXME: we return this reference here for compatibility, but it isn't actually required.
// This should be removed when a api-incompatabile version is to be released.
//
// ffi:SSL_set_SSL_CTX() returns copy of the ctx pointer passed to it, so it's easier for
// us to do the clone directly.
ctx.clone()
} }
/// obtain the context corresponding to the current connection /// obtain the context corresponding to the current connection