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

Make Ssl public, add new constructor to SslStream that takes an Ssl instance

This commit is contained in:
Andrew Dunham 2014-09-04 21:59:57 -07:00
parent fc79815faf
commit b1346029e5
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ssl/mod.rs
View File

@ -289,7 +289,7 @@ make_validation_error!(X509_V_OK,
X509ApplicationVerification = X509_V_ERR_APPLICATION_VERIFICATION, X509ApplicationVerification = X509_V_ERR_APPLICATION_VERIFICATION,
) )
struct Ssl { pub struct Ssl {
ssl: *mut ffi::SSL ssl: *mut ffi::SSL
} }
@ -300,7 +300,7 @@ impl Drop for Ssl {
} }
impl Ssl { impl Ssl {
fn try_new(ctx: &SslContext) -> Result<Ssl, SslError> { pub fn try_new(ctx: &SslContext) -> Result<Ssl, SslError> {
let ssl = unsafe { ffi::SSL_new(ctx.ctx) }; let ssl = unsafe { ffi::SSL_new(ctx.ctx) };
if ssl == ptr::mut_null() { if ssl == ptr::mut_null() {
return Err(SslError::get()); return Err(SslError::get());
@ -463,14 +463,8 @@ pub struct SslStream<S> {
} }
impl<S: Stream> SslStream<S> { impl<S: Stream> SslStream<S> {
/// Attempts to create a new SSL stream /// Attempts to create a new SSL stream from a given `Ssl` instance.
pub fn try_new(ctx: &SslContext, stream: S) -> Result<SslStream<S>, pub fn new_from(ssl: Ssl, stream: S) -> Result<SslStream<S>, SslError> {
SslError> {
let ssl = match Ssl::try_new(ctx) {
Ok(ssl) => ssl,
Err(err) => return Err(err)
};
let mut ssl = SslStream { let mut ssl = SslStream {
stream: stream, stream: stream,
ssl: ssl, ssl: ssl,
@ -484,6 +478,17 @@ impl<S: Stream> SslStream<S> {
} }
} }
/// Attempts to create a new SSL stream
pub fn try_new(ctx: &SslContext, stream: S) -> Result<SslStream<S>,
SslError> {
let ssl = match Ssl::try_new(ctx) {
Ok(ssl) => ssl,
Err(err) => return Err(err)
};
SslStream::new_from(ssl, stream)
}
/// A convenience wrapper around `try_new`. /// A convenience wrapper around `try_new`.
pub fn new(ctx: &SslContext, stream: S) -> SslStream<S> { pub fn new(ctx: &SslContext, stream: S) -> SslStream<S> {
match SslStream::try_new(ctx, stream) { match SslStream::try_new(ctx, stream) {