aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-08-07 21:34:58 -0700
committerSteven Fackler <[email protected]>2016-08-07 21:34:58 -0700
commit79602b6af4eaad34c277ec6a6219efc514c1342e (patch)
tree46ddfc29ec7a7757d4c8daad2a1272ed5a3e349d
parentDH cleanup (diff)
downloadrust-openssl-79602b6af4eaad34c277ec6a6219efc514c1342e.tar.xz
rust-openssl-79602b6af4eaad34c277ec6a6219efc514c1342e.zip
get_error -> error
-rw-r--r--openssl/src/ssl/tests/mod.rs4
-rw-r--r--openssl/src/x509/mod.rs2
2 files changed, 3 insertions, 3 deletions
diff --git a/openssl/src/ssl/tests/mod.rs b/openssl/src/ssl/tests/mod.rs
index b89517da..3216e066 100644
--- a/openssl/src/ssl/tests/mod.rs
+++ b/openssl/src/ssl/tests/mod.rs
@@ -310,7 +310,7 @@ run_test!(verify_callback_load_certs, |method, stream| {
run_test!(verify_trusted_get_error_ok, |method, stream| {
let mut ctx = SslContext::new(method).unwrap();
ctx.set_verify_callback(SSL_VERIFY_PEER, |_, x509_ctx| {
- assert!(x509_ctx.get_error().is_none());
+ assert!(x509_ctx.error().is_none());
true
});
@@ -324,7 +324,7 @@ run_test!(verify_trusted_get_error_ok, |method, stream| {
run_test!(verify_trusted_get_error_err, |method, stream| {
let mut ctx = SslContext::new(method).unwrap();
ctx.set_verify_callback(SSL_VERIFY_PEER, |_, x509_ctx| {
- assert!(x509_ctx.get_error().is_some());
+ assert!(x509_ctx.error().is_some());
false
});
diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs
index fb9d466d..b551a544 100644
--- a/openssl/src/x509/mod.rs
+++ b/openssl/src/x509/mod.rs
@@ -83,7 +83,7 @@ impl X509StoreContext {
X509StoreContext { ctx: ctx }
}
- pub fn get_error(&self) -> Option<X509ValidationError> {
+ pub fn error(&self) -> Option<X509ValidationError> {
let err = unsafe { ffi::X509_STORE_CTX_get_error(self.ctx) };
X509ValidationError::from_raw(err)
}