min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

convert to raw pass-through methods

This commit is contained in:
Benjamin Fry 2017-03-20 22:28:15 -07:00 committed by Bastian Köcher
parent 910386027d
commit d8a11973e2
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
openssl/src/x509/mod.rs
View File

@ -86,14 +86,20 @@ impl X509StoreContextRef {
} }
} }
/// Verifies the certificate associated in the `build()` method /// Initializes the store context to verify the certificate.
/// ///
/// This consumes self as the `X509StoreContext` must be reinitialized subsequent to any cally to verify. /// This Context can only be used once, subsequent to any validation, the context must be reinitialized.
pub fn verify_cert(self) -> Result<Option<X509VerifyError>, ErrorStack> { ///
/// # Arguments
///
/// * `trust` - a store of the trusted chain of certificates, or CAs, to validated the certificate
/// * `cert` - certificate to validate
/// * `cert_chain` - the certificates chain
pub fn init(&self, trust: &store::X509StoreRef, cert: &X509Ref, cert_chain: &StackRef<X509>) -> Result<(), ErrorStack> {
unsafe { unsafe {
try!(cvt(ffi::X509_verify_cert(self.as_ptr())).map(|_| ())) cvt(ffi::X509_STORE_CTX_init(self.as_ptr(), trust.as_ptr(), cert.as_ptr(), cert_chain.as_ptr()))
.map(|_| ())
} }
Ok(self.error())
} }
/// Returns the error code of the context. /// Returns the error code of the context.
@ -105,6 +111,16 @@ impl X509StoreContextRef {
unsafe { X509VerifyResult::from_raw(ffi::X509_STORE_CTX_get_error(self.as_ptr())) } unsafe { X509VerifyResult::from_raw(ffi::X509_STORE_CTX_get_error(self.as_ptr())) }
} }
/// Verifies the certificate associated in the `init()` method
///
/// This consumes self as the `X509StoreContext` must be reinitialized subsequent to any cally to verify.
pub fn verify_cert(&self) -> Result<Option<X509VerifyError>, ErrorStack> {
unsafe {
try!(cvt(ffi::X509_verify_cert(self.as_ptr())).map(|_| ()))
}
Ok(self.error())
}
/// Set the error code of the context. /// Set the error code of the context.
/// ///
/// This corresponds to [`X509_STORE_CTX_set_error`]. /// This corresponds to [`X509_STORE_CTX_set_error`].

4
openssl/src/x509/tests.rs
View File

@ -303,8 +303,8 @@ fn test_verify_cert() {
store_bldr.add_cert(ca).unwrap(); store_bldr.add_cert(ca).unwrap();
let store = store_bldr.build(); let store = store_bldr.build();
let store_ctx_bldr = X509StoreContext::builder().unwrap(); let store_ctx = X509StoreContext::new().unwrap();
let store_ctx = store_ctx_bldr.build(&store, &cert, &Stack::new().unwrap()).unwrap(); store_ctx.init(&store, &cert, &Stack::new().unwrap()).unwrap();
assert!(store_ctx.verify_cert().unwrap().is_none()); assert!(store_ctx.verify_cert().unwrap().is_none());
} }