Commit cb2c860d authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge branch 'release-v0.6.6' into release

parents abde5382 677ed6ad

.travis.yml

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ env: 
    - FEATURES="tlsv1_2 tlsv1_1 dtlsv1 dtlsv1_2 sslv2 aes_xts npn alpn aes_ctr"

before_install:

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

before_script:

- ./openssl/test/test.sh

script:

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

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

README.md

+1 −15
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.6.5/openssl).

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



## Building
@@ -64,18 +64,4 @@ The build script can be configured via environment variables: 
If either `OPENSSL_LIB_DIR` or `OPENSSL_INCLUDE_DIR` are specified, then the

build script will skip the pkg-config step.



## Testing

Several tests expect a local test server to be running to bounce requests off

of. It's easy to do this. Open a separate terminal window and `cd` to the

rust-openssl directory. Then run one of the following command:



```bash

./openssl/test/test.sh

```



This will boot a bunch of `openssl s_server` processes that the tests connect

to. Then in the original terminal, run `cargo test`. If everything is set up

correctly, all tests should pass. You can stop the servers with `killall

openssl`.



[1]: http://slproweb.com/products/Win32OpenSSL.html

appveyor.yml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
environment:

  OPENSSL_INCLUDE_DIR: C:\OpenSSL\include

  OPENSSL_LIB_DIR: C:\OpenSSL\lib

  OPENSSL_LIBS: ssleay32:libeay32

  matrix:

  - TARGET: i686-pc-windows-gnu

    BITS: 32

  - TARGET: x86_64-pc-windows-msvc

    BITS: 64

install:

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

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

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

  - rust-nightly-%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

  - rustc -V

  - cargo -V



build: false



# Don't run doctests due to rust-lang/cargo#1592

test_script:

  - cargo test --lib --manifest-path openssl/Cargo.toml

openssl-sys/Cargo.toml

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

name = "openssl-sys"

version = "0.6.5"

version = "0.6.6"

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.6.5/openssl_sys"

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



links = "openssl"

build = "build.rs"
@@ -21,6 +21,8 @@ aes_xts = [] 
aes_ctr = []

npn = []

alpn = []

rfc5114 = []

ecdh_auto = []



[dependencies]

libc = "0.1"

openssl-sys/build.rs

+3 −3
Original line number Diff line number Diff line
@@ -36,12 +36,12 @@ fn main() { 
        Some(ref v) => v.split(":").collect(),

        None => if target.contains("windows") {

            if get_mingw_in_path().is_some() && lib_dir.is_none() && include_dir.is_none() {

                vec!("eay32", "ssleay32")

                vec!["ssleay32", "eay32"]

            } else {

                vec!("eay32", "ssl32")

                vec!["ssl32", "eay32"]

            }

        } else {

            vec!("crypto", "ssl")

            vec!["ssl", "crypto"]

        }

    };