Merge remote-tracking branch 'upstream/master'

/doc/

/target/

/Cargo.lock

target/

Cargo.lock

env:

  global:

    - secure: qLvBJoJOJcPPZ+e31175O6sMUGBHgHe/kBuI0FCPeifYmpFyeRAkEvGddEkf8t3rojV+wE14CNYzzGsT/W/+JY7xW0C1FQKW3r+8SZ1Cave/8ahee0aCQVXGf0XY8c52uG6MrLGiUlNZbOsyFSdFUc/Io+kYZas4DxrinRSOIEA=

  matrix:

    - FEATURES=""

    - FEATURES="tlsv1_1 tlsv1_2 aes_xts"

os:

  - osx

  - linux

before_script:

  - openssl s_server -accept 15418 -www -cert test/cert.pem -key test/key.pem >/dev/null &

  - openssl s_server -accept 15418 -www -cert test/cert.pem -key test/key.pem >/dev/null 2>&1 &

script:

  - cargo build

  - cargo test

  - rustdoc src/lib.rs

  - cargo build --features "sslv2"

  - cargo build --features "tlsv1_1 tlsv1_2"

after_script:

  - curl http://www.rust-ci.org/artifacts/put?t=$RUSTCI_TOKEN | sh

  - 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)

[package]

name = "openssl"

version = "0.0.0"

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

[lib]

name = "openssl"

path = "src/lib.rs"

version = "0.2.1"

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

license = "Apache-2.0"

description = "OpenSSL bindings"

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

documentation = "https://sfackler.github.io/doc/openssl"

readme = "README.md"

keywords = ["crypto", "tls", "ssl"]

[features]

tlsv1_2 = []

tlsv1_1 = []

sslv2 = []

tlsv1_2 = ["openssl-sys/tlsv1_2"]

tlsv1_1 = ["openssl-sys/tlsv1_1"]

sslv2 = ["openssl-sys/sslv2"]

aes_xts = ["openssl-sys/aes_xts"]

[dependencies.openssl-sys]

path = "openssl-sys"

version = "0.2.1"

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

============

See the [rustdoc output](http://www.rust-ci.org/sfackler/rust-openssl/doc/openssl/).

See the [rustdoc output](https://sfackler.github.io/doc/openssl).

Building

--------

openssl-sys

Copyright (c) 2014 Alex Crichton

Permission is hereby granted, free of charge, to any

person obtaining a copy of this software and associated

documentation files (the "Software"), to deal in the

Software without restriction, including without

limitation the rights to use, copy, modify, merge,

publish, distribute, sublicense, and/or sell copies of

the Software, and to permit persons to whom the Software

is furnished to do so, subject to the following

conditions:

The above copyright notice and this permission notice

shall be included in all copies or substantial portions

of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF

ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED

TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A

PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT

SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR

IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

DEALINGS IN THE SOFTWARE.