diff options
| author | Steven Fackler <[email protected]> | 2014-12-03 09:18:35 -0800 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2014-12-03 09:18:53 -0800 |
| commit | 2901c279ab154933385fda86c620f87d3392a36d (patch) | |
| tree | 5f57a405577f5a05b1c40b7003c26f286282f141 | |
| parent | Release v0.2.2 (diff) | |
| download | rust-openssl-2901c279ab154933385fda86c620f87d3392a36d.tar.xz rust-openssl-2901c279ab154933385fda86c620f87d3392a36d.zip | |
Fix doc test and stop doc upload
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | src/x509/mod.rs | 8 |
2 files changed, 4 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 5278a87f..fe30a5f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,5 @@ language: rust env: - global: - - secure: qLvBJoJOJcPPZ+e31175O6sMUGBHgHe/kBuI0FCPeifYmpFyeRAkEvGddEkf8t3rojV+wE14CNYzzGsT/W/+JY7xW0C1FQKW3r+8SZ1Cave/8ahee0aCQVXGf0XY8c52uG6MrLGiUlNZbOsyFSdFUc/Io+kYZas4DxrinRSOIEA= matrix: - FEATURES="" - FEATURES="tlsv1_1 tlsv1_2 aes_xts" @@ -11,11 +9,4 @@ os: before_script: - openssl s_server -accept 15418 -www -cert test/cert.pem -key test/key.pem >/dev/null 2>&1 & script: - - cargo build --features "$FEATURES" - cargo test --features "$FEATURES" - - cargo doc --features "sslv2 tlsv1_1 tlsv1_2 aes_xts" -after_success: | - [ $TRAVIS_BRANCH = master ] && - [ $TRAVIS_PULL_REQUEST = false ] && - cd target/doc && - (curl http://www.rust-ci.org/artifacts/put?t=$RUSTCI_TOKEN | sh) diff --git a/src/x509/mod.rs b/src/x509/mod.rs index 86152ac4..a06fe4e1 100644 --- a/src/x509/mod.rs +++ b/src/x509/mod.rs @@ -145,15 +145,15 @@ impl<'a, T: AsStr<'a>> ToStr for Vec<T> { /// use std::io::{File, Open, Write}; /// # use std::io::fs; /// -/// use openssl::crypto::hash::SHA256; -/// use openssl::x509::{DigitalSignature, X509Generator}; +/// use openssl::crypto::hash::HashType; +/// use openssl::x509::{KeyUsage, X509Generator}; /// /// let gen = X509Generator::new() /// .set_bitlength(2048) /// .set_valid_period(365*2) /// .set_CN("SuperMegaCorp Inc.") -/// .set_sign_hash(SHA256) -/// .set_usage(&[DigitalSignature]); +/// .set_sign_hash(HashType::SHA256) +/// .set_usage(&[KeyUsage::DigitalSignature]); /// /// let (cert, pkey) = gen.generate().unwrap(); /// |