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

Merge remote-tracking branch 'origin/master' into breaks

parents 18c1ded8 df30e9e7

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ matrix: 
    #  include:

    #  - os: linux

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

    #    rust: 1.8.0

    #    rust: 1.7.0

  exclude:

  - os: osx

    env: TEST_FEATURES=true

Cargo.toml

0 → 100644
+2 −0
Original line number Diff line number Diff line 
[workspace]

members = ["openssl", "openssl-sys", "openssl-sys-extras"]

README.md

+25 −5
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.10/openssl).

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



## Building
@@ -44,10 +44,30 @@ export OPENSSL_LIB_DIR=`brew --prefix openssl`/lib 
On Windows, consider building with [mingw-w64](http://mingw-w64.org/).

Build script will try to find mingw in `PATH` environment variable to provide

Cargo with location where openssl libs from mingw-w64 package may be found.

If you followed guide [Building on Windows](https://github.com/rust-lang/rust#building-on-windows)

from rust repo, then you should have [MSYS2](http://msys2.github.io/) with

`mingw-w64-openssl` installed as part of `mingw-w64-x86_64-toolchain`

(or `mingw-w64-i686-toolchain`) package.



mingw-w64 can be easily installed by using [MSYS2](http://msys2.github.io/). Install MSYS2 according to the instructions, and then, from an MSYS2 Shell, install mingw-w64:



32-bit:

```bash

pacman -S mingw-w64-i686-gcc

``` 



64-bit

```bash

pacman -S mingw-w64-x86_64-gcc

```



and then install the mingw-w64 toolchain.



32-bit:

```bash

pacman -S mingw-w64-i686-toolchain

```



64-bit:

```bash

pacman -S mingw-w64-x86_64-toolchain

```



Alternatively, install OpenSSL from [here][1]. Cargo will not be able to find OpenSSL if it's

installed to the default location. You can either copy the `include/openssl`

appveyor.yml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ environment: 
#    BITS: 64

install:

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

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

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

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

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

openssl-sys-extras/Cargo.toml

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

name = "openssl-sys-extras"

version = "0.7.10"

version = "0.7.14"

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.10/openssl_sys_extras"

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

build = "build.rs"



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


[dependencies]

libc = "0.2"

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

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



[build-dependencies]

gcc = "0.3"