Commit 74c954b0 authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge branch 'release'

parents 88dcb1c8 0f428d19

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

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



## Building

openssl-sys/Cargo.toml

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

name = "openssl-sys"

version = "0.7.15"

version = "0.7.16"

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

documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.16/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.7.15")]

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



extern crate libc;

openssl/Cargo.toml

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

name = "openssl"

version = "0.8.0"

version = "0.8.1"

authors = ["Steven Fackler <sfackler@gmail.com>"]

license = "Apache-2.0"

description = "OpenSSL bindings"

repository = "https://github.com/sfackler/rust-openssl"

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

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

readme = "../README.md"

keywords = ["crypto", "tls", "ssl", "dtls"]

build = "build.rs"
@@ -38,7 +38,7 @@ dh_from_params = ["c_helpers"] 
bitflags = "0.7"

lazy_static = "0.2"

libc = "0.2"

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

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



[build-dependencies]

gcc = { version = "0.3", optional = true }

openssl/src/lib.rs

+1 −1
Original line number Diff line number Diff line 
#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.8.0")]

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



#[macro_use]

extern crate bitflags;