Unverified Commit eed35cef authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #1229 from axos88/master 

SslAcceptor and SslConnector: Ability to turn into SslContext
parents 2dec15db c81810d8

openssl/src/ssl/connector.rs

+17 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ use std::ops::{Deref, DerefMut}; 
use dh::Dh;

use error::ErrorStack;

use ssl::{

    HandshakeError, Ssl, SslContext, SslContextBuilder, SslMethod, SslMode, SslOptions, SslRef,

    HandshakeError, Ssl, SslContext, SslContextRef, SslContextBuilder, SslMethod, SslMode, SslOptions, SslRef,

    SslStream, SslVerifyMode,

};

use version;
@@ -91,6 +91,14 @@ impl SslConnector { 
            verify_hostname: true,

        })

    }



    pub fn into_ssl_context(self) -> SslContext {

        self.0

    }



    pub fn ssl_context_ref(&self) -> &SslContextRef {

        &*self.0

    }

}



/// A builder for `SslConnector`s.
@@ -301,6 +309,14 @@ impl SslAcceptor { 
        let ssl = Ssl::new(&self.0)?;

        ssl.accept(stream)

    }



    pub fn into_ssl_context(self) -> SslContext {

        self.0

    }



    pub fn ssl_context_ref(&self) -> &SslContextRef {

        &*self.0

    }

}



/// A builder for `SslAcceptor`s.