aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Weinstein <[email protected]>2016-08-16 23:31:01 -0400
committerDavid Weinstein <[email protected]>2016-08-17 01:23:54 -0400
commit234ce581f9401a7298d67e52bdeb857d4b53e645 (patch)
tree3d1540401708db126b8c14d7a13ed76b81f50c0f
parentAdd test for `"x509_validity"` feature (diff)
downloadrust-openssl-234ce581f9401a7298d67e52bdeb857d4b53e645.tar.xz
rust-openssl-234ce581f9401a7298d67e52bdeb857d4b53e645.zip
Add x509_validity feature to travis tests
- also update docs for new x509 `not_before`, `not_after`
-rw-r--r--openssl/src/x509/mod.rs6
-rwxr-xr-xopenssl/test/run.sh2
2 files changed, 5 insertions, 3 deletions
diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs
index bb5743e9..649dfdc2 100644
--- a/openssl/src/x509/mod.rs
+++ b/openssl/src/x509/mod.rs
@@ -433,7 +433,8 @@ impl<'a> X509Ref<'a> {
}
}
- /// Returns Issuer validity notAfter
+ /// Returns certificate Not Before validity period.
+ /// Requires the `x509_expiry` feature.
#[cfg(feature = "x509_expiry")]
pub fn not_after(&self) -> Asn1TimeRef {
unsafe {
@@ -443,7 +444,8 @@ impl<'a> X509Ref<'a> {
}
}
- /// Returns Issuer validity notBefore
+ /// Returns certificate Not After validity period.
+ /// Requires the `x509_expiry` feature.
#[cfg(feature = "x509_expiry")]
pub fn not_before(&self) -> Asn1TimeRef {
unsafe {
diff --git a/openssl/test/run.sh b/openssl/test/run.sh
index b9481837..2c2473b1 100755
--- a/openssl/test/run.sh
+++ b/openssl/test/run.sh
@@ -4,7 +4,7 @@ set -e
MAIN_TARGETS=https://static.rust-lang.org/dist
if [ "$TEST_FEATURES" == "true" ]; then
- FEATURES="tlsv1_2 tlsv1_1 dtlsv1 dtlsv1_2 sslv3 aes_xts aes_ctr npn alpn rfc5114 ecdh_auto pkcs5_pbkdf2_hmac x509_clone ssl_context_clone x509_generator_request hmac hmac_clone dh_from_params"
+ FEATURES="tlsv1_2 tlsv1_1 dtlsv1 dtlsv1_2 sslv3 aes_xts aes_ctr npn alpn rfc5114 ecdh_auto pkcs5_pbkdf2_hmac x509_clone ssl_context_clone x509_generator_request hmac hmac_clone dh_from_params x509_expiry"
fi
if [ "$TRAVIS_OS_NAME" != "osx" ]; then