Commit 598d1780 authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge branch 'release'

parents 9ebf0944 094e8e5b

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

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



## Building

openssl-sys-extras/Cargo.toml

+7 −2
Original line number Diff line number Diff line 
[package]

name = "openssl-sys-extras"

version = "0.6.7"

version = "0.7.0"

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



links = "openssl_shim"

build = "build.rs"
@@ -10,7 +15,7 @@ ecdh_auto = [] 


[dependencies]

libc = "0.2"

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

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



[build-dependencies]

gcc = "0.3"

openssl-sys-extras/src/lib.rs

+1 −0
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.0")]



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

version = "0.7.0"

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

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



links = "openssl"

build = "build.rs"

openssl-sys/src/lib.rs

+1 −1
Original line number Diff line number Diff line 
#![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]

#![allow(dead_code)]

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

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



extern crate libc;