Commit 7540471c authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge branch 'release-v0.7.6' into release

parents 1417ebdd 3df4c479

README.md

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

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



## Building
@@ -19,6 +19,8 @@ something like `openssl-devel` or `libssl-dev`. 
sudo apt-get install libssl-dev

# On Arch Linux

sudo pacman -S openssl

# On Fedora

sudo dnf install openssl-devel

```



### OSX

appveyor.yml

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

    BITS: 64

install:

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

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

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

  - Win%BITS%OpenSSL-1_0_2f.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"

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

version = "0.7.6"

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

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

build = "build.rs"



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


[dependencies]

libc = "0.2"

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

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

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



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

version = "0.7.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.7.5/openssl_sys"

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

links = "openssl"

build = "build.rs"