diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index 33abad21..4c8d63ca 100644 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -647,7 +647,8 @@ extern { pub fn SSL_get_servername(ssl: *const SSL, name_type: c_int) -> *const c_char; pub fn SSL_get_current_cipher(ssl: *const SSL) -> *const SSL_CIPHER; #[cfg(not(ossl101))] - pub fn SSL_get0_param(ssl: *mut ::SSL) -> *mut X509_VERIFY_PARAM; + pub fn SSL_get0_param(ssl: *mut SSL) -> *mut X509_VERIFY_PARAM; + pub fn SSL_get_verify_result(ssl: *const SSL) -> c_long; #[cfg(not(osslconf = "OPENSSL_NO_COMP"))] pub fn SSL_COMP_get_name(comp: *const COMP_METHOD) -> *const c_char; diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs index fafac45c..d7adb43f 100644 --- a/openssl/src/ssl/mod.rs +++ b/openssl/src/ssl/mod.rs @@ -21,7 +21,7 @@ use ffi; use {init, cvt, cvt_p}; use dh::DH; -use x509::{X509StoreContext, X509FileType, X509, X509Ref}; +use x509::{X509StoreContext, X509FileType, X509, X509Ref, X509VerifyError}; #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))] use x509::verify::X509VerifyParamRef; use crypto::pkey::PKey; @@ -1007,6 +1007,13 @@ impl<'a> SslRef<'a> { X509VerifyParamRef::from_ptr(ffi::SSL_get0_param(self.as_ptr())) } } + + /// Returns the result of X509 certificate verification. + pub fn verify_result(&self) -> Option { + unsafe { + X509VerifyError::from_raw(ffi::SSL_get_verify_result(self.0)) + } + } } pub struct Ssl(SslRef<'static>); diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs index 50d75d63..7f891231 100644 --- a/openssl/src/x509/mod.rs +++ b/openssl/src/x509/mod.rs @@ -100,14 +100,9 @@ impl X509StoreContext { X509StoreContext { ctx: ctx } } - pub fn error(&self) -> Option { + pub fn error(&self) -> Option { unsafe { - let err = ffi::X509_STORE_CTX_get_error(self.ctx) as c_long; - if err == ffi::X509_V_OK as c_long { - None - } else { - Some(X509ValidationError::from_raw(err)) - } + X509VerifyError::from_raw(ffi::X509_STORE_CTX_get_error(self.ctx) as c_long) } } @@ -691,38 +686,44 @@ impl<'a> Iterator for ExtensionsIter<'a> { } } -pub struct X509ValidationError(c_long); +pub struct X509VerifyError(c_long); -impl fmt::Debug for X509ValidationError { +impl fmt::Debug for X509VerifyError { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { - fmt.debug_struct("X509ValidationError") + fmt.debug_struct("X509VerifyError") .field("code", &self.0) .field("error", &self.error_string()) .finish() } } -impl fmt::Display for X509ValidationError { +impl fmt::Display for X509VerifyError { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { fmt.write_str(self.error_string()) } } -impl Error for X509ValidationError { +impl Error for X509VerifyError { fn description(&self) -> &str { "an X509 validation error" } } -impl X509ValidationError { - /// Creates an `X509ValidationError` from a raw error number. +impl X509VerifyError { + /// Creates an `X509VerifyError` from a raw error number. + /// + /// `None` will be returned if `err` is `X509_V_OK`. /// /// # Safety /// - /// Some methods on `X509ValidationError` are not thread safe if the error + /// Some methods on `X509VerifyError` are not thread safe if the error /// number is invalid. - pub unsafe fn from_raw(err: c_long) -> X509ValidationError { - X509ValidationError(err) + pub unsafe fn from_raw(err: c_long) -> Option { + if err == ffi::X509_V_OK as c_long { + None + } else { + Some(X509VerifyError(err)) + } } pub fn as_raw(&self) -> c_long {