aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ssl
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2018-01-10 22:26:32 -0800
committerSteven Fackler <[email protected]>2018-01-10 22:26:32 -0800
commitbe1e787ce6b0518463e97825c233ed195a6a1531 (patch)
tree0b92ff46298427b582104bc332ff2921eb805a66 /openssl/src/ssl
parentBump release notes (diff)
downloadrust-openssl-be1e787ce6b0518463e97825c233ed195a6a1531.tar.xz
rust-openssl-be1e787ce6b0518463e97825c233ed195a6a1531.zip
Add from conversion
This is needed for tokio-openssl
Diffstat (limited to 'openssl/src/ssl')
-rw-r--r--openssl/src/ssl/error.rs9
1 files changed, 9 insertions, 0 deletions
diff --git a/openssl/src/ssl/error.rs b/openssl/src/ssl/error.rs
index c0bc80ae..18e44cd6 100644
--- a/openssl/src/ssl/error.rs
+++ b/openssl/src/ssl/error.rs
@@ -82,6 +82,15 @@ impl Error {
}
}
+impl From<ErrorStack> for Error {
+ fn from(e: ErrorStack) -> Error {
+ Error {
+ code: ErrorCode::SSL,
+ cause: Some(InnerError::Ssl(e)),
+ }
+ }
+}
+
impl fmt::Display for Error {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
match self.code {