Commit 163a3413 authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge branch 'release-v0.7.12' into release

parents 4294511f 95051b06

.travis.yml

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

rust:

- nightly

- 1.8.0

- 1.7.0

os:

- osx

- linux
@@ -18,11 +18,13 @@ 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

before_install:

- ./openssl/test/build.sh

script:

- cargo fetch --manifest-path openssl/Cargo.toml # generate a cargo.lock

- cargo update --manifest-path openssl/Cargo.toml -p bitflags --precise 0.5.0

- ./openssl/test/run.sh

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.11/openssl).

[Documentation](https://sfackler.github.io/rust-openssl/doc/v0.7.12/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`

openssl-sys-extras/Cargo.toml

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

name = "openssl-sys-extras"

version = "0.7.11"

version = "0.7.12"

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

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

build = "build.rs"



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


[dependencies]

libc = "0.2"

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

openssl-sys = { version = "0.7.12", 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.11")]

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



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

version = "0.7.12"

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

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

links = "openssl"

build = "build.rs"