From f9cd4bff1f371336bc4f69298713069ce09825b7 Mon Sep 17 00:00:00 2001 From: David Weinstein Date: Wed, 3 Aug 2016 15:56:38 -0400 Subject: [PATCH] Progress on asn1 expiry - Use MemBio and implement `Display` for Asn1Time - Tweak doc for asn1 `not_before`, `not_after` --- openssl-sys/src/lib.rs | 5 ++++- openssl/src/asn1/mod.rs | 13 +++++++++++++ openssl/src/c_helpers.c | 8 ++++++++ openssl/src/c_helpers.rs | 3 ++- openssl/src/error.rs | 6 ++++++ openssl/src/x509/mod.rs | 16 ++++++++++++++++ 6 files changed, 49 insertions(+), 2 deletions(-) diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index be3ae53e..92be6183 100644 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -7,7 +7,7 @@ extern crate libc; #[cfg(target_os = "nacl")] extern crate libressl_pnacl_sys; -use libc::{c_void, c_int, c_char, c_ulong, c_long, c_uint, c_uchar, size_t}; +use libc::{c_void, c_int, c_char, c_ulong, c_long, c_uint, c_uchar, size_t, FILE}; use std::mem; use std::ptr; use std::sync::{Mutex, MutexGuard}; @@ -625,13 +625,16 @@ extern "C" { pub fn ASN1_INTEGER_set(dest: *mut ASN1_INTEGER, value: c_long) -> c_int; pub fn ASN1_STRING_type_new(ty: c_int) -> *mut ASN1_STRING; pub fn ASN1_TIME_free(tm: *mut ASN1_TIME); + pub fn ASN1_TIME_print(b: *mut BIO, tm: *const ASN1_TIME); pub fn BIO_ctrl(b: *mut BIO, cmd: c_int, larg: c_long, parg: *mut c_void) -> c_long; pub fn BIO_free_all(b: *mut BIO); pub fn BIO_new(type_: *const BIO_METHOD) -> *mut BIO; + pub fn BIO_new_fp(stream: *mut FILE, close_flag: c_int) -> *mut BIO; pub fn BIO_new_socket(sock: c_int, close_flag: c_int) -> *mut BIO; pub fn BIO_read(b: *mut BIO, buf: *mut c_void, len: c_int) -> c_int; pub fn BIO_write(b: *mut BIO, buf: *const c_void, len: c_int) -> c_int; + pub fn BIO_s_file() -> *const BIO_METHOD; pub fn BIO_s_mem() -> *const BIO_METHOD; pub fn BIO_new_mem_buf(buf: *const c_void, len: c_int) -> *mut BIO; pub fn BIO_set_flags(b: *mut BIO, flags: c_int); diff --git a/openssl/src/asn1/mod.rs b/openssl/src/asn1/mod.rs index 7d209775..40b6e0f7 100644 --- a/openssl/src/asn1/mod.rs +++ b/openssl/src/asn1/mod.rs @@ -1,10 +1,12 @@ use libc::c_long; use std::ptr; +use std::fmt; use ffi; use error::ErrorStack; pub struct Asn1Time(*mut ffi::ASN1_TIME); +use bio::MemBio; impl Asn1Time { /// Wraps existing ASN1_TIME and takes ownership @@ -32,6 +34,17 @@ impl Asn1Time { } } +impl fmt::Display for Asn1Time { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + let mem_bio = try!(MemBio::new()); + let as_str = unsafe { + ffi::ASN1_TIME_print(mem_bio.handle(), self.handle); + String::from_utf8_unchecked(mem_bio.get_buf().to_owned()) + }; + write!(f, "{}", as_str) + } +} + impl Drop for Asn1Time { fn drop(&mut self) { unsafe { ffi::ASN1_TIME_free(self.0) }; diff --git a/openssl/src/c_helpers.c b/openssl/src/c_helpers.c index 5d149553..08b5b6d3 100644 --- a/openssl/src/c_helpers.c +++ b/openssl/src/c_helpers.c @@ -15,6 +15,14 @@ STACK_OF(X509_EXTENSION) *rust_0_8_X509_get_extensions(X509 *x) { return x->cert_info ? x->cert_info->extensions : NULL; } +ASN1_TIME* rust_0_8_X509_get_notAfter_shim(X509 *x) { + return X509_get_notAfter(x); +} + +ASN1_TIME* rust_0_8_X509_get_notBefore_shim(X509 *x) { + return X509_get_notBefore(x); +} + DH *rust_0_8_DH_new_from_params(BIGNUM *p, BIGNUM *g, BIGNUM *q) { DH *dh; diff --git a/openssl/src/c_helpers.rs b/openssl/src/c_helpers.rs index 74ddb9ac..d16c3125 100644 --- a/openssl/src/c_helpers.rs +++ b/openssl/src/c_helpers.rs @@ -6,7 +6,8 @@ extern "C" { pub fn rust_0_8_SSL_CTX_clone(cxt: *mut ffi::SSL_CTX); pub fn rust_0_8_X509_clone(x509: *mut ffi::X509); pub fn rust_0_8_X509_get_extensions(x: *mut ffi::X509) -> *mut ffi::stack_st_X509_EXTENSION; - + pub fn rust_0_8_X509_get_notAfter(x: *mut ffi::X509) -> *mut ffi::ASN1_TIME; + pub fn rust_0_8_X509_get_notBefore(x: *mut ffi::X509) -> *mut ffi::ASN1_TIME; pub fn rust_0_8_HMAC_Init_ex(ctx: *mut ffi::HMAC_CTX, key: *const c_void, keylen: c_int, md: *const ffi::EVP_MD, impl_: *mut ffi::ENGINE) -> c_int; pub fn rust_0_8_HMAC_Final(ctx: *mut ffi::HMAC_CTX, output: *mut c_uchar, len: *mut c_uint) -> c_int; pub fn rust_0_8_HMAC_Update(ctx: *mut ffi::HMAC_CTX, input: *const c_uchar, len: c_uint) -> c_int; diff --git a/openssl/src/error.rs b/openssl/src/error.rs index 5fa542c2..cc89b5db 100644 --- a/openssl/src/error.rs +++ b/openssl/src/error.rs @@ -54,6 +54,12 @@ impl From for io::Error { } } +impl From for fmt::Error { + fn from(_: ErrorStack) -> fmt::Error { + fmt::Error + } +} + /// An error reported from OpenSSL. pub struct Error(c_ulong); diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs index 0cc0eca7..851dd881 100644 --- a/openssl/src/x509/mod.rs +++ b/openssl/src/x509/mod.rs @@ -433,6 +433,22 @@ impl<'a> X509Ref<'a> { } } + /// Returns Issuer validity notAfter + pub fn not_after(&self) -> Asn1Time { + unsafe { + let date = ffi_extras::X509_get_notAfter(self.handle()); + Asn1Time::from_raw(date) + } + } + + /// Returns Issuer validity notBefore + pub fn not_before(&self) -> Asn1Time { + unsafe { + let date = ffi_extras::X509_get_notBefore(self.handle()); + Asn1Time::from_raw(date) + } + } + /// Writes certificate as PEM pub fn to_pem(&self) -> Result, ErrorStack> { let mem_bio = try!(MemBio::new());