Add `"x509_expiry"` feature flag

- fix return of `ASN1_TIME_print`
- assert on null `date`

3 files changed, 7 insertions, 3 deletions

diff --git a/openssl/src/asn1/mod.rs b/openssl/src/asn1/mod.rs
index 4fb4c7cf..1eab9f04 100644
--- a/openssl/src/asn1/mod.rs
+++ b/openssl/src/asn1/mod.rs
@@ -58,7 +58,7 @@ impl<'a> fmt::Display for Asn1TimeRef<'a> {
     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.as_ptr(), self.0);
+            try_ssl!(ffi::ASN1_TIME_print(mem_bio.as_ptr(), self.0));
             String::from_utf8_unchecked(mem_bio.get_buf().to_owned())
         };
         write!(f, "{}", as_str)
diff --git a/openssl/src/c_helpers.c b/openssl/src/c_helpers.c
index 08b5b6d3..6e6a5021 100644
--- a/openssl/src/c_helpers.c
+++ b/openssl/src/c_helpers.c
@@ -15,11 +15,11 @@ 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) {
+ASN1_TIME* rust_0_8_X509_get_notAfter(X509 *x) {
   return X509_get_notAfter(x);
 }
 
-ASN1_TIME* rust_0_8_X509_get_notBefore_shim(X509 *x) {
+ASN1_TIME* rust_0_8_X509_get_notBefore(X509 *x) {
   return X509_get_notBefore(x);
 }
 
diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs
index dc649f18..bb5743e9 100644
--- a/openssl/src/x509/mod.rs
+++ b/openssl/src/x509/mod.rs
@@ -434,17 +434,21 @@ impl<'a> X509Ref<'a> {
     }
 
     /// Returns Issuer validity notAfter
+    #[cfg(feature = "x509_expiry")]
     pub fn not_after(&self) -> Asn1TimeRef {
         unsafe {
             let date = ::c_helpers::rust_0_8_X509_get_notAfter(self.0);
+            assert!(!date.is_null());
             Asn1TimeRef::from_ptr(date)
         }
     }
 
     /// Returns Issuer validity notBefore
+    #[cfg(feature = "x509_expiry")]
     pub fn not_before(&self) -> Asn1TimeRef {
         unsafe {
             let date = ::c_helpers::rust_0_8_X509_get_notBefore(self.0);
+            assert!(!date.is_null());
             Asn1TimeRef::from_ptr(date)
         }
     }