Commit 6195bd4f authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge branch 'release-v0.7.3' into release

parents cf075d8e 5fa46d42

.travis.yml

+18 −7
Original line number Diff line number Diff line 
language: rust

sudo: false

addons:

  apt:

    packages:

    - gcc-arm-linux-gnueabihf

rust:

- nightly

- beta

- stable

- 1.4.0

os:

- osx

- linux

env:

  global:

    - FEATURES="tlsv1_2 tlsv1_1 dtlsv1 dtlsv1_2 sslv2 sslv3 aes_xts aes_ctr npn alpn rfc5114 ecdh_auto pkcs5_pbkdf2_hmac"

  matrix:

  - TEST_FEATURES=false

  - TEST_FEATURES=true

matrix:

    #  include:

    #  - os: linux

    #    env: TARGET=arm-unknown-linux-gnueabihf TEST_FEATURES=true

    #    rust: 1.4.0

  exclude:

  - os: osx

    env: TEST_FEATURES=true

before_install:

- (test $TRAVIS_OS_NAME == "osx" || ./openssl/test/build.sh)

- ./openssl/test/build.sh

script:

- (test $TRAVIS_OS_NAME != "osx" || (cd openssl && cargo test))

- (test $TRAVIS_OS_NAME == "osx" || (cd openssl && OPENSSL_LIB_DIR=$HOME/openssl/lib OPENSSL_INCLUDE_DIR=$HOME/openssl/include LD_LIBRARY_PATH=$HOME/openssl/lib:$LD_LIBRARY_PATH PATH=$HOME/openssl/bin:$PATH cargo test))

- (test $TRAVIS_OS_NAME == "osx" || (cd openssl && OPENSSL_LIB_DIR=$HOME/openssl/lib OPENSSL_INCLUDE_DIR=$HOME/openssl/include LD_LIBRARY_PATH=$HOME/openssl/lib:$LD_LIBRARY_PATH PATH=$HOME/openssl/bin:$PATH cargo test --features "$FEATURES"))
 
- ./openssl/test/run.sh

README.md

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


[![Build Status](https://travis-ci.org/sfackler/rust-openssl.svg?branch=master)](https://travis-ci.org/sfackler/rust-openssl)



[Documentation](https://sfackler.github.io/rust-openssl/doc/v0.7.2/openssl).

[Documentation](https://sfackler.github.io/rust-openssl/doc/v0.7.3/openssl).



## Building

openssl-sys-extras/Cargo.toml

+3 −3
Original line number Diff line number Diff line 
[package]

name = "openssl-sys-extras"

version = "0.7.2"

version = "0.7.3"

authors = ["Steven Fackler <sfackler@gmail.com>"]

license = "MIT"

description = "Extra FFI bindings to OpenSSL that require a C shim"

repository = "https://github.com/sfackler/rust-openssl"

documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.2/openssl_sys_extras"

documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.3/openssl_sys_extras"

build = "build.rs"



[features]
@@ -13,7 +13,7 @@ ecdh_auto = [] 


[dependencies]

libc = "0.2"

openssl-sys = { version = "0.7.1", path = "../openssl-sys" }

openssl-sys = { version = "0.7.3", path = "../openssl-sys" }



[build-dependencies]

gcc = "0.3"

openssl-sys-extras/src/lib.rs

+1 −1
Original line number Diff line number Diff line 
#![allow(non_upper_case_globals, non_snake_case)]

#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.2")]

#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.3")]



extern crate openssl_sys;

extern crate libc;

openssl-sys/Cargo.toml

+2 −2
Original line number Diff line number Diff line 
[package]

name = "openssl-sys"

version = "0.7.2"

version = "0.7.3"

authors = ["Alex Crichton <alex@alexcrichton.com>",

           "Steven Fackler <sfackler@gmail.com>"]

license = "MIT"

description = "FFI bindings to OpenSSL"

repository = "https://github.com/sfackler/rust-openssl"

documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.2/openssl_sys"

documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.3/openssl_sys"

links = "openssl"

build = "build.rs"