Commit 6f40b65d authored by Steven Fackler's avatar Steven Fackler
Browse files

Build against 1.9

parent e86eb686

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ addons: 
    - gcc-arm-linux-gnueabihf

rust:

- nightly

- 1.8.0

- 1.9.0

os:

- osx

- linux

appveyor.yml

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ environment: 
install:

  - ps: Start-FileDownload "http://slproweb.com/download/Win${env:BITS}OpenSSL-1_0_2h.exe"

  - Win%BITS%OpenSSL-1_0_2h.exe /SILENT /VERYSILENT /SP- /DIR="C:\OpenSSL"

  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-1.8.0-${env:TARGET}.exe"

  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-1.9.0-${env:TARGET}.exe"

  - rust-1.8.0-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"

  - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin

  - SET PATH=%PATH%;C:\MinGW\bin

openssl/Cargo.toml

+0 −3
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ rfc5114 = ["openssl-sys/rfc5114"] 
ecdh_auto = ["openssl-sys-extras/ecdh_auto"]

pkcs5_pbkdf2_hmac = ["openssl-sys/pkcs5_pbkdf2_hmac"]



nightly = []

catch_unwind = []



[dependencies]

bitflags = ">= 0.5.0, < 0.8.0"

lazy_static = "0.2"

openssl/test/run.sh

+0 −4
Original line number Diff line number Diff line
@@ -7,10 +7,6 @@ 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"

fi



if [ "$TRAVIS_RUST_VERSION" == "nightly" ]; then

    FEATURES="$FEATURES nightly catch_unwind"

fi



if [ "$TRAVIS_OS_NAME" != "osx" ]; then

    export OPENSSL_LIB_DIR=$HOME/openssl/lib

    export OPENSSL_INCLUDE_DIR=$HOME/openssl/include