diff options
| author | Steven Fackler <[email protected]> | 2016-10-29 14:19:09 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2016-10-29 14:19:09 -0700 |
| commit | 57d10ebbc3c04d5089b034b9d88f40c302783c96 (patch) | |
| tree | f41e3cbc6f32de2773aeaec0e7782d87ccfba7a4 /openssl/src/ssl | |
| parent | Implement client and server connectors (diff) | |
| download | rust-openssl-57d10ebbc3c04d5089b034b9d88f40c302783c96.tar.xz rust-openssl-57d10ebbc3c04d5089b034b9d88f40c302783c96.zip | |
Add PKeyRef
Diffstat (limited to 'openssl/src/ssl')
| -rw-r--r-- | openssl/src/ssl/connector.rs | 6 | ||||
| -rw-r--r-- | openssl/src/ssl/mod.rs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/openssl/src/ssl/connector.rs b/openssl/src/ssl/connector.rs index aed01f8c..62f0a284 100644 --- a/openssl/src/ssl/connector.rs +++ b/openssl/src/ssl/connector.rs @@ -4,7 +4,7 @@ use dh::Dh; use error::ErrorStack; use ssl::{self, SslMethod, SslContextBuilder, SslContext, Ssl, SSL_VERIFY_PEER, SslStream, HandshakeError}; -use pkey::PKey; +use pkey::PKeyRef; use x509::X509Ref; // apps/dh2048.pem @@ -85,7 +85,7 @@ impl ClientConnector { pub struct ServerConnectorBuilder(SslContextBuilder); impl ServerConnectorBuilder { - pub fn tls<I, T>(private_key: &PKey, + pub fn tls<I, T>(private_key: &PKeyRef, certificate: &X509Ref, chain: I) -> Result<ServerConnectorBuilder, ErrorStack> @@ -96,7 +96,7 @@ impl ServerConnectorBuilder { } fn new<I, T>(method: SslMethod, - private_key: &PKey, + private_key: &PKeyRef, certificate: &X509Ref, chain: I) -> Result<ServerConnectorBuilder, ErrorStack> diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs index 19b21d9d..9e39d8bf 100644 --- a/openssl/src/ssl/mod.rs +++ b/openssl/src/ssl/mod.rs @@ -24,7 +24,7 @@ use dh::Dh; use x509::{X509StoreContextRef, X509FileType, X509, X509Ref, X509VerifyError}; #[cfg(any(ossl102, ossl110))] use verify::X509VerifyParamRef; -use pkey::PKey; +use pkey::PKeyRef; use error::ErrorStack; use opaque::Opaque; @@ -532,7 +532,7 @@ impl SslContextBuilder { } /// Specifies the private key - pub fn set_private_key(&mut self, key: &PKey) -> Result<(), ErrorStack> { + pub fn set_private_key(&mut self, key: &PKeyRef) -> Result<(), ErrorStack> { unsafe { cvt(ffi::SSL_CTX_use_PrivateKey(self.as_ptr(), key.as_ptr())).map(|_| ()) } |