Commit 2901c279 authored by Steven Fackler's avatar Steven Fackler
Browse files

Fix doc test and stop doc upload

parent fd680e8a

.travis.yml

+0 −9
Original line number Diff line number Diff line 
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)

src/x509/mod.rs

+4 −4
Original line number Diff line number Diff line
@@ -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();

///