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

Merge branch 'release-v0.7.15-sys-v0.8.0' into release

parents b8fb29db 2e8f19ca

.travis.yml

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

rust:

- nightly

- 1.8.0

- 1.9.0

os:

- osx

- linux

Cargo.toml

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

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

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

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



## Building

appveyor.yml

+2 −2
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ environment: 
install:

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

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

  - rust-1.9.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

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
[package]

name = "openssl-sys-extras"

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

build = "build.rs"



[features]

ecdh_auto = []



[dependencies]

libc = "0.2"

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



[build-dependencies]

gcc = "0.3"