Commit 4294511f authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge branch 'release-v0.7.11' into release

parents eadfe88b 78122a9d

.travis.yml

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

rust:

- nightly

- beta

- 1.4.0

- 1.8.0

os:

- osx

- linux
@@ -19,7 +18,7 @@ matrix: 
    #  include:

    #  - os: linux

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

    #    rust: 1.4.0

    #    rust: 1.8.0

  exclude:

  - os: osx

    env: TEST_FEATURES=true

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

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



## Building

appveyor.yml

+4 −4
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ environment: 
#  - TARGET: x86_64-pc-windows-msvc

#    BITS: 64

install:

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

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

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

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

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

  - 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

  - SET PATH=%PATH%;C:\MinGW\bin

  - rustc -V

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

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.11/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.11", 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.10")]

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



extern crate openssl_sys;

extern crate libc;